diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/control/menubtn.cxx | 27 | ||||
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 25 |
2 files changed, 0 insertions, 52 deletions
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 7f263b685ae6..8e11b3812169 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -80,33 +80,6 @@ MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) ImplInit( pParent, nWinBits ); } -MenuButton::MenuButton( Window* pParent, const ResId& rResId ) - : PushButton( WINDOW_MENUBUTTON ) -{ - ImplInitMenuButtonData(); - rResId.SetRT( RSC_MENUBUTTON ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -void MenuButton::ImplLoadRes( const ResId& rResId ) -{ - Control::ImplLoadRes( rResId ); - - sal_uLong nObjMask = ReadLongRes(); - - if ( RSCMENUBUTTON_MENU & nObjMask ) - { - mpOwnMenu = new PopupMenu( ResId( (RSHEADER_TYPE*)GetClassRes(), *rResId.GetResMgr() ) ); - SetPopupMenu( mpOwnMenu ); - IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) ); - } -} - MenuButton::~MenuButton() { delete mpMenuTimer; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 09af36305d92..dd0c5c9b1fcd 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1614,31 +1614,6 @@ Size TabControl::GetTabPageSizePixel() const return aRect.GetSize(); } -void TabControl::InsertPage( const ResId& rResId, sal_uInt16 nPos ) -{ - GetRes( rResId.SetRT( RSC_TABCONTROLITEM ) ); - - sal_uLong nObjMask = ReadLongRes(); - sal_uInt16 nItemId = 1; - - // ID - if ( nObjMask & RSC_TABCONTROLITEM_ID ) - nItemId = sal::static_int_cast<sal_uInt16>(ReadLongRes()); - - // Text - OUString aTmpStr; - if( nObjMask & RSC_TABCONTROLITEM_TEXT ) - aTmpStr = ReadStringRes(); - InsertPage( nItemId, aTmpStr, nPos ); - - // PageResID - if ( nObjMask & RSC_TABCONTROLITEM_PAGERESID ) - { - //skip unused TabPageResId value - ReadLongRes(); - } -} - void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText, sal_uInt16 nPos ) { |