ModalDialogs no longer loaded from resource files

Change-Id: I2d208c7cc5ff9bf26bff5ab2aa40e0bf57373342

include/tools/rcid.h

@@ -54,7 +54,6 @@
 #define RSC_FLOATINGWINDOW      (RSC_NOTYPE + 0x39)
 #define RSC_DIALOG              (RSC_NOTYPE + 0x3a)
 
-#define RSC_MODALDIALOG         (RSC_NOTYPE + 0x3c)
 #define RSC_CONTROL             (RSC_NOTYPE + 0x44)
 #define RSC_BUTTON              (RSC_NOTYPE + 0x45)
 #define RSC_PUSHBUTTON          (RSC_NOTYPE + 0x46)

include/vcl/dialog.hxx

@@ -161,7 +161,6 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog
 public:
     explicit        ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
     explicit        ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
-    explicit        ModalDialog( Window* pParent, const ResId& rResId );
 
 protected:
     using Window::Show;

rsc/inc/rscdb.hxx

@@ -170,7 +170,6 @@ class RscTypCont
                                  RscArray * pLangGeo );
     RscTop *    InitClassSystemWindow( RscTop * pSuper );
     RscTop *    InitClassWorkWindow( RscTop * pSuper );
-    RscTop *    InitClassModalDialog( RscTop * pSuper );
     RscTop *    InitClassControl( RscTop * pSuper );
     RscTop *    InitClassCheckBox( RscTop * pSuper );
     RscTop *    InitClassPushButton( RscTop * pSuper );

rsc/source/parser/rscicpx.cxx

@@ -357,22 +357,6 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper )
     return pClassWorkWindow;
 }
 
-RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper )
-{
-    Atom        nId;
-    RscTop *    pClassDialog;
-
-    // Klasse anlegen
-    nId = pHS->getID( "ModalDialog" );
-    pClassDialog = new RscClass( nId, RSC_MODALDIALOG, pSuper );
-    pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-    aNmTb.Put( nId, CLASSNAME, pClassDialog );
-
-    InsWinBit( pClassDialog, "SysModal", nSysmodalId );
-
-    return pClassDialog;
-}
-
 RscTop * RscTypCont::InitClassControl( RscTop * pSuper )
 {
     Atom        nId;

rsc/source/parser/rscinit.cxx

@@ -70,7 +70,6 @@ void RscTypCont::Init()
     RscTop   *  pClassSystemWindow;
     RscTop   *  pClassWorkWindow;
     RscTop   *  pClassDialog;
-    RscTop   *  pClassModalDialog;
     RscTop   *  pClassControl;
     RscTop   *  pClassButton;
     RscTop   *  pClassCheckBox;
@@ -355,10 +354,6 @@ void RscTypCont::Init()
                                  RSC_DIALOG, pClassSystemWindow );
     pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
     aBaseLst.push_back( pClassDialog );
-
-    // Klasse anlegen
-    pClassModalDialog = InitClassModalDialog( pClassDialog );
-    pRoot->Insert( pClassModalDialog );
 }
 {
     pClassControl = InitClassControl( pClassWindow );

tools/source/rc/resmgr.cxx

@@ -1461,7 +1461,6 @@ OString ResMgr::GetAutoHelpId()
             case RSC_DOCKINGWINDOW:     aHID.append( "DockingWindow" );    break;
             case RSC_WORKWIN:           aHID.append( "WorkWindow" );       break;
             case RSC_FLOATINGWINDOW:    aHID.append( "FloatingWindow" );   break;
-            case RSC_MODALDIALOG:       aHID.append( "ModalDialog" );      break;
             default: return OString();
         }
     }
@@ -1473,7 +1472,6 @@ OString ResMgr::GetAutoHelpId()
             case RSC_DOCKINGWINDOW:
             case RSC_WORKWIN:
             case RSC_FLOATINGWINDOW:
-            case RSC_MODALDIALOG:
                 // intentionally no breaks!
                 // auto help ids for controls
                 switch( pRC->pResource->GetRT() ) {

vcl/source/window/dialog.cxx

@@ -1291,13 +1291,6 @@ ModalDialog::ModalDialog( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-ModalDialog::ModalDialog( Window* pParent, const ResId& rResId ) :
-    Dialog( WINDOW_MODALDIALOG )
-{
-    rResId.SetRT( RSC_MODALDIALOG );
-    init( pParent, rResId );
-}
-
 ModalDialog::ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
     Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODALDIALOG)
 {