diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 13:31:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 14:00:16 +0100 |
| commit | 0148bcbeccf1e62f789a5fadd65a359840854f1b (patch) | |
| tree | d4e70397a93084fbd1aa43c6808a775e6339b4cc | |
| parent | e9e629358396926b4a907a2c89213b1b413e628b (diff) | |
no FixedLines are loaded from resources files anymore
Change-Id: I5b38c42e5b7fe7932e0dcc2539579d342ea9cf3b
| -rw-r--r-- | include/tools/rcid.h | 1 | ||||
| -rw-r--r-- | include/vcl/fixed.hxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 13 | ||||
| -rw-r--r-- | vcl/source/control/fixed.cxx | 12 |
4 files changed, 0 insertions, 27 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 492e078b7a52..0f98bed3064f 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -62,7 +62,6 @@ #define RSC_LISTBOX (RSC_NOTYPE + 0x55) #define RSC_TEXT (RSC_NOTYPE + 0x57) -#define RSC_FIXEDLINE (RSC_NOTYPE + 0x58) #define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a) diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 85f3a234a641..42090549d98a 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -107,7 +107,6 @@ protected: public: explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); - explicit FixedLine( vcl::Window* pParent, const ResId& ); virtual void ApplySettings(vcl::RenderContext&) override; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 9860c4b739b6..bb5d249ea64a 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -38,9 +38,6 @@ #include <rsclex.hxx> #include <rscyacc.hxx> -#define INS_WINBIT( pClass, WinBit ) \ - InsWinBit( pClass, #WinBit, n##WinBit##Id ); - void RscTypCont::Init() { RscEnum * pFieldUnits; @@ -419,16 +416,6 @@ void RscTypCont::Init() RscTop* pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem ); pRoot->Insert( pClassToolBox ); - // initialize class - nId = pHS->getID( "FixedLine" ); - RscTop* pClassFixedLine = new RscClass( nId, RSC_FIXEDLINE, pClassControl ); - pClassFixedLine->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - - INS_WINBIT(pClassFixedLine,Vert) - - aNmTb.Put( nId, CLASSNAME, pClassFixedLine ); - pRoot->Insert( pClassFixedLine ); - RscTop* pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr, pClassBitmap, pClassImage, diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 36860e48ce8f..0164ce85cab8 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -588,18 +588,6 @@ FixedLine::FixedLine( vcl::Window* pParent, WinBits nStyle ) : SetSizePixel( Size( 2, 2 ) ); } -FixedLine::FixedLine( vcl::Window* pParent, const ResId& rResId ) : - Control( WINDOW_FIXEDLINE ) -{ - rResId.SetRT( RSC_FIXEDLINE ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - void FixedLine::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); |