Kaydet (Commit) e3015d70 authored tarafından Gülşah Köse's avatar Gülşah Köse Kaydeden (comit) Miklos Vajna

Add new customize and position merged dialog

Change-Id: I898fb0830a9f53da4a7917cb5900f082e3a9d6b7
Reviewed-on: https://gerrit.libreoffice.org/71944
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst 237a656d
......@@ -21,6 +21,7 @@ $(eval $(call gb_Library_set_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precom
$(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
-DCUI_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_use_custom_headers,cui,\
......
......@@ -32,6 +32,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/borderareatransparencydialog \
cui/uiconfig/ui/borderbackgrounddialog \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/bulletandposition \
cui/uiconfig/ui/breaknumberoption \
cui/uiconfig/ui/calloutdialog \
cui/uiconfig/ui/calloutpage \
......
......@@ -37,7 +37,7 @@
#include <comphelper/dispatchcommand.hxx>
#include <dialmgr.hxx>
#include <cuicharmap.hxx>
#include <cui/cuicharmap.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/app.hxx>
......
......@@ -38,7 +38,7 @@
#include <postdlg.hxx>
#include <passwdomdlg.hxx>
#include <screenshotannotationdlg.hxx>
#include <cuicharmap.hxx>
#include <cui/cuicharmap.hxx>
#include <cuihyperdlg.hxx>
#include <cfgutil.hxx>
#include <SignatureLineDialog.hxx>
......
......@@ -32,7 +32,7 @@
#include <dstribut.hxx>
#include <cuiimapwnd.hxx>
#include <hlmarkwn.hxx>
#include <cuicharmap.hxx>
#include <cui/cuicharmap.hxx>
#include <srchxtra.hxx>
#include <textanim.hxx>
#include <autocdlg.hxx>
......
......@@ -775,7 +775,6 @@ public:
// #i68101#
virtual VclPtr<AbstractSvxObjectNameDialog> CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) override;
virtual VclPtr<AbstractSvxObjectTitleDescDialog> CreateSvxObjectTitleDescDialog(weld::Window* pParent, const OUString& rTitle, const OUString& rDescription) override;
virtual VclPtr<AbstractSvxMultiPathDialog> CreateSvxMultiPathDialog(weld::Window* pParent) override;
virtual VclPtr<AbstractSvxMultiPathDialog> CreateSvxPathSelectDialog(weld::Window* pParent) override;
virtual VclPtr<AbstractSvxHpLinkDlg> CreateSvxHpLinkDlg(vcl::Window* pParent, SfxBindings* pBindings) override;
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <cuicharmap.hxx>
#include <cui/cuicharmap.hxx>
// hook to call special character dialog for edits
// caution: needs C-Linkage since dynamically loaded via symbol name
......
......@@ -28,6 +28,7 @@
#include <editeng/svxenum.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/customweld.hxx>
#include <cui/numberingpreview.hxx>
#define MN_GALLERY_ENTRY 100
......@@ -38,27 +39,6 @@ class SvxBmpNumValueSet;
class SvxBrushItem;
class ValueSet;
class SvxNumberingPreview : public weld::CustomWidgetController
{
const SvxNumRule* pActNum;
vcl::Font aStdFont;
bool bPosition;
sal_uInt16 nActLevel;
protected:
virtual void Paint( vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect ) override;
public:
SvxNumberingPreview();
void SetNumRule(const SvxNumRule* pNum)
{pActNum = pNum; Invalidate();};
void SetPositionMode()
{ bPosition = true;}
void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;}
};
struct SvxNumSettings_Impl
{
SvxNumType nNumberType;
......
......@@ -48,7 +48,7 @@
#include <autocdlg.hxx>
#include <editeng/acorrcfg.hxx>
#include <editeng/svxacorr.hxx>
#include <cuicharmap.hxx>
#include <cui/cuicharmap.hxx>
#include <strings.hrc>
#include <editeng/unolingu.hxx>
#include <dialmgr.hxx>
......
......@@ -55,7 +55,7 @@
#include <svx/dlgutil.hxx>
#include <dialmgr.hxx>
#include <sfx2/htmlmode.hxx>
#include <cuicharmap.hxx>
#include <cui/cuicharmap.hxx>
#include "chardlg.h"
#include <editeng/emphasismarkitem.hxx>
#include <editeng/charreliefitem.hxx>
......
......@@ -38,7 +38,7 @@
#include <sfx2/objsh.hxx>
#include <vcl/graph.hxx>
#include <vcl/settings.hxx>
#include <cuicharmap.hxx>
#include <cui/cuicharmap.hxx>
#include <editeng/flstitem.hxx>
#include <svx/dlgutil.hxx>
#include <svx/xtable.hxx>
......
This diff is collapsed.
......@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_CUI_SOURCE_INC_CUICHARMAP_HXX
#define INCLUDED_CUI_SOURCE_INC_CUICHARMAP_HXX
#ifndef INCLUDED_CUI_CUICHARMAP_HXX
#define INCLUDED_CUI_CUICHARMAP_HXX
#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
......@@ -27,18 +27,19 @@
#include <svx/charmap.hxx>
#include <svx/searchcharmap.hxx>
#include <sfx2/charwin.hxx>
#include <cui/cuidllapi.h>
using namespace ::com::sun::star;
class SubsetMap;
#define CHARMAP_MAXLEN 32
#define CHARMAP_MAXLEN 32
namespace svx
{
struct SvxShowCharSetItem;
struct SvxShowCharSetItem;
}
class SvxShowText : public weld::CustomWidgetController
class CUI_DLLPUBLIC SvxShowText : public weld::CustomWidgetController
{
private:
ScopedVclPtr<VirtualDevice> m_xVirDev;
......@@ -50,73 +51,77 @@ private:
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
virtual void Resize() override;
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
public:
SvxShowText(const VclPtr<VirtualDevice>& rVirDev);
void SetFont(const vcl::Font& rFont);
vcl::Font const & GetFont() const { return m_aFont; }
void SetText(const OUString& rText);
OUString const & GetText() const { return m_sText; }
void SetCentered(bool bCenter) { mbCenter = bCenter; }
void SetFont(const vcl::Font& rFont);
vcl::Font const& GetFont() const { return m_aFont; }
void SetText(const OUString& rText);
OUString const& GetText() const { return m_sText; }
void SetCentered(bool bCenter) { mbCenter = bCenter; }
Size get_preferred_size() const { return GetDrawingArea()->get_preferred_size(); }
Size get_preferred_size() const { return GetDrawingArea()->get_preferred_size(); }
};
/** The main purpose of this dialog is to enable the use of characters
that are not easily accessible from the keyboard. */
class SvxCharacterMap : public SfxDialogController
class CUI_DLLPUBLIC SvxCharacterMap : public SfxDialogController
{
private:
void init();
void init();
ScopedVclPtr<VirtualDevice> m_xVirDev;
vcl::Font aFont;
vcl::Font aFont;
std::unique_ptr<const SubsetMap> pSubsetMap;
bool isSearchMode;
bool isSearchMode;
css::uno::Reference<css::frame::XFrame> m_xFrame;
std::deque<OUString> maRecentCharList;
std::deque<OUString> maRecentCharFontList;
std::deque<OUString> maFavCharList;
std::deque<OUString> maFavCharFontList;
uno::Reference< uno::XComponentContext > mxContext;
uno::Reference<uno::XComponentContext> mxContext;
SvxCharView m_aRecentCharView[16];
SvxCharView m_aFavCharView[16];
SvxShowText m_aShowChar;
std::unique_ptr<weld::Button> m_xOKBtn;
std::unique_ptr<weld::Label> m_xFontText;
std::unique_ptr<weld::Button> m_xOKBtn;
std::unique_ptr<weld::Label> m_xFontText;
std::unique_ptr<weld::ComboBox> m_xFontLB;
std::unique_ptr<weld::Label> m_xSubsetText;
std::unique_ptr<weld::Label> m_xSubsetText;
std::unique_ptr<weld::ComboBox> m_xSubsetLB;
std::unique_ptr<weld::Entry> m_xSearchText;
std::unique_ptr<weld::Entry> m_xHexCodeText;
std::unique_ptr<weld::Entry> m_xDecimalCodeText;
std::unique_ptr<weld::Button> m_xFavouritesBtn;
std::unique_ptr<weld::Label> m_xCharName;
std::unique_ptr<weld::Widget> m_xRecentGrid;
std::unique_ptr<weld::Widget> m_xFavGrid;
std::unique_ptr<weld::Entry> m_xSearchText;
std::unique_ptr<weld::Entry> m_xHexCodeText;
std::unique_ptr<weld::Entry> m_xDecimalCodeText;
std::unique_ptr<weld::Button> m_xFavouritesBtn;
std::unique_ptr<weld::Label> m_xCharName;
std::unique_ptr<weld::Widget> m_xRecentGrid;
std::unique_ptr<weld::Widget> m_xFavGrid;
std::unique_ptr<weld::CustomWeld> m_xShowChar;
std::unique_ptr<weld::CustomWeld> m_xRecentCharView[16];
std::unique_ptr<weld::CustomWeld> m_xFavCharView[16];
std::unique_ptr<weld::CustomWeld> m_xFavCharView[16];
std::unique_ptr<SvxShowCharSet> m_xShowSet;
std::unique_ptr<weld::CustomWeld> m_xShowSetArea;
std::unique_ptr<SvxSearchCharSet> m_xSearchSet;
std::unique_ptr<weld::CustomWeld> m_xSearchSetArea;
std::unique_ptr<SfxAllItemSet> m_xOutputSet;
std::unique_ptr<SfxAllItemSet> m_xOutputSet;
enum class Radix : sal_Int16 {decimal = 10, hexadecimal=16};
enum class Radix : sal_Int16
{
decimal = 10,
hexadecimal = 16
};
DECL_LINK(FontSelectHdl, weld::ComboBox&, void);
DECL_LINK(SubsetSelectHdl, weld::ComboBox&, void);
DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void);
DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*, void);
DECL_LINK(CharSelectHdl, SvxShowCharSet*, void);
DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void);
DECL_LINK(CharPreSelectHdl, SvxShowCharSet*, void);
DECL_LINK(FavClickHdl, SvxShowCharSet*,void);
DECL_LINK(SearchCharDoubleClickHdl, SvxShowCharSet*,void);
DECL_LINK(FavClickHdl, SvxShowCharSet*, void);
DECL_LINK(SearchCharDoubleClickHdl, SvxShowCharSet*, void);
DECL_LINK(SearchCharSelectHdl, SvxShowCharSet*, void);
DECL_LINK(SearchCharHighlightHdl, SvxShowCharSet*, void);
DECL_LINK(SearchCharPreSelectHdl, SvxShowCharSet*, void);
......@@ -144,34 +149,33 @@ public:
const SfxItemSet* GetOutputItemSet() const { return m_xOutputSet.get(); }
void DisableFontSelection();
void DisableFontSelection();
const vcl::Font& GetCharFont() const { return aFont;}
void SetCharFont( const vcl::Font& rFont );
const vcl::Font& GetCharFont() const { return aFont; }
void SetCharFont(const vcl::Font& rFont);
void SetChar( sal_UCS4 );
sal_UCS4 GetChar() const;
void SetChar(sal_UCS4);
sal_UCS4 GetChar() const;
void getRecentCharacterList(); //gets both recent char and recent char font list
void updateRecentCharacterList(const OUString& rChar, const OUString& rFont);
void getRecentCharacterList(); //gets both recent char and recent char font list
void updateRecentCharacterList(const OUString& rChar, const OUString& rFont);
void getFavCharacterList(); //gets both Fav char and Fav char font list
void updateFavCharacterList(const OUString& rChar, const OUString& rFont);
void deleteFavCharacterFromList(const OUString& rChar, const OUString& rFont);
bool isFavChar(const OUString& sTitle, const OUString& rFont);
void getFavCharacterList(); //gets both Fav char and Fav char font list
void updateFavCharacterList(const OUString& rChar, const OUString& rFont);
void deleteFavCharacterFromList(const OUString& rChar, const OUString& rFont);
bool isFavChar(const OUString& sTitle, const OUString& rFont);
void updateRecentCharControl();
void insertCharToDoc(const OUString& sChar);
void updateRecentCharControl();
void insertCharToDoc(const OUString& sChar);
void updateFavCharControl();
void setFavButtonState(const OUString& sTitle, const OUString& rFont);
void updateFavCharControl();
void setFavButtonState(const OUString& sTitle, const OUString& rFont);
void setCharName(sal_UCS4 nDecimalValue);
void setCharName(sal_UCS4 nDecimalValue);
void toggleSearchView(bool state);
void toggleSearchView(bool state);
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_CUI_CUIDLLAPI_H
#define INCLUDED_CUI_CUIDLLAPI_H
#include <sal/types.h>
#if defined(CUI_DLLIMPLEMENTATION)
#define CUI_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define CUI_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#endif // INCLUDED_CUI_CUIDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
#ifndef INCLUDED_CUI_NUMBERINGPREVIEW_HXX
#define INCLUDED_CUI_NUMBERINGPREVIEW_HXX
#include <cui/cuidllapi.h>
#include <editeng/numitem.hxx>
#include <vcl/customweld.hxx>
class CUI_DLLPUBLIC SvxNumberingPreview : public weld::CustomWidgetController
{
const SvxNumRule* pActNum;
vcl::Font aStdFont;
bool bPosition;
sal_uInt16 nActLevel;
protected:
virtual void Paint(vcl::RenderContext& rRenderContext,
const ::tools::Rectangle& rRect) override;
public:
SvxNumberingPreview();
void SetNumRule(const SvxNumRule* pNum)
{
pActNum = pNum;
Invalidate();
};
void SetPositionMode() { bPosition = true; }
void SetLevel(sal_uInt16 nSet) { nActLevel = nSet; }
};
#endif
......@@ -31,6 +31,10 @@
#include <svx/svxdllapi.h>
#include <vector>
namespace sd {
class View;
}
namespace com{namespace sun{namespace star{
namespace linguistic2{
class XDictionary;
......@@ -202,6 +206,16 @@ public:
virtual void GetDescription(OUString& rDescription) = 0;
};
class AbstractSvxBulletAndPositionDlg :public VclAbstractDialog
{
protected:
virtual ~AbstractSvxBulletAndPositionDlg() override = default;
public:
virtual const SfxItemSet* GetOutputItemSet( SfxItemSet* pSet) const = 0 ;
virtual bool IsApplyToMaster() = 0;
virtual bool IsSlideScope() = 0;
};
class AbstractSvxMessDialog :public VclAbstractDialog
{
protected:
......@@ -391,7 +405,6 @@ public:
// #i68101#
virtual VclPtr<AbstractSvxObjectNameDialog> CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) = 0;
virtual VclPtr<AbstractSvxObjectTitleDescDialog> CreateSvxObjectTitleDescDialog(weld::Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0;
virtual VclPtr<AbstractSvxMultiPathDialog> CreateSvxMultiPathDialog(weld::Window* pParent) = 0 ;
virtual VclPtr<AbstractSvxMultiPathDialog> CreateSvxPathSelectDialog(weld::Window* pParent) = 0 ;
virtual VclPtr<AbstractSvxHpLinkDlg> CreateSvxHpLinkDlg(vcl::Window* pParent, SfxBindings* pBindings)=0;
......
......@@ -287,6 +287,7 @@ class SfxStringItem;
#define SID_PRESENTATION ( SID_SVX_START + 157 )
#define SID_PRESENTATION_CURRENT_SLIDE ( SID_SVX_START + 158 )
#define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 )
#define SID_NUMBERING_AND_POSITION ( SID_SVX_START + 160 )
#define SID_HIDE_SLIDE ( SID_SVX_START + 161 )
#define SID_ATTR_FILL_STYLE ( SID_SVX_START + 164 )
#define SID_ATTR_FILL_COLOR ( SID_SVX_START + 165 )
......
......@@ -2879,6 +2879,14 @@
<value>7</value>
</prop>
</node>
<node oor:name=".uno:NumberingAndPosition" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Numbering and Position...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
</prop>
</node>
<node oor:name=".uno:EditDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">E~dit Mode</value>
......
......@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,sdui,\
tl \
utl \
vcl \
cui \
))
$(eval $(call gb_Library_add_exception_objects,sdui,\
......@@ -91,6 +92,7 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
sd/source/ui/dlg/tpoption \
sd/source/ui/dlg/vectdlg \
sd/source/ui/dlg/PhotoAlbumDialog \
sd/source/ui/dlg/BulletAndPositionDlg \
))
# $(WORKDIR)/inc/sd/sddll0.hxx :
......
......@@ -26,6 +26,7 @@
#include <svl/itemset.hxx>
#include <tools/solar.h>
#include <vcl/abstdlg.hxx>
#include <svx/svxdlg.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
......@@ -170,6 +171,7 @@ class SdAbstractDialogFactory
public:
SD_DLLPUBLIC static SdAbstractDialogFactory* Create();
virtual VclPtr<AbstractSvxBulletAndPositionDlg> CreateSvxBulletAndPositionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0;
virtual VclPtr<VclAbstractDialog> CreateBreakDlg(weld::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0;
virtual VclPtr<AbstractCopyDlg> CreateCopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView ) = 0;
virtual VclPtr<AbstractSdCustomShowDlg> CreateSdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc) = 0;
......
......@@ -489,6 +489,8 @@
#define STR_CTRLCLICKHYPERLINK NC_("STR_CTRLCLICKHYPERLINK", "%s-click to follow hyperlink: ")
#define STR_CLICKHYPERLINK NC_("STR_CLICKHYPERLINK", "Click to open hyperlink: ")
#define RID_SVXSTR_EDIT_GRAPHIC NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -710,6 +710,12 @@ interface DrawView
StateMethod = GetMenuState ;
MenuConfig = TRUE;
]
SID_NUMBERING_AND_POSITION // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
MenuConfig = TRUE;
]
FN_SVX_SET_BULLET
[
ExecMethod = FuTemporary ;
......
This diff is collapsed.
......@@ -46,11 +46,31 @@
IMPL_ABSTDLG_BASE(SdVclAbstractDialog_Impl);
short AbstractSvxBulletAndPositionDlg_Impl::Execute()
{
return m_xDlg->run();
}
short SdAbstractGenericDialog_Impl::Execute()
{
return m_xDlg->run();
}
const SfxItemSet* AbstractSvxBulletAndPositionDlg_Impl::GetOutputItemSet( SfxItemSet* pSet ) const
{
return m_xDlg->GetOutputItemSet( pSet );
}
bool AbstractSvxBulletAndPositionDlg_Impl::IsApplyToMaster()
{
return m_xDlg->IsApplyToMaster();
}
bool AbstractSvxBulletAndPositionDlg_Impl::IsSlideScope()
{
return m_xDlg->IsSlideScope();
}
short AbstractCopyDlg_Impl::Execute()
{
return m_xDlg->run();
......@@ -362,6 +382,11 @@ void AbstractSdPublishingDlg_Impl::GetParameterSequence( css::uno::Sequence< css
//-------------- SdAbstractDialogFactory implementation--------------
VclPtr<AbstractSvxBulletAndPositionDlg> SdAbstractDialogFactory_Impl::CreateSvxBulletAndPositionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView)
{
return VclPtr<AbstractSvxBulletAndPositionDlg_Impl>::Create(std::make_unique<SvxBulletAndPositionDlg>(pParent, *pAttr, pView));
}
VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateBreakDlg(
weld::Window* pParent,
::sd::DrawView* pDrView,
......
......@@ -22,6 +22,7 @@
#include <sdabstdlg.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/sfxdlg.hxx>
#include <svx/svxdlg.hxx>
#include <morphdlg.hxx>
#include <copydlg.hxx>
......@@ -38,6 +39,7 @@
#include <dlgsnap.hxx>
#include <present.hxx>
#include <vectdlg.hxx>
#include <BulletAndPositionDlg.hxx>
#define DECL_ABSTDLG_BASE(Class,DialogClass) \
ScopedVclPtr<DialogClass> pDlg; \
......@@ -79,6 +81,23 @@ bool Class::StartExecuteAsync(AsyncContext &ctx) \
// class MasterLayoutDialog;
//}
class SvxBulletAndPositionDlg;
class AbstractSvxBulletAndPositionDlg_Impl :public AbstractSvxBulletAndPositionDlg
{
std::unique_ptr<SvxBulletAndPositionDlg> m_xDlg;
public:
explicit AbstractSvxBulletAndPositionDlg_Impl(std::unique_ptr<SvxBulletAndPositionDlg> p)
: m_xDlg(std::move(p))
{
}
virtual short Execute() override;
virtual const SfxItemSet* GetOutputItemSet( SfxItemSet* ) const override ;
virtual bool IsApplyToMaster() override;
virtual bool IsSlideScope() override;
};
class SdVclAbstractDialog_Impl : public VclAbstractDialog
{
DECL_ABSTDLG_BASE(SdVclAbstractDialog_Impl,Dialog)
......@@ -343,6 +362,7 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory
public:
virtual ~SdAbstractDialogFactory_Impl() {}
virtual VclPtr<AbstractSvxBulletAndPositionDlg> CreateSvxBulletAndPositionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) override;
virtual VclPtr<VclAbstractDialog> CreateBreakDlg(weld::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount) override;
virtual VclPtr<AbstractCopyDlg> CreateCopyDlg(weld::Window* pParent, const SfxItemSet& rInAttrs, ::sd::View* pView) override;
virtual VclPtr<AbstractSdCustomShowDlg> CreateSdCustomShowDlg(weld::Window* pParent, SdDrawDocument& rDrawDoc) override;
......
This diff is collapsed.
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SD_SOURCE_UI_INC_BULLETANDPOSITIONDIALOG_HXX
#define INCLUDED_SD_SOURCE_UI_INC_BULLETANDPOSITIONDIALOG_HXX
#include <vector>
#include <memory>
#include <sfx2/tabdlg.hxx>
#include <svx/Palette.hxx>
#include <editeng/numdef.hxx>
#include <editeng/svxenum.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/weld.hxx>
#include "View.hxx"
#include <cui/numberingpreview.hxx>
#define MN_GALLERY_ENTRY 100
class ColorListBox;
class NumValueSet;
class SvxNumRule;
class SvxBmpNumValueSet;
class SvxBrushItem;
class ValueSet;
class SdDrawDocument;
namespace sd
{
class View;
}
class SvxBulletAndPositionDlg : public weld::GenericDialogController
{
OUString m_sNumCharFmtName;
OUString m_sBulletCharFormatName;
Timer aInvalidateTimer;
std::unique_ptr<SvxNumRule> pActNum;
std::unique_ptr<SvxNumRule> pSaveNum;
Size aInitSize[SVX_MAX_NUM];
bool bLastWidthModified : 1;
bool bModified : 1;
bool bPreset : 1;
bool bAutomaticCharStyles : 1;
bool bHTMLMode : 1;
bool bInInitControl : 1; // workaround for Modify-error, is said to be corrected from 391 on
bool bLabelAlignmentPosAndSpaceModeActive;
bool bApplyToMaster;
bool bIsSlideScope;
std::vector<OUString> aGrfNames;
vcl::Font aActBulletFont;
sal_uInt8 nBullet;
sal_uInt16 nActNumLvl;
weld::Window* p_Window;
sal_uInt16 nNumItemId;
MapUnit eCoreUnit;
::sd::View* p_View;
SvxNumberingPreview m_aPreviewWIN;
std::unique_ptr<weld::Widget> m_xGrid;
std::unique_ptr<weld::TreeView> m_xLevelLB;
std::unique_ptr<weld::ComboBox> m_xFmtLB;
std::unique_ptr<weld::Label> m_xPrefixFT;
std::unique_ptr<weld::Entry> m_xPrefixED;
std::unique_ptr<weld::Label> m_xSuffixFT;
std::unique_ptr<weld::Entry> m_xSuffixED;
std::unique_ptr<weld::Expander> m_xBeforeAfter;
std::unique_ptr<weld::Label> m_xBulColorFT;
std::unique_ptr<ColorListBox> m_xBulColLB;
std::unique_ptr<weld::Label> m_xBulRelSizeFT;
std::unique_ptr<weld::MetricSpinButton> m_xBulRelSizeMF;
std::unique_ptr<weld::Label> m_xStartFT;
std::unique_ptr<weld::SpinButton> m_xStartED;
std::unique_ptr<weld::Label> m_xBulletFT;
std::unique_ptr<weld::Button> m_xBulletPB;
std::unique_ptr<weld::MenuButton> m_xBitmapMB;
std::unique_ptr<weld::Label> m_xWidthFT;
std::unique_ptr<weld::MetricSpinButton> m_xWidthMF;
std::unique_ptr<weld::Label> m_xHeightFT;
std::unique_ptr<weld::MetricSpinButton> m_xHeightMF;
std::unique_ptr<weld::CheckButton> m_xRatioCB;
std::unique_ptr<weld::Menu> m_xGalleryMenu;
std::unique_ptr<weld::CustomWeld> m_xPreviewWIN;
std::unique_ptr<weld::Label> m_xDistBorderFT;
std::unique_ptr<weld::MetricSpinButton> m_xDistBorderMF;
std::unique_ptr<weld::CheckButton> m_xRelativeCB;
std::unique_ptr<weld::Label> m_xIndentFT;
std::unique_ptr<weld::MetricSpinButton> m_xIndentMF;
std::unique_ptr<weld::ToggleButton> m_xLeftTB;
std::unique_ptr<weld::ToggleButton> m_xCenterTB;
std::unique_ptr<weld::ToggleButton> m_xRightTB;
std::unique_ptr<weld::RadioButton> m_xSlideRB;
std::unique_ptr<weld::RadioButton> m_xSelectionRB;