include/tools/rcid.h | 1 - include/vcl/split.hxx | 1 - rsc/inc/rscdb.hxx | 1 - rsc/source/parser/rscicpx.cxx | 18 ------------------ rsc/source/parser/rscinit.cxx | 4 ---- vcl/source/window/split.cxx | 16 ---------------- 6 files changed, 41 deletions(-)
New commits: commit 5488b315b6914fb085ce2d9a99e4162ff74a8337 Author: Caolán McNamara <[email protected]> Date: Sun Dec 28 09:55:54 2014 +0000 splitters no longer loaded from resource files Change-Id: I84ee0c754118882734301bf1d34c15ba640a3889 diff --git a/include/tools/rcid.h b/include/tools/rcid.h index eb54647..260626e 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -72,7 +72,6 @@ #define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a) -#define RSC_SPLITTER (RSC_NOTYPE + 0x5f) #define RSC_SPLITWINDOW (RSC_NOTYPE + 0x60) #define RSC_SPINFIELD (RSC_NOTYPE + 0x61) diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index d2b8f4f..b490566 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -204,7 +204,6 @@ class RscTypCont RscTop * InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassKeyCode ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); - RscTop * InitClassSplitter( RscTop * pSuper ); RscTop * InitClassSplitWindow( RscTop * pSuper ); RscTop * InitClassTime( RscTop * pSuper ); RscTop * InitClassDate( RscTop * pSuper ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 35fc0ff..24f65dd 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -911,24 +911,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper, return pClassMenu; } -RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassSplitter; - - // Klasse anlegen - nId = pHS->getID( "Splitter" ); - pClassSplitter = new RscClass( nId, RSC_SPLITTER, pSuper ); - pClassSplitter->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - - aNmTb.Put( nId, CLASSNAME, pClassSplitter ); - - INS_WINBIT(pClassSplitter,HScroll); - INS_WINBIT(pClassSplitter,VScroll); - - return pClassSplitter; -} - RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index e476463..de4f0aa 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -86,7 +86,6 @@ void RscTypCont::Init() RscTop * pClassAccel; RscTop * pClassMenuItem; RscTop * pClassMenu; - RscTop * pClassSplitter; RscTop * pClassSplitWindow; RscTop * pClassSpinButton; RscTop * pClassTime; @@ -420,9 +419,6 @@ void RscTypCont::Init() RSC_MENUITEM_MENU ); } { - pClassSplitter = InitClassSplitter( pClassWindow ); - pRoot->Insert( pClassSplitter ); - pClassSplitWindow = InitClassSplitWindow( pClassWindow ); pRoot->Insert( pClassSplitWindow ); commit 40aeb8ba411a8f9682bc7213a69b7e9ec2c66f4a Author: Caolán McNamara <[email protected]> Date: Sun Dec 28 09:53:10 2014 +0000 callcatcher: update unused code Change-Id: Idb5df3a8dd89d56ae1b70b05d5c6baf01e27b569 diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index b478317..1ed55f4 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -63,7 +63,6 @@ protected: public: explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); - explicit Splitter( vcl::Window* pParent, const ResId& ); virtual ~Splitter(); virtual void StartSplit(); diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 6f4de66..60efeb9 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -149,22 +149,6 @@ Splitter::Splitter( vcl::Window* pParent, WinBits nStyle ) : SetFillColor(); } -Splitter::Splitter( vcl::Window* pParent, const ResId& rResId ) : - Window( WINDOW_SPLITTER ) -{ - ImplInitSplitterData(); - rResId.SetRT( RSC_SPLITTER ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - SetLineColor(); - SetFillColor(); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - Splitter::~Splitter() { TaskPaneList *pTList = GetSystemWindow()->GetTaskPaneList();
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
