MoreButtons cannot be loaded from .src anymore

Change-Id: Ib831895b33323dd478cc125b3bf93c43826ef59d

include/sfx2/new.hxx

@@ -32,7 +32,6 @@
 
 class SfxObjectShellLock;
 class SfxObjectShell;
-class MoreButton;
 
 
 

include/svx/srchdlg.hxx

@@ -36,7 +36,6 @@
 #include <vector>
 
 class SvxSearchItem;
-class MoreButton;
 class SfxStyleSheetBasePool;
 class SvxJSearchOptionsPage;
 class SvxSearchController;

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

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)
 

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 );

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 );

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 )
 {

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 );

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.

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);

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();

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;