summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-25 15:54:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-25 16:45:32 +0100
commit07244947b55ded00e1ab518d305bf8d3f4087b0c (patch)
tree6c517b1b4e78f0d1bea9cd00cd99f8cb524e83ec /rsc
parent4e84484cc6bcf02819b097a666ee79bbc2ecf1b0 (diff)
MessBox not loaded from resource files anymore
Change-Id: I12378a1c80e1070763cd2bd0539d74f4cc270a30
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscdb.hxx5
-rw-r--r--rsc/source/parser/rscibas.cxx28
-rw-r--r--rsc/source/parser/rscicpx.cxx32
-rw-r--r--rsc/source/parser/rscinit.cxx9
4 files changed, 0 insertions, 74 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 6aca60256800..f5dac31ea93d 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -146,8 +146,6 @@ class RscTypCont
RscEnum * InitMapUnit();
RscEnum * InitKey();
RscEnum * InitTriState();
- RscEnum * InitMessButtons();
- RscEnum * InitMessDefButton();
RscTupel * InitGeometry();
RscArray * InitLangGeometry( RscTupel * pGeo );
RscArray * InitSystemGeometry( RscTupel * pGeo );
@@ -191,9 +189,6 @@ class RscTypCont
RscTop * InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap,
RscTop * pClassKeyCode );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
- RscTop * InitClassMessBox( RscTop * pSuper,
- RscEnum * pMessButtons,
- RscEnum * pMessDefButton );
RscTop * InitClassSplitter( RscTop * pSuper );
RscTop * InitClassSplitWindow( RscTop * pSuper );
RscTop * InitClassTime( RscTop * pSuper );
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 6e2aafffa52a..49416ba2b9e4 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -391,34 +391,6 @@ RscEnum * RscTypCont::InitTriState()
return pTriState;
}
-RscEnum * RscTypCont::InitMessButtons()
-{
- RscEnum * pMessButtons;
- pMessButtons = new RscEnum( pHS->getID( "EnumMessButtons" ), RSC_NOTYPE );
- SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<sal_uInt32>(WB_OK) );
- SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<sal_uInt32>(WB_OK_CANCEL) );
- SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<sal_uInt32>(WB_YES_NO) );
- SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<sal_uInt32>(WB_YES_NO_CANCEL) );
- SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<sal_uInt32>(WB_RETRY_CANCEL) );
- SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<sal_uInt32>(WB_ABORT_RETRY_IGNORE) );
- return pMessButtons;
-}
-
-RscEnum * RscTypCont::InitMessDefButton()
-{
- RscEnum * pMessDefButton;
- pMessDefButton = new RscEnum( pHS->getID( "EnumMessDefButton" ),
- RSC_NOTYPE );
-
- SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<sal_uInt32>(WB_DEF_OK) );
- SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<sal_uInt32>(WB_DEF_CANCEL) );
- SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<sal_uInt32>(WB_DEF_RETRY) );
- SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<sal_uInt32>(WB_DEF_YES) );
- SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<sal_uInt32>(WB_DEF_NO) );
- SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<sal_uInt32>(WB_DEF_IGNORE) );
- return pMessDefButton;
-}
-
RscTupel * RscTypCont::InitGeometry()
{
RscTop * pTupel;
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 6169edaad1c0..25dec34cbf4f 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -927,38 +927,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
return pClassMenu;
}
-RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper,
- RscEnum * pMessButtons,
- RscEnum * pMessDefButton )
-{
- Atom nId;
- RscTop * pClassMessBox;
-
- // Klasse anlegen
- nId = pHS->getID( "MessBox" );
- pClassMessBox = new RscClass( nId, RSC_MESSBOX, pSuper );
- pClassMessBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassMessBox );
-
- // Variablen anlegen
- nId = aNmTb.Put( "Buttons", VARNAME );
- pClassMessBox->SetVariable( nId, pMessButtons );
- nId = aNmTb.Put( "DefButton", VARNAME );
- pClassMessBox->SetVariable( nId, pMessDefButton );
- nId = aNmTb.Put( "HelpID", VARNAME );
- pClassMessBox->SetVariable( nId, &aStringLiteral );
- nId = aNmTb.Put( "SysModal", VARNAME );
- pClassMessBox->SetVariable( nId, &aBool );
- nId = aNmTb.Put( "Title", VARNAME );
- pClassMessBox->SetVariable( nId, &aLangString );
- nId = aNmTb.Put( "Message", VARNAME );
- pClassMessBox->SetVariable( nId, &aLangString );
- nId = aNmTb.Put( "HelpText", VARNAME );
- pClassMessBox->SetVariable( nId, &aLangString );
-
- return pClassMessBox;
-}
-
RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper )
{
Atom nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 1f9539974186..22c79ae0e97e 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -49,8 +49,6 @@ void RscTypCont::Init()
RscEnum * pMapUnit;
RscEnum * pKey;
RscEnum * pTriState;
- RscEnum * pMessButtons;
- RscEnum * pMessDefButton;
RscTupel * pGeometry;
RscArray * pLangGeometry;
RscCont * pStringList;
@@ -93,7 +91,6 @@ void RscTypCont::Init()
RscTop * pClassAccel;
RscTop * pClassMenuItem;
RscTop * pClassMenu;
- RscTop * pClassMessBox;
RscTop * pClassSplitter;
RscTop * pClassSplitWindow;
RscTop * pClassSpinButton;
@@ -289,8 +286,6 @@ void RscTypCont::Init()
aBaseLst.push_back( pMapUnit = InitMapUnit() );
aBaseLst.push_back( pKey = InitKey() );
aBaseLst.push_back( pTriState = InitTriState() );
- aBaseLst.push_back( pMessButtons = InitMessButtons() );
- aBaseLst.push_back( pMessDefButton = InitMessDefButton() );
aBaseLst.push_back( pGeometry = InitGeometry() );
aBaseLst.push_back( pLangGeometry = InitLangGeometry( pGeometry ) );
@@ -463,10 +458,6 @@ void RscTypCont::Init()
nId = aNmTb.Put( "SubMenu", VARNAME );
pClassMenuItem->SetVariable( nId, pClassMenu, NULL, VAR_SVDYNAMIC,
RSC_MENUITEM_MENU );
-
- pClassMessBox = InitClassMessBox( pClassMgr, pMessButtons,
- pMessDefButton );
- pRoot->Insert( pClassMessBox );
}
{
pClassSplitter = InitClassSplitter( pClassWindow );