diff options
| -rw-r--r-- | include/tools/rcid.h | 2 | ||||
| -rw-r--r-- | include/vcl/fixed.hxx | 1 | ||||
| -rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 25 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/fixed.cxx | 15 |
6 files changed, 0 insertions, 48 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h index fb1bb724b8f6..96859d12eb84 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -47,8 +47,6 @@ #define RSC_CONTROL (RSC_NOTYPE + 0x44) -#define RSC_TEXT (RSC_NOTYPE + 0x57) - #define RSC_STRINGARRAY (RSC_NOTYPE + 0x79) // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 0096a7e056f1..b7e3774214bf 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -56,7 +56,6 @@ protected: public: explicit FixedText( vcl::Window* pParent, WinBits nStyle = 0 ); - explicit FixedText( vcl::Window* pParent, const ResId& rResId ); virtual ~FixedText() override; virtual void dispose() override; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 1aca22ed44bd..87036e4caf27 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -175,7 +175,6 @@ class RscTypCont RscTop * InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, RscArray * pLangGeo ); RscTop * InitClassControl( RscTop * pSuper ); - RscTop * InitClassFixedText( RscTop * pSuper ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); RscTop * InitClassMenuItem( RscTop * pSuper ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index b2410819769c..0d3aa6509188 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -262,31 +262,6 @@ RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) return pClassControl; } -RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassFixedText; - - // initialize class - nId = pHS->getID( "FixedText" ); - pClassFixedText = new RscClass( nId, RSC_TEXT, pSuper ); - pClassFixedText->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassFixedText ); - - // initialize variables - INS_WINBIT(pClassFixedText,Left) - INS_WINBIT(pClassFixedText,Center) - INS_WINBIT(pClassFixedText,Right) - INS_WINBIT(pClassFixedText,WordBreak) - INS_WINBIT(pClassFixedText,LeftLabel) - INS_WINBIT(pClassFixedText,NoLabel) - INS_WINBIT(pClassFixedText,Top) - INS_WINBIT(pClassFixedText,VCenter) - INS_WINBIT(pClassFixedText,Bottom) - - return pClassFixedText; -} - RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index a127e5e96012..5496a054f8cf 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -63,7 +63,6 @@ void RscTypCont::Init() RscTop * pClassImageList; RscTop * pClassWindow; RscTop * pClassControl; - RscTop * pClassFixedText; RscTop * pClassKeyCode; RscTop * pLangClassKeyCode; @@ -289,9 +288,6 @@ void RscTypCont::Init() pRoot->Insert( pClassControl ); } { - pClassFixedText = InitClassFixedText( pClassControl ); - pRoot->Insert( pClassFixedText ); - pClassKeyCode = InitClassKeyCode( pClassMgr, pKey ); pRoot->Insert( pClassKeyCode ); { diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 7af35fc3dc50..eef58c244cdf 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -113,21 +113,6 @@ FixedText::FixedText( vcl::Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } -FixedText::FixedText( vcl::Window* pParent, const ResId& rResId ) - : Control(WINDOW_FIXEDTEXT) - , m_nMaxWidthChars(-1) - , m_nMinWidthChars(-1) - , m_pMnemonicWindow(nullptr) -{ - rResId.SetRT( RSC_TEXT ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes(); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - DrawTextFlags FixedText::ImplGetTextStyle( WinBits nWinStyle ) { DrawTextFlags nTextStyle = DrawTextFlags::Mnemonic | DrawTextFlags::EndEllipsis; |