[Libreoffice-commits] core.git: include/tools rsc/inc rsc/source

Caolán McNamara caolanm at redhat.com
Sat Jan 30 06:05:40 PST 2016


 include/tools/rcid.h          |    1 -
 rsc/inc/rscdb.hxx             |    1 -
 rsc/source/parser/rscicpx.cxx |   18 ------------------
 rsc/source/parser/rscinit.cxx |    3 ---
 4 files changed, 23 deletions(-)

New commits:
commit 2488777df33b7207c21461239322190681ea6756
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 29 21:24:09 2016 +0000

    ditch loading of SplitWindows from resource files
    
    Change-Id: Ic56aa8d3dcafc24e1a1a1d494d20b0d23b41677d

diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index ec37ea3..c41a2f3 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -69,7 +69,6 @@
 
 #define RSC_FIXEDIMAGE          (RSC_NOTYPE + 0x5a)
 
-#define RSC_SPLITWINDOW         (RSC_NOTYPE + 0x60)
 #define RSC_SPINFIELD           (RSC_NOTYPE + 0x61)
 
 #define RSC_NUMERICFIELD        (RSC_NOTYPE + 0x63)
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 2c25301..c7c4958 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -197,7 +197,6 @@ class RscTypCont
     RscTop *    InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap,
                                    RscTop * pClassKeyCode );
     RscTop *    InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
-    RscTop *    InitClassSplitWindow( RscTop * pSuper );
 
     RscTop *    InitClassNumericFormatter( RscTop * pSuper );
     RscTop *    InitClassMetricFormatter( RscTop * pSuper,
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index e19e78e..95bb420 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -910,24 +910,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
     return pClassMenu;
 }
 
-RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper )
-{
-    Atom        nId;
-    RscTop *    pClassSplitWindow;
-
-    // initialize class
-    nId = pHS->getID( "SplitWindow" );
-    pClassSplitWindow = new RscClass( nId, RSC_SPLITWINDOW, pSuper );
-    pClassSplitWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
-    aNmTb.Put( nId, CLASSNAME, pClassSplitWindow );
-
-    INS_WINBIT(pClassSplitWindow,Sizeable)
-    INS_WINBIT(pClassSplitWindow,NoSplitDraw)
-
-    return pClassSplitWindow;
-}
-
 RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper )
 {
     Atom        nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 30ca6a7..77a2a5c 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -393,9 +393,6 @@ void RscTypCont::Init()
                                  RSC_MENUITEM_MENU );
 }
 {
-    RscTop* pClassSplitWindow = InitClassSplitWindow( pClassWindow );
-    pRoot->Insert( pClassSplitWindow );
-
     // initialize class
     nId = pHS->getID( "SpinButton" );
     RscTop*  pClassSpinButton = new RscClass( nId, RSC_SPINBUTTON, pClassControl );


More information about the Libreoffice-commits mailing list