summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-25 15:45:01 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-25 16:45:31 +0100
commitbddd6d823df677308e25f93b50153012b2005ef5 (patch)
treef0a79617bedb7a6f4d1cd9a47d5ce66e52b3ebe5
parent0696e590455145e3a57b9925b76a7a8ff5f6043e (diff)
WarningBox are no longer loaded from resource files
Change-Id: Ib05a9876c0b1d3425dd1629f8a0fe3d16a57cc30
-rw-r--r--include/tools/rcid.h2
-rw-r--r--include/vcl/msgbox.hxx1
-rw-r--r--rsc/source/parser/rscinit.cxx8
-rw-r--r--vcl/source/window/msgbox.cxx6
4 files changed, 0 insertions, 17 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index c8a405f6e71c..168e0c86552e 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -49,8 +49,6 @@
#define RSC_MESSBOX (RSC_NOTYPE + 0x30)
-#define RSC_WARNINGBOX (RSC_NOTYPE + 0x32)
-
#define RSC_WINDOW (RSC_NOTYPE + 0x35)
#define RSC_SYSWINDOW (RSC_NOTYPE + 0x36)
#define RSC_WORKWIN (RSC_NOTYPE + 0x37)
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 0bc49e812115..38cc4ba5a32f 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -91,7 +91,6 @@ private:
public:
WarningBox( Window* pParent, WinBits nStyle,
const OUString& rMessage );
- WarningBox( Window* pParent, const ResId& rResId );
void SetDefaultCheckBoxText();
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index a399e86eda9a..1f9539974186 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 * pClassWarningBox;
RscTop * pClassSplitter;
RscTop * pClassSplitWindow;
RscTop * pClassSpinButton;
@@ -468,13 +467,6 @@ void RscTypCont::Init()
pClassMessBox = InitClassMessBox( pClassMgr, pMessButtons,
pMessDefButton );
pRoot->Insert( pClassMessBox );
-
- // Klasse anlegen
- nId = pHS->getID( "WarningBox" );
- pClassWarningBox = new RscClass( nId, RSC_WARNINGBOX, pClassMessBox );
- pClassWarningBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassWarningBox );
- pRoot->Insert( pClassWarningBox );
}
{
pClassSplitter = InitClassSplitter( pClassWindow );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index d414ab04b67d..639c5fa410d6 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -448,12 +448,6 @@ WarningBox::WarningBox( Window* pParent, WinBits nStyle,
ImplInitWarningBoxData();
}
-WarningBox::WarningBox( Window* pParent, const ResId& rResId ) :
- MessBox( pParent, rResId.SetRT( RSC_WARNINGBOX ) )
-{
- ImplInitWarningBoxData();
-}
-
void WarningBox::SetDefaultCheckBoxText()
{
ResMgr* pResMgr = ImplGetResMgr();