include/tools/rcid.h | 4 ++-- include/vcl/msgbox.hxx | 2 -- rsc/source/parser/rscinit.cxx | 16 ---------------- vcl/source/window/msgbox.cxx | 12 ------------ 4 files changed, 2 insertions(+), 32 deletions(-)
New commits: commit 50fffcaa05eef36fe03b1654bd57fdd3ae741106 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Aug 20 16:57:42 2014 +0100 Infoboxen are no longer loaded from resource files Change-Id: If387291e9e145ee36338b1e560f18889c3b62674 diff --git a/include/tools/rcid.h b/include/tools/rcid.h index e0d12f6..70199fc 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 b97edb0..2684a25 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 1b5702f..2016d11 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 ff2880d..666411c 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 ) { commit d4a615bf62d81485d8e20e94824af511c9fef0bb Author: Caolán McNamara <caol...@redhat.com> Date: Wed Aug 20 14:33:51 2014 +0100 ErrorBoxen are no longer loaded from resource files Change-Id: I099258e449d0155154d60a839f9495236cb48cbb diff --git a/include/tools/rcid.h b/include/tools/rcid.h index f1edf65..e0d12f6 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -50,7 +50,7 @@ #define RSC_MESSBOX (RSC_NOTYPE + 0x30) #define RSC_INFOBOX (RSC_NOTYPE + 0x31) #define RSC_WARNINGBOX (RSC_NOTYPE + 0x32) -#define RSC_ERRORBOX (RSC_NOTYPE + 0x33) + #define RSC_QUERYBOX (RSC_NOTYPE + 0x34) #define RSC_WINDOW (RSC_NOTYPE + 0x35) #define RSC_SYSWINDOW (RSC_NOTYPE + 0x36) diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index bc5f7b2..b97edb0 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -107,7 +107,6 @@ private: public: ErrorBox( Window* pParent, WinBits nStyle, const OUString& rMessage ); - ErrorBox( Window* pParent, const ResId& rResId ); static Image GetStandardImage(); }; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 5859588..1b5702f 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -96,7 +96,6 @@ void RscTypCont::Init() RscTop * pClassMessBox; RscTop * pClassInfoBox; RscTop * pClassWarningBox; - RscTop * pClassErrorBox; RscTop * pClassQueryBox; RscTop * pClassSplitter; RscTop * pClassSplitWindow; @@ -487,13 +486,6 @@ void RscTypCont::Init() pRoot->Insert( pClassWarningBox ); // Klasse anlegen - nId = pHS->getID( "ErrorBox" ); - pClassErrorBox = new RscClass( nId, RSC_ERRORBOX, pClassMessBox ); - pClassErrorBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassErrorBox ); - pRoot->Insert( pClassErrorBox ); - - // Klasse anlegen nId = pHS->getID( "QueryBox" ); pClassQueryBox = new RscClass( nId, RSC_QUERYBOX, pClassMessBox ); pClassQueryBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 7a3c597..ff2880d 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -489,12 +489,6 @@ ErrorBox::ErrorBox( Window* pParent, WinBits nStyle, ImplInitErrorBoxData(); } -ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) : - MessBox( pParent, rResId.SetRT( RSC_ERRORBOX ) ) -{ - ImplInitErrorBoxData(); -} - Image ErrorBox::GetStandardImage() { try
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits