diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-20 16:57:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-20 20:22:24 +0100 |
| commit | 50fffcaa05eef36fe03b1654bd57fdd3ae741106 (patch) | |
| tree | a2a445d7e9cb6b038cefb82224e31b8297205bfe | |
| parent | d4a615bf62d81485d8e20e94824af511c9fef0bb (diff) | |
Infoboxen are no longer loaded from resource files
Change-Id: If387291e9e145ee36338b1e560f18889c3b62674
| -rw-r--r-- | include/tools/rcid.h | 2 | ||||
| -rw-r--r-- | include/vcl/msgbox.hxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/msgbox.cxx | 6 |
4 files changed, 1 insertions, 16 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h index e0d12f626b7e..70199fc8a83b 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -48,7 +48,7 @@ #define RSC_IMAGELIST (RSC_NOTYPE + 0x24) #define RSC_MESSBOX (RSC_NOTYPE + 0x30) -#define RSC_INFOBOX (RSC_NOTYPE + 0x31) + #define RSC_WARNINGBOX (RSC_NOTYPE + 0x32) #define RSC_QUERYBOX (RSC_NOTYPE + 0x34) diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index b97edb0854d6..2684a25b5502 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -77,7 +77,6 @@ private: public: InfoBox( Window* pParent, const OUString& rMessage ); - InfoBox( Window* pParent, const ResId & rResId ); InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ); diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 1b5702f20aa4..2016d11263f9 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -94,7 +94,6 @@ void RscTypCont::Init() RscTop * pClassMenuItem; RscTop * pClassMenu; RscTop * pClassMessBox; - RscTop * pClassInfoBox; RscTop * pClassWarningBox; RscTop * pClassQueryBox; RscTop * pClassSplitter; @@ -472,13 +471,6 @@ void RscTypCont::Init() pRoot->Insert( pClassMessBox ); // Klasse anlegen - nId = pHS->getID( "InfoBox" ); - pClassInfoBox = new RscClass( nId, RSC_INFOBOX, pClassMessBox ); - pClassInfoBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassInfoBox ); - pRoot->Insert( pClassInfoBox ); - - // Klasse anlegen nId = pHS->getID( "WarningBox" ); pClassWarningBox = new RscClass( nId, RSC_WARNINGBOX, pClassMessBox ); pClassWarningBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index ff2880d106c3..666411cbaa20 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -420,12 +420,6 @@ InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) : ImplInitInfoBoxData(); } -InfoBox::InfoBox( Window* pParent, const ResId & rResId ) : - MessBox( pParent, rResId.SetRT( RSC_INFOBOX ) ) -{ - ImplInitInfoBoxData(); -} - InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { |