diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/form/fmshell.cxx | 3 | ||||
-rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 28 | ||||
-rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 25 |
3 files changed, 11 insertions, 45 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 0df17375bb04..987e729e645b 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -161,7 +161,6 @@ FmDesignModeChangedHint::~FmDesignModeChangedHint() { } - const sal_uInt32 FM_UI_FEATURE_SHOW_DATABASEBAR = 0x00000001; const sal_uInt32 FM_UI_FEATURE_SHOW_FIELD = 0x00000002; const sal_uInt32 FM_UI_FEATURE_SHOW_PROPERTIES = 0x00000004; @@ -175,6 +174,8 @@ const sal_uInt32 FM_UI_FEATURE_TB_FORMDESIGN = 0x00000200; const sal_uInt32 FM_UI_FEATURE_SHOW_DATANAVIGATOR = 0x00000400; SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL)) + +void FmFormShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC, SVX_RES(RID_SVXTBX_FORM_NAVIGATION), diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 08b13f3855ff..191e91dcb05e 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -41,7 +41,6 @@ #include <svx/extrusionbar.hxx> #include "extrusiondepthdialog.hxx" - using namespace ::svx; using namespace ::rtl; using namespace ::cppu; @@ -49,32 +48,22 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; -/************************************************************************* -|* -|* Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also -|* tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). -|* -\************************************************************************/ - +// Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also +// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). SFX_SLOTMAP(ExtrusionBar) { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell, SVX_RES(RID_SVX_EXTRUSION_BAR)) + +void ExtrusionBar::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_EXTRUSION_BAR) ); } TYPEINIT1( ExtrusionBar, SfxShell ); - -/************************************************************************* -|* -|* Standard-Konstruktor -|* -\************************************************************************/ - ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) : SfxShell(pViewShell) { @@ -86,13 +75,6 @@ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) SetName(SVX_RESSTR(RID_SVX_EXTRUSION_BAR)); } - -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - ExtrusionBar::~ExtrusionBar() { SetRepeatTarget(NULL); diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 5cd2b14ae900..24a1c25b927c 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -165,32 +165,22 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.Put( SfxStringItem( SID_FONTWORK_SHAPE_TYPE, aFontWorkShapeType ) ); } -/************************************************************************* -|* -|* Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also -|* tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). -|* -\************************************************************************/ - +// Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also +// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). SFX_SLOTMAP(FontworkBar) { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; SFX_IMPL_INTERFACE(FontworkBar, SfxShell, SVX_RES(RID_SVX_FONTWORK_BAR)) + +void FontworkBar::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_FONTWORK_BAR)); } TYPEINIT1( FontworkBar, SfxShell ); - -/************************************************************************* -|* -|* Standard-Konstruktor -|* -\************************************************************************/ - FontworkBar::FontworkBar(SfxViewShell* pViewShell ) : SfxShell(pViewShell) { @@ -202,13 +192,6 @@ FontworkBar::FontworkBar(SfxViewShell* pViewShell ) SetName( SVX_RESSTR( RID_SVX_FONTWORK_BAR )); } - -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - FontworkBar::~FontworkBar() { SetRepeatTarget(NULL); |