summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--l10ntools/inc/export.hxx1
-rw-r--r--l10ntools/source/merge.cxx10
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx2
-rw-r--r--sfx2/source/menu/mnuitem.cxx5
-rw-r--r--sfx2/source/menu/thessubmenu.cxx7
-rw-r--r--sfx2/source/menu/thessubmenu.hxx2
-rw-r--r--svx/inc/svx/grafctrl.hxx6
-rw-r--r--svx/inc/svx/lboxctrl.hxx2
-rw-r--r--svx/inc/svx/tbcontrl.hxx3
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx5
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx6
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx6
-rwxr-xr-xunusedcode.easy4
-rw-r--r--vcl/inc/vcl/menu.hxx2
-rw-r--r--vcl/source/window/menu.cxx5
15 files changed, 30 insertions, 36 deletions
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index ff8a6791750c..97efcd92c950 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -381,7 +381,6 @@ private:
public:
PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
- rtl::OString Dump();
void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
{
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 55c62d14cf98..138846016b02 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -50,16 +50,6 @@ namespace
// class PFormEntrys
//
-rtl::OString PFormEntrys::Dump()
-{
- if (sText.size())
- {
- rtl::OString a(RTL_CONSTASCII_STRINGPARAM("sText"));
- Export::DumpMap(a , sText);
- }
- return rtl::OString(RTL_CONSTASCII_STRINGPARAM("PFormEntrys\n"));
-}
-
sal_Bool PFormEntrys::GetTransex3Text( rtl::OString &rReturn,
sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel )
{
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 62ebce679ed4..88871d598084 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -138,7 +138,7 @@ protected:
DECL_LINK( Activate, Menu * );
public:
- SFX_DECL_MENU_CONTROL();
+ static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
~SfxAppMenuControl_Impl();
};
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 4f6e1b4e147f..c01f7b37a3b7 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -303,7 +303,10 @@ PopupMenu* SfxMenuControl::GetPopup () const
long Select_Impl( void* pHdl, void* pVoid );
-SFX_IMPL_MENU_CONTROL( SfxAppMenuControl_Impl, SfxStringItem );
+SfxMenuControl* SfxAppMenuControl_Impl::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
+{
+ return new SfxAppMenuControl_Impl(nId, rMenu, rBindings);
+}
SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 318b287173f7..1bda672e3610 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -53,9 +53,10 @@ using ::rtl::OUString;
// STATIC DATA -----------------------------------------------------------
-SFX_IMPL_MENU_CONTROL(SfxThesSubMenuControl, SfxStringItem);
-
-
+SfxMenuControl* SfxThesSubMenuControl::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
+{
+ return new SfxThesSubMenuControl(nId, rMenu, rBindings);
+}
/*
Constructor; sets the Select-Handler for the Menu and inserts it into
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index 8ec3977f318b..b177b112d58a 100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -57,7 +57,7 @@ public:
virtual PopupMenu* GetPopup() const;
- SFX_DECL_MENU_CONTROL();
+ static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
};
diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index ee5ffa0c2b54..27816f282d7e 100644
--- a/svx/inc/svx/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
@@ -73,10 +73,10 @@ public:
class SvxGrafToolBoxControl : public SfxToolBoxControl
{
public:
+ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
- SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
- ~SvxGrafToolBoxControl();
+ SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
+ ~SvxGrafToolBoxControl();
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 1e5058854bd0..ce6aa8c0fc22 100644
--- a/svx/inc/svx/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
@@ -51,7 +51,7 @@ protected:
DECL_LINK( SelectHdl, void * );
public:
- SFX_DECL_TOOLBOX_CONTROL();
+ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~SvxListBoxControl();
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 32f218d15f17..e0f0bdd1a5a6 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -430,7 +430,8 @@ private:
SvxReloadControllerItem_Impl* pImpl;
public:
- SFX_DECL_TOOLBOX_CONTROL();
+ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
+
SvxReloadControllerItem( sal_uInt16 nSlotId,
sal_uInt16 nId,
ToolBox& rTbx );
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index bcadbef7f4f3..5e4d30008731 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -546,7 +546,10 @@ SfxPopupWindow* SvxGrafFilterToolBoxControl::CreatePopupWindow()
// - SvxGrafToolBoxControl -
// -------------------------
-SFX_IMPL_TOOLBOX_CONTROL( SvxGrafToolBoxControl, SfxVoidItem );
+SfxToolBoxControl* SvxGrafToolBoxControl::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
+{
+ return new SvxGrafToolBoxControl( nSlotId, nId, rTbx );
+}
// -----------------------------------------------------------------------------
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index b16be0c56609..2c3bfe407e5c 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -164,8 +164,10 @@ Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow()
/////////////////////////////////////////////////////////////////
-SFX_IMPL_TOOLBOX_CONTROL( SvxListBoxControl, SfxStringItem );
-
+SfxToolBoxControl* SvxListBoxControl::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
+{
+ return new SvxListBoxControl( nSlotId, nId, rTbx );
+}
SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx ),
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 067a0ca79707..6e1421eb91f2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -127,9 +127,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxColorToolBoxControl, SvxColorItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameToolBoxControl, SvxBoxItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineStyleToolBoxControl, SvxLineItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineColorToolBoxControl, SvxColorItem );
-SFX_IMPL_TOOLBOX_CONTROL( SvxReloadControllerItem, SfxBoolItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxSimpleUndoRedoController, SfxStringItem );
+SfxToolBoxControl* SvxReloadControllerItem::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
+{
+ return new SvxReloadControllerItem( nSlotId, nId, rTbx );
+}
+
//========================================================================
// class SvxStyleBox_Impl -----------------------------------------------------
//========================================================================
diff --git a/unusedcode.easy b/unusedcode.easy
index 21f230ac0c59..4e27d2eec969 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -148,7 +148,6 @@ SfxOleStringPropertyBase::SfxOleStringPropertyBase(int, int, unsigned short, Str
SfxPartChildWnd_Impl::GetChildWindowId()
SfxPopupWindow::LinkStubDelete(void*, void*)
SfxRecordingFloatWrapper_Impl::GetChildWindowId()
-SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*)
SfxUINT32s::Insert(SfxUINT32s const*, unsigned short, unsigned short, unsigned short)
SfxUINT32s::Remove(unsigned short, unsigned short)
SfxUINT32s::Replace(unsigned int const&, unsigned short)
@@ -262,12 +261,10 @@ SvxDrawOutlinerViewForwarder::SetShapePos(Point const&)
SvxDrawPage::SvxDrawPage()
SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool)
SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short)
-SvxGrafToolBoxControl::RegisterControl(unsigned short, SfxModule*)
SvxIMapDlg::GetTargetList() const
SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short)
SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char)
-SvxListBoxControl::RegisterControl(unsigned short, SfxModule*)
SvxMSDffManager::GetAutoForm(MSO_SPT) const
SvxMSDffManager::ImportFontWork(SvStream&, SfxItemSet&, Rectangle&) const
SvxMSDffManager::Scale(PolyPolygon&) const
@@ -287,7 +284,6 @@ SvxPluginFileDlg::IsAvailable(unsigned short)
SvxPopupWindowListBox::StartSelection()
SvxRectCtlAccessibleContext::CommitChange(com::sun::star::accessibility::AccessibleEventObject const&)
SvxRelativeField::SvxRelativeField(Window*, long)
-SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
SvxRubyChildWindow::GetChildWindowId()
SvxRuler::GetDefTabDist() const
SvxSelectionModeControl::GetDefItemWidth(StatusBar const&)
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index dd7f5c12168d..c2d10476461b 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -207,7 +207,7 @@ protected:
SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel );
public:
SAL_DLLPRIVATE void ImplKillLayoutData() const;
- SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const;
+ SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; }
Menu();
Menu( sal_Bool bMenuBar );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index fb8557de56c4..1f104f40cd7e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -977,11 +977,6 @@ void Menu::ImplInit()
mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu( bIsMenuBar, this );
}
-Menu* Menu::ImplGetStartedFrom() const
-{
- return pStartedFrom;
-}
-
void Menu::ImplLoadRes( const ResId& rResId )
{
ResMgr* pMgr = rResId.GetResMgr();
generated by cgit (git 2.34.1) at 2025-02-02 02:45:28 +0000