From d4a615bf62d81485d8e20e94824af511c9fef0bb Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 20 Aug 2014 14:33:51 +0100
Subject: ErrorBoxen are no longer loaded from resource files

Change-Id: I099258e449d0155154d60a839f9495236cb48cbb
---
 include/tools/rcid.h          | 2 +-
 include/vcl/msgbox.hxx        | 1 -
 rsc/source/parser/rscinit.cxx | 8 --------
 vcl/source/window/msgbox.cxx  | 6 ------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index f1edf65adef7..e0d12f626b7e 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 bc5f7b20e695..b97edb0854d6 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 58595885f144..1b5702f20aa4 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;
@@ -486,13 +485,6 @@ void RscTypCont::Init()
     aNmTb.Put( nId, CLASSNAME, pClassWarningBox );
     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 );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 7a3c597c40a0..ff2880d106c3 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
-- 
cgit