summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-13 09:29:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-13 11:18:36 +0000
commitd40971a47838afd007b8563d16bc8176b7f43176 (patch)
tree3752aab7d3653d6063dc75c76dad4f8f5d0c4aa0
parentcallcatcher: update unused code (diff)
downloadcore-d40971a47838afd007b8563d16bc8176b7f43176.tar.gz
core-d40971a47838afd007b8563d16bc8176b7f43176.zip
MoreButtons cannot be loaded from .src anymore
Change-Id: Ib831895b33323dd478cc125b3bf93c43826ef59d
-rw-r--r--include/sfx2/new.hxx1
-rw-r--r--include/svx/srchdlg.hxx1
-rw-r--r--include/tools/rc.h5
-rw-r--r--include/tools/rcid.h2
-rw-r--r--include/vcl/morebtn.hxx1
-rw-r--r--rsc/inc/rscdb.hxx1
-rw-r--r--rsc/source/parser/rscicpx.cxx25
-rw-r--r--rsc/source/parser/rscinit.cxx4
-rw-r--r--sc/source/ui/inc/pvlaydlg.hxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx1
-rw-r--r--tools/source/rc/resmgr.cxx1
-rw-r--r--vcl/source/control/morebtn.cxx20
12 files changed, 1 insertions, 63 deletions
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index 3b0a91607e30..e567a2d75736 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -32,7 +32,6 @@
class SfxObjectShellLock;
class SfxObjectShell;
-class MoreButton;
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index e4fb11fcbb02..b257bc3a310e 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -36,7 +36,6 @@
#include <vector>
class SvxSearchItem;
-class MoreButton;
class SfxStyleSheetBasePool;
class SvxJSearchOptionsPage;
class SvxSearchController;
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 022bd143b618..834b8b31aa04 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -156,11 +156,6 @@ typedef short RSWND_STYLE;
#define RSC_TOOLBOX_ITEMIMAGELIST 0x40
#define RSC_TOOLBOX_ITEMLIST 0x80
-// For "MoreButton" resources:
-#define RSC_MOREBUTTON_STATE 0x01
-#define RSC_MOREBUTTON_MAPUNIT 0x02
-#define RSC_MOREBUTTON_DELTA 0x04
-
// For "FloatingWindow" resources:
#define RSC_FLOATINGWINDOW_WHMAPMODE 0x01
#define RSC_FLOATINGWINDOW_WIDTH 0x02
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index d3f90059a38f..472bd5be701c 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -68,7 +68,7 @@
#define RSC_HELPBUTTON (RSC_NOTYPE + 0x49)
#define RSC_IMAGEBUTTON (RSC_NOTYPE + 0x4a)
#define RSC_MENUBUTTON (RSC_NOTYPE + 0x4b)
-#define RSC_MOREBUTTON (RSC_NOTYPE + 0x4c)
+
#define RSC_SPINBUTTON (RSC_NOTYPE + 0x4d)
#define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e)
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index 3ccec305927b..ae2482804bff 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -47,7 +47,6 @@ private:
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
explicit MoreButton( Window* pParent, WinBits nStyle = 0 );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 545f328cb46e..4582e4c31fb2 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -238,7 +238,6 @@ class RscTypCont
RscTop * InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem,
RscTop * pClassImageList );
RscTop * InitClassStatusBar( RscTop * pSuper );
- RscTop * InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit );
RscTop * InitClassFloatingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
RscTop * InitClassTabControlItem( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index c808488817bc..071ee2e56bff 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1899,31 +1899,6 @@ RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper )
return pClassStatusBar;
}
-RscTop * RscTypCont::InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit )
-{
- Atom nId;
- RscTop * pClassMoreButton;
-
- // Klasse anlegen
- nId = pHS->getID( "MoreButton" );
- pClassMoreButton = new RscClass( nId, RSC_MOREBUTTON, pSuper );
- pClassMoreButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassMoreButton );
-
- // Variablen anlegen
- nId = aNmTb.Put( "State", VARNAME );
- pClassMoreButton->SetVariable( nId, &aBool, NULL, 0,
- RSC_MOREBUTTON_STATE );
- nId = aNmTb.Put( "MapUnit", VARNAME );
- pClassMoreButton->SetVariable( nId, pMapUnit, NULL, 0,
- RSC_MOREBUTTON_MAPUNIT );
- nId = aNmTb.Put( "Delta", VARNAME );
- pClassMoreButton->SetVariable( nId, &aUShort, NULL, 0,
- RSC_MOREBUTTON_DELTA );
-
- return pClassMoreButton;
-}
-
RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 015a882283bd..4c00845679c4 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -131,7 +131,6 @@ void RscTypCont::Init()
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
RscTop * pClassStatusBar;
- RscTop * pClassMoreButton;
RscTop * pClassFloatingWindow;
RscTop * pClassTabPage;
RscTop * pClassTabDialog;
@@ -711,9 +710,6 @@ void RscTypCont::Init()
pClassStatusBar = InitClassStatusBar( pClassWindow );
pRoot->Insert( pClassStatusBar );
- pClassMoreButton = InitClassMoreButton( pClassPushButton, pMapUnit );
- pRoot->Insert( pClassMoreButton );
-
pClassFloatingWindow = InitClassFloatingWindow( pClassSystemWindow,
pMapUnit );
pRoot->Insert( pClassFloatingWindow );
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index a39f62c8322c..3ecbeacd8129 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -240,8 +240,6 @@ private:
CancelButton* mpBtnCancel;
PushButton* mpBtnRemove;
PushButton* mpBtnOptions;
- //FIXME: replace with expander
- //MoreButton* mpBtnMore;
VclExpander* mpExpander;
std::vector<OUString> maFuncNames; /// Localized function names from resource.
boost::ptr_vector<OUString> maRefStrs; /// Reference strings stored with the output list box.
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index c11df6737bbd..2ffe5262d429 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -478,7 +478,6 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
m_pDefaultVS->SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl));
- // announce Controls for additional region at the MoreButton
Link aCLNrLk = LINK(this, SwColumnPage, ColModify);
m_pCLNrEdt->SetModifyHdl(aCLNrLk);
Link aLk = LINK(this, SwColumnPage, GapModify);
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index e56a5d9a7ccf..ff22b10fbf12 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1504,7 +1504,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_TIMEBOX: aHID.append( "TimeBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
- case RSC_MOREBUTTON: aHID.append( "MoreButton" ); break;
default:
// no type, no auto HID
return OString();
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index fea5a81dfa05..0146cefce4ff 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -78,26 +78,6 @@ MoreButton::MoreButton( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-void MoreButton::ImplLoadRes( const ResId& rResId )
-{
- PushButton::ImplLoadRes( rResId );
-
- sal_uLong nObjMask = ReadLongRes();
-
- if ( nObjMask & RSC_MOREBUTTON_STATE )
- {
- // Don't call method as Dialog should not be switched over
- mbState = ReadShortRes() != 0;
- // SetText( GetText() );
- ShowState();
- }
- if ( nObjMask & RSC_MOREBUTTON_MAPUNIT )
- meUnit = (MapUnit)ReadLongRes();
- if ( nObjMask & RSC_MOREBUTTON_DELTA )
- // Size for resizing the Dialog
- mnDelta = ReadShortRes();
-}
-
MoreButton::~MoreButton()
{
delete mpMBData->mpItemList;