summaryrefslogtreecommitdiff
path: root/svx/source/form
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/ParseContext.cxx26
-rw-r--r--svx/source/form/databaselocationinput.cxx2
-rw-r--r--svx/source/form/datanavi.cxx98
-rw-r--r--svx/source/form/filtnav.cxx12
-rw-r--r--svx/source/form/fmPropBrw.cxx14
-rw-r--r--svx/source/form/fmexpl.cxx2
-rw-r--r--svx/source/form/fmpgeimp.cxx14
-rw-r--r--svx/source/form/fmshimp.cxx4
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/form/fmvwimp.cxx6
-rw-r--r--svx/source/form/formcontrolfactory.cxx4
-rw-r--r--svx/source/form/formcontroller.cxx12
-rw-r--r--svx/source/form/navigatortree.cxx28
-rw-r--r--svx/source/form/navigatortreemodel.cxx12
-rw-r--r--svx/source/form/tabwin.cxx6
-rw-r--r--svx/source/form/tbxform.cxx4
16 files changed, 124 insertions, 124 deletions
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index c5a2654750ba..82f432ac9192 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -36,7 +36,7 @@ OSystemParseContext::OSystemParseContext()
: IParseContext()
{
SolarMutexGuard aGuard;
- ResStringArray aLocalizedKeywords(SVX_RES(RID_RSC_SQL_INTERNATIONAL));
+ ResStringArray aLocalizedKeywords(ResId(RID_RSC_SQL_INTERNATIONAL, DIALOG_MGR()));
for (sal_uInt32 i = 0; i < aLocalizedKeywords.Count(); ++i)
m_aLocalizedKeywords.push_back(aLocalizedKeywords.GetString(i));
}
@@ -56,18 +56,18 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
SolarMutexGuard aGuard;
switch (_eCode)
{
- case ErrorCode::General: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ERROR); break;
- case ErrorCode::ValueNoLike: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE); break;
- case ErrorCode::FieldNoLike: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE); break;
- case ErrorCode::InvalidCompare: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE); break;
- case ErrorCode::InvalidIntCompare: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break;
- case ErrorCode::InvalidDateCompare: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break;
- case ErrorCode::InvalidRealCompare: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break;
- case ErrorCode::InvalidTableNosuch: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break;
- case ErrorCode::InvalidTableOrQuery: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break;
- case ErrorCode::InvalidColumn: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_COLUMN); break;
- case ErrorCode::InvalidTableExist: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break;
- case ErrorCode::InvalidQueryExist: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS); break;
+ case ErrorCode::General: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_ERROR); break;
+ case ErrorCode::ValueNoLike: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE); break;
+ case ErrorCode::FieldNoLike: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE); break;
+ case ErrorCode::InvalidCompare: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE); break;
+ case ErrorCode::InvalidIntCompare: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break;
+ case ErrorCode::InvalidDateCompare: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break;
+ case ErrorCode::InvalidRealCompare: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break;
+ case ErrorCode::InvalidTableNosuch: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_TABLE); break;
+ case ErrorCode::InvalidTableOrQuery: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break;
+ case ErrorCode::InvalidColumn: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_COLUMN); break;
+ case ErrorCode::InvalidTableExist: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break;
+ case ErrorCode::InvalidQueryExist: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS); break;
default: break;
}
return aMsg;
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index be1665d8eebd..bf7355729a28 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -127,7 +127,7 @@ namespace svx
{
if ( ::utl::UCBContentHelper::Exists( sURL ) )
{
- ScopedVclPtrInstance< QueryBox > aBox( m_rLocationInput.GetSystemWindow(), WB_YES_NO, SVX_RESSTR(RID_STR_ALREADYEXISTOVERWRITE) );
+ ScopedVclPtrInstance< QueryBox > aBox( m_rLocationInput.GetSystemWindow(), WB_YES_NO, SvxResId(RID_STR_ALREADYEXISTOVERWRITE) );
if ( aBox->Execute() != RET_YES )
return false;
}
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 0cc5b768e009..5a382dbe6fd1 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -238,15 +238,15 @@ namespace svxform
if ( DGTSubmission == m_eGroup )
{
- m_xMenu->SetItemText(m_xMenu->GetItemId("additem"), SVX_RESSTR(RID_STR_DATANAV_ADD_SUBMISSION));
- m_xMenu->SetItemText(m_xMenu->GetItemId("edit"), SVX_RESSTR(RID_STR_DATANAV_EDIT_SUBMISSION));
- m_xMenu->SetItemText(m_xMenu->GetItemId("delete"), SVX_RESSTR(RID_STR_DATANAV_REMOVE_SUBMISSION));
+ m_xMenu->SetItemText(m_xMenu->GetItemId("additem"), SvxResId(RID_STR_DATANAV_ADD_SUBMISSION));
+ m_xMenu->SetItemText(m_xMenu->GetItemId("edit"), SvxResId(RID_STR_DATANAV_EDIT_SUBMISSION));
+ m_xMenu->SetItemText(m_xMenu->GetItemId("delete"), SvxResId(RID_STR_DATANAV_REMOVE_SUBMISSION));
}
else
{
- m_xMenu->SetItemText(m_xMenu->GetItemId("additem"), SVX_RESSTR(RID_STR_DATANAV_ADD_BINDING));
- m_xMenu->SetItemText(m_xMenu->GetItemId("edit"), SVX_RESSTR(RID_STR_DATANAV_EDIT_BINDING));
- m_xMenu->SetItemText(m_xMenu->GetItemId("delete"), SVX_RESSTR(RID_STR_DATANAV_REMOVE_BINDING));
+ m_xMenu->SetItemText(m_xMenu->GetItemId("additem"), SvxResId(RID_STR_DATANAV_ADD_BINDING));
+ m_xMenu->SetItemText(m_xMenu->GetItemId("edit"), SvxResId(RID_STR_DATANAV_EDIT_BINDING));
+ m_xMenu->SetItemText(m_xMenu->GetItemId("delete"), SvxResId(RID_STR_DATANAV_REMOVE_BINDING));
}
}
m_pXFormsPage->EnableMenuItems(m_xMenu.get());
@@ -359,15 +359,15 @@ namespace svxform
if ( DGTSubmission == m_eGroup )
{
- m_pToolBox->SetItemText( m_nAddId, SVX_RESSTR( RID_STR_DATANAV_ADD_SUBMISSION ) );
- m_pToolBox->SetItemText( m_nEditId, SVX_RESSTR( RID_STR_DATANAV_EDIT_SUBMISSION ) );
- m_pToolBox->SetItemText( m_nRemoveId, SVX_RESSTR( RID_STR_DATANAV_REMOVE_SUBMISSION ) );
+ m_pToolBox->SetItemText( m_nAddId, SvxResId( RID_STR_DATANAV_ADD_SUBMISSION ) );
+ m_pToolBox->SetItemText( m_nEditId, SvxResId( RID_STR_DATANAV_EDIT_SUBMISSION ) );
+ m_pToolBox->SetItemText( m_nRemoveId, SvxResId( RID_STR_DATANAV_REMOVE_SUBMISSION ) );
}
else
{
- m_pToolBox->SetItemText( m_nAddId, SVX_RESSTR( RID_STR_DATANAV_ADD_BINDING ) );
- m_pToolBox->SetItemText( m_nEditId, SVX_RESSTR( RID_STR_DATANAV_EDIT_BINDING ) );
- m_pToolBox->SetItemText( m_nRemoveId, SVX_RESSTR( RID_STR_DATANAV_REMOVE_BINDING ) );
+ m_pToolBox->SetItemText( m_nAddId, SvxResId( RID_STR_DATANAV_ADD_BINDING ) );
+ m_pToolBox->SetItemText( m_nEditId, SvxResId( RID_STR_DATANAV_EDIT_BINDING ) );
+ m_pToolBox->SetItemText( m_nRemoveId, SvxResId( RID_STR_DATANAV_REMOVE_BINDING ) );
}
}
@@ -622,7 +622,7 @@ namespace svxform
}
ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, pNode, m_xUIHelper );
- aDlg->SetText( SVX_RESSTR( nResId ) );
+ aDlg->SetText( SvxResId( nResId ) );
aDlg->InitText( eType );
short nReturn = aDlg->Execute();
if ( DGTInstance == m_eGroup )
@@ -718,7 +718,7 @@ namespace svxform
nResId = RID_STR_DATANAV_EDIT_BINDING;
eType = DITBinding;
}
- aDlg->SetText( SVX_RESSTR( nResId ) );
+ aDlg->SetText( SvxResId( nResId ) );
aDlg->InitText( eType );
if ( aDlg->Execute() == RET_OK )
{
@@ -761,7 +761,7 @@ namespace svxform
else
{
ScopedVclPtrInstance< AddSubmissionDialog > aDlg( this, pNode, m_xUIHelper );
- aDlg->SetText( SVX_RESSTR( RID_STR_DATANAV_EDIT_SUBMISSION ) );
+ aDlg->SetText( SvxResId( RID_STR_DATANAV_EDIT_SUBMISSION ) );
if ( aDlg->Execute() == RET_OK )
{
EditEntry( pNode->m_xPropSet );
@@ -828,27 +828,27 @@ namespace svxform
pEntry = m_pItemList->InsertEntry( sTemp, aImage, aImage, nullptr, false, TREELIST_APPEND, pNode );
// Action
_rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp;
- OUString sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION );
+ OUString sEntry = SvxResId( RID_STR_DATANAV_SUBM_ACTION );
sEntry += sTemp;
m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
// Method
_rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
- sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_METHOD );
+ sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD );
sEntry += m_aMethodString.toUI( sTemp );
m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
// Ref
_rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
- sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REF );
+ sEntry = SvxResId( RID_STR_DATANAV_SUBM_REF );
sEntry += sTemp;
m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
// Bind
_rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp;
- sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND );
+ sEntry = SvxResId( RID_STR_DATANAV_SUBM_BIND );
sEntry += sTemp;
m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
// Replace
_rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp;
- sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REPLACE );
+ sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE );
sEntry += m_aReplaceString.toUI( sTemp );
m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
}
@@ -903,28 +903,28 @@ namespace svxform
m_pItemList->SetEntryText( pEntry, sTemp );
_rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp;
- OUString sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND );
+ OUString sEntry = SvxResId( RID_STR_DATANAV_SUBM_BIND );
sEntry += sTemp;
sal_uIntPtr nPos = 0;
SvTreeListEntry* pChild = m_pItemList->GetEntry( pEntry, nPos++ );
m_pItemList->SetEntryText( pChild, sEntry );
_rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
- sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REF );
+ sEntry = SvxResId( RID_STR_DATANAV_SUBM_REF );
sEntry += sTemp;
pChild = m_pItemList->GetEntry( pEntry, nPos++ );
m_pItemList->SetEntryText( pChild, sEntry );
_rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp;
- sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION );
+ sEntry = SvxResId( RID_STR_DATANAV_SUBM_ACTION );
sEntry += sTemp;
pChild = m_pItemList->GetEntry( pEntry, nPos++ );
m_pItemList->SetEntryText( pChild, sEntry );
_rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
- sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_METHOD );
+ sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD );
sEntry += m_aMethodString.toUI( sTemp );
pChild = m_pItemList->GetEntry( pEntry, nPos++ );
m_pItemList->SetEntryText( pChild, sEntry );
_rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp;
- sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REPLACE );
+ sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE );
sEntry += m_aReplaceString.toUI( sTemp );
pChild = m_pItemList->GetEntry( pEntry, nPos++ );
m_pItemList->SetEntryText( pChild, sEntry );
@@ -958,7 +958,7 @@ namespace svxform
bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
sal_uInt16 nResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE;
OUString sVar = bIsElement ? OUString(ELEMENTNAME) : OUString(ATTRIBUTENAME);
- ScopedVclPtrInstance< MessageDialog > aQBox(this, SVX_RES(nResId), VclMessageType::Question, VclButtonsType::YesNo);
+ ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(nResId), VclMessageType::Question, VclButtonsType::YesNo);
OUString sMessText = aQBox->get_primary_text();
sMessText = sMessText.replaceFirst(
sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, false ) );
@@ -1000,7 +1000,7 @@ namespace svxform
{
SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" );
}
- ScopedVclPtrInstance<MessageDialog> aQBox(this, SVX_RES(nResId),
+ ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(nResId),
VclMessageType::Question, VclButtonsType::YesNo);
OUString sMessText = aQBox->get_primary_text();
sMessText = sMessText.replaceFirst( sSearch, sName);
@@ -1345,12 +1345,12 @@ namespace svxform
}
}
}
- m_pToolBox->SetItemText( m_nEditId, SVX_RESSTR( nResId1 ) );
- m_pToolBox->SetItemText( m_nRemoveId, SVX_RESSTR( nResId2 ) );
+ m_pToolBox->SetItemText( m_nEditId, SvxResId( nResId1 ) );
+ m_pToolBox->SetItemText( m_nRemoveId, SvxResId( nResId2 ) );
if ( _pMenu )
{
- _pMenu->SetItemText(_pMenu->GetItemId("edit"), SVX_RESSTR( nResId1 ) );
- _pMenu->SetItemText(_pMenu->GetItemId("delete"), SVX_RESSTR( nResId2 ) );
+ _pMenu->SetItemText(_pMenu->GetItemId("edit"), SvxResId( nResId1 ) );
+ _pMenu->SetItemText(_pMenu->GetItemId("delete"), SvxResId( nResId2 ) );
}
}
}
@@ -1506,7 +1506,7 @@ namespace svxform
if ( m_pModelsBox->GetEntryPos( sNewName ) != LISTBOX_ENTRY_NOTFOUND )
{
// error: model name already exists
- ScopedVclPtrInstance< MessageDialog > aErrBox( this, SVX_RES( RID_STR_DOUBLE_MODELNAME ) );
+ ScopedVclPtrInstance< MessageDialog > aErrBox( this, SvxResId( RID_STR_DOUBLE_MODELNAME ) );
aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName));
aErrBox->Execute();
bShowDialog = true;
@@ -1596,7 +1596,7 @@ namespace svxform
}
else if (sIdent == "modelsremove")
{
- ScopedVclPtrInstance<MessageDialog> aQBox(this, SVX_RES( RID_STR_QRY_REMOVE_MODEL),
+ ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId( RID_STR_QRY_REMOVE_MODEL),
VclMessageType::Question, VclButtonsType::YesNo);
OUString sText = aQBox->get_primary_text();
sText = sText.replaceFirst( MODELNAME, sSelectedModel );
@@ -1696,7 +1696,7 @@ namespace svxform
if ( pPage )
{
OUString sInstName = pPage->GetInstanceName();
- ScopedVclPtrInstance<MessageDialog> aQBox(this, SVX_RES(RID_STR_QRY_REMOVE_INSTANCE),
+ ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(RID_STR_QRY_REMOVE_INSTANCE),
VclMessageType::Question, VclButtonsType::YesNo);
OUString sMessText = aQBox->get_primary_text();
sMessText = sMessText.replaceFirst( INSTANCENAME, sInstName );
@@ -2150,7 +2150,7 @@ namespace svxform
{
- SetText( SVX_RES( RID_STR_DATANAVIGATOR ) );
+ SetText( SvxResId( RID_STR_DATANAVIGATOR ) );
Size aSize = m_aDataWin->GetOutputSizePixel();
Size aLogSize = PixelToLogic( aSize, MapUnit::MapAppFont );
@@ -2241,10 +2241,10 @@ namespace svxform
, m_xUIHelper(_rUIHelper)
, m_pItemNode(_pNode)
, m_eItemType(DITNone)
- , m_sFL_Element(SVX_RESSTR(RID_STR_ELEMENT))
- , m_sFL_Attribute(SVX_RESSTR(RID_STR_ATTRIBUTE))
- , m_sFL_Binding(SVX_RESSTR(RID_STR_BINDING))
- , m_sFT_BindingExp(SVX_RESSTR(RID_STR_BINDING_EXPR))
+ , m_sFL_Element(SvxResId(RID_STR_ELEMENT))
+ , m_sFL_Attribute(SvxResId(RID_STR_ATTRIBUTE))
+ , m_sFL_Binding(SvxResId(RID_STR_BINDING))
+ , m_sFT_BindingExp(SvxResId(RID_STR_BINDING_EXPR))
{
get(m_pItemFrame, "itemframe");
get(m_pNameFT, "nameft");
@@ -2451,7 +2451,7 @@ namespace svxform
( bIsHandleBinding && sNewName.isEmpty() ) )
{
// Error and don't close the dialog
- ScopedVclPtrInstance< MessageDialog > aErrBox( this, SVX_RES( RID_STR_INVALID_XMLNAME ) );
+ ScopedVclPtrInstance< MessageDialog > aErrBox( this, SvxResId( RID_STR_INVALID_XMLNAME ) );
aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName));
aErrBox->Execute();
return;
@@ -3084,7 +3084,7 @@ namespace svxform
{
if ( !m_pConditionDlg->GetUIHelper()->isValidPrefixName( sPrefix ) )
{
- ScopedVclPtrInstance< MessageDialog > aErrBox(this, SVX_RES( RID_STR_INVALID_XMLPREFIX ) );
+ ScopedVclPtrInstance< MessageDialog > aErrBox(this, SvxResId( RID_STR_INVALID_XMLPREFIX ) );
aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sPrefix));
aErrBox->Execute();
return;
@@ -3158,7 +3158,7 @@ namespace svxform
OUString sName(m_pNameED->GetText());
if(sName.isEmpty()) {
- ScopedVclPtrInstance< MessageDialog > aErrorBox(this,SVX_RES(RID_STR_EMPTY_SUBMISSIONNAME));
+ ScopedVclPtrInstance< MessageDialog > aErrorBox(this,SvxResId(RID_STR_EMPTY_SUBMISSIONNAME));
aErrorBox->set_primary_text( Application::GetDisplayName() );
aErrorBox->Execute();
return;
@@ -3219,9 +3219,9 @@ namespace svxform
void AddSubmissionDialog::FillAllBoxes()
{
// method box
- m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_POST ) );
- m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_PUT ) );
- m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_GET ) );
+ m_pMethodLB->InsertEntry( SvxResId( RID_STR_METHOD_POST ) );
+ m_pMethodLB->InsertEntry( SvxResId( RID_STR_METHOD_PUT ) );
+ m_pMethodLB->InsertEntry( SvxResId( RID_STR_METHOD_GET ) );
m_pMethodLB->SelectEntryPos(0);
// binding box
@@ -3278,9 +3278,9 @@ namespace svxform
}
// replace box
- m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_NONE ) );
- m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_INST ) );
- m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_DOC ) );
+ m_pReplaceLB->InsertEntry( SvxResId( RID_STR_REPLACE_NONE ) );
+ m_pReplaceLB->InsertEntry( SvxResId( RID_STR_REPLACE_INST ) );
+ m_pReplaceLB->InsertEntry( SvxResId( RID_STR_REPLACE_DOC ) );
// init the controls with the values of the submission
@@ -3366,7 +3366,7 @@ namespace svxform
m_pFilePickerBtn->SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) );
// load the filter name from fps_office resource
- m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")).toString();
+ m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office"));
}
AddInstanceDialog::~AddInstanceDialog()
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 124b3d6bd67b..50c7f557e6ce 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -434,7 +434,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event
// if the first term was removed, then the to-be first term needs its text updated
if ( Event.DisjunctiveTerm == 0 )
{
- rTermItems[1]->SetText( SVX_RESSTR(RID_STR_FILTER_FILTER_FOR));
+ rTermItems[1]->SetText( SvxResId(RID_STR_FILTER_FILTER_FOR));
FmFilterTextChangedHint aChangeHint( rTermItems[1] );
m_pModel->Broadcast( aChangeHint );
}
@@ -470,7 +470,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event )
const ::std::vector< FmFilterData* >::iterator insertPos = pFormItem->GetChildren().begin() + nInsertPos;
- FmFilterItems* pFilterItems = new FmFilterItems(pFormItem, SVX_RESSTR(RID_STR_FILTER_FILTER_OR));
+ FmFilterItems* pFilterItems = new FmFilterItems(pFormItem, SvxResId(RID_STR_FILTER_FILTER_OR));
m_pModel->Insert( insertPos, pFilterItems );
}
@@ -566,7 +566,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
Reference< XFilterController > xFilterController( pFormItem->GetFilterController(), UNO_SET_THROW );
// insert the existing filters for the form
- OUString aTitle(SVX_RESSTR(RID_STR_FILTER_FILTER_FOR));
+ OUString aTitle(SvxResId(RID_STR_FILTER_FILTER_FOR));
Sequence< Sequence< OUString > > aExpressions = xFilterController->getPredicateExpressions();
for ( const Sequence< OUString >* pConjunctionTerm = aExpressions.getConstArray();
@@ -600,7 +600,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
}
// title for the next conditions
- aTitle = SVX_RESSTR( RID_STR_FILTER_FILTER_OR );
+ aTitle = SvxResId( RID_STR_FILTER_FILTER_OR );
}
// now add dependent controllers
@@ -1186,7 +1186,7 @@ bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN
{
// display the error and return sal_False
SQLContext aError;
- aError.Message = SVX_RESSTR(RID_STR_SYNTAXERROR);
+ aError.Message = SvxResId(RID_STR_SYNTAXERROR);
aError.Details = aErrorMsg;
displayException(aError, this);
@@ -1811,7 +1811,7 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin
m_pNavigator = VclPtr<FmFilterNavigator>::Create( this );
m_pNavigator->Show();
- SetText( SVX_RES(RID_STR_FILTER_NAVIGATOR) );
+ SetText( SvxResId(RID_STR_FILTER_NAVIGATOR) );
SfxDockingWindow::SetFloatingSize( Size(200,200) );
}
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 2f1fd012ec42..2819be221ed4 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -180,7 +180,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
nClassNameResourceId = RID_STR_CONTROL; break;
}
- return SVX_RESSTR(nClassNameResourceId);
+ return SvxResId(nClassNameResourceId);
}
FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings,
@@ -414,13 +414,13 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
if ( _rSelection.empty() )
{
- sTitle = SVX_RESSTR(RID_STR_NO_PROPERTIES);
+ sTitle = SvxResId(RID_STR_NO_PROPERTIES);
}
else if ( _rSelection.size() > 1 )
{
// no form component and (no form or no name) -> Multiselection
- sTitle = SVX_RESSTR(RID_STR_PROPERTIES_CONTROL);
- sTitle += SVX_RESSTR(RID_STR_PROPTITLE_MULTISELECT);
+ sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL);
+ sTitle += SvxResId(RID_STR_PROPTITLE_MULTISELECT);
}
else
{
@@ -430,15 +430,15 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
sal_Int16 nClassID = FormComponentType::CONTROL;
xSingleSelection->getPropertyValue( FM_PROP_CLASSID ) >>= nClassID;
- sTitle = SVX_RESSTR(RID_STR_PROPERTIES_CONTROL);
+ sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL);
sTitle += GetUIHeadlineName(nClassID, makeAny(xSingleSelection));
}
else if ( Reference< XForm >( xSingleSelection, UNO_QUERY ).is() )
- sTitle = SVX_RESSTR(RID_STR_PROPERTIES_FORM);
+ sTitle = SvxResId(RID_STR_PROPERTIES_FORM);
}
if ( implIsReadOnlyModel() )
- sTitle += SVX_RESSTR(RID_STR_READONLY_VIEW);
+ sTitle += SvxResId(RID_STR_READONLY_VIEW);
SetText( sTitle );
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 481293b29bb2..00f6157064c2 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -476,7 +476,7 @@ namespace svxform
m_pNavigatorTree = VclPtr<NavigatorTree>::Create( this );
m_pNavigatorTree->Show();
- SetText( SVX_RES(RID_STR_FMEXPLORER) );
+ SetText( SvxResId(RID_STR_FMEXPLORER) );
SfxDockingWindow::SetFloatingSize( Size(200,200) );
}
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 15980afc1579..e97ba5832b8f 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -372,7 +372,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
if ( Reference<XNameAccess>(xForms,UNO_QUERY_THROW)->hasElements() )
{
// find the standard form
- OUString sStandardFormname = SVX_RESSTR(RID_STR_STDFORMNAME);
+ OUString sStandardFormname = SvxResId(RID_STR_STDFORMNAME);
try
{
@@ -401,8 +401,8 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
if( pModel->IsUndoEnabled() )
{
- OUString aStr(SVX_RESSTR(RID_STR_FORM));
- OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
+ OUString aStr(SvxResId(RID_STR_FORM));
+ OUString aUndoStr(SvxResId(RID_STR_UNDO_CONTAINER_INSERT));
pModel->BegUndo(aUndoStr.replaceFirst("'#'", aStr));
}
@@ -415,7 +415,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, makeAny( sal_Int32( CommandType::TABLE ) ) );
// and the "Standard" name
- OUString sName = SVX_RESSTR(RID_STR_STDFORMNAME);
+ OUString sName = SvxResId(RID_STR_STDFORMNAME);
xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) );
if( pModel->IsUndoEnabled() )
@@ -481,8 +481,8 @@ Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy
if( bUndo )
{
- OUString aStr(SVX_RESSTR(RID_STR_FORM));
- OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
+ OUString aStr(SvxResId(RID_STR_FORM));
+ OUString aUndoStr(SvxResId(RID_STR_UNDO_CONTAINER_INSERT));
aUndoStr = aUndoStr.replaceFirst("#", aStr);
pModel->BegUndo(aUndoStr);
}
@@ -509,7 +509,7 @@ Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy
const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType );
OUString sName = FormControlFactory::getUniqueName( xNamedSet,
- bTableOrQuery ? rCursorSource : SVX_RESSTR(RID_STR_STDFORMNAME) );
+ bTableOrQuery ? rCursorSource : SvxResId(RID_STR_STDFORMNAME) );
xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) );
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 7898637535d1..37cc0f4b59f1 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1472,7 +1472,7 @@ void FmXFormShell::ExecuteSearch()
if (m_aSearchForms.empty() )
{ // there are no controls that meet all the conditions for a search
- ScopedVclPtrInstance<MessageDialog>(nullptr, SVX_RESSTR(RID_STR_NODATACONTROLS))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, SvxResId(RID_STR_NODATACONTROLS))->Execute();
return;
}
@@ -3147,7 +3147,7 @@ void FmXFormShell::CreateExternalView()
if (!bHaveUsableControls)
{
- ScopedVclPtrInstance<MessageDialog>(nullptr, SVX_RESSTR(RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, SvxResId(RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY))->Execute();
return;
}
}
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 78e0ed31cd5a..4a0022e59674 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -968,7 +968,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
if (rNewMod.GetObjectShell())
rNewMod.GetObjectShell()->SetModified();
if(static_STR_UNDO_PROPERTY.isEmpty())
- static_STR_UNDO_PROPERTY = SVX_RESSTR(RID_STR_UNDO_PROPERTY);
+ static_STR_UNDO_PROPERTY = SvxResId(RID_STR_UNDO_PROPERTY);
}
@@ -1260,7 +1260,7 @@ void FmUndoModelReplaceAction::Undo()
OUString FmUndoModelReplaceAction::GetComment() const
{
- return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE);
+ return SvxResId(RID_STR_UNDO_MODEL_REPLACE);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index ab0c63826f8c..4ce10fd6f692 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1325,7 +1325,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor
break;
case DataType::TIMESTAMP:
bDateNTimeField = true;
- sLabelPostfix = SVX_RESSTR(RID_STR_POSTFIX_DATE);
+ sLabelPostfix = SvxResId(RID_STR_POSTFIX_DATE);
SAL_FALLTHROUGH;
case DataType::DATE:
nOBJID = OBJ_FM_DATEFIELD;
@@ -1367,7 +1367,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor
{ // so far we created a date field only, but we also need a time field
pLabel = pControl = nullptr;
if ( createControlLabelPair( *pOutDev, 0, 1000, xField, xNumberFormats, OBJ_FM_TIMEFIELD,
- SVX_RESSTR(RID_STR_POSTFIX_TIME), pLabel, pControl,
+ SvxResId(RID_STR_POSTFIX_TIME), pLabel, pControl,
xDataSource, sDataSource, sCommand, nCommandType )
)
{
@@ -1602,7 +1602,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
sLabel = sFieldName;
xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) );
- OUString sObjectLabel(SVX_RESSTR(RID_STR_OBJECT_LABEL).replaceAll("#object#", sFieldName));
+ OUString sObjectLabel(SvxResId(RID_STR_OBJECT_LABEL).replaceAll("#object#", sFieldName));
xLabelModel->setPropertyValue(FM_PROP_NAME, makeAny(sObjectLabel));
}
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index d4aeebd3c530..8224dcc6b79a 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -475,7 +475,7 @@ namespace svxform
}
if ( nTitleResId )
- sInitialLabel = SVX_RESSTR(nTitleResId);
+ sInitialLabel = SvxResId(nTitleResId);
_rxControlModel->setPropertyValue(
FM_PROP_LABEL,
@@ -679,7 +679,7 @@ namespace svxform
nResId = RID_STR_CONTROL; break;
}
- return SVX_RESSTR(nResId);
+ return SvxResId(nResId);
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 2089ae19b6bf..74a34e24aba4 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -478,7 +478,7 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const
Reference< XTextComponent > xText(getPeer() , UNO_QUERY);
if (xText.is())
{
- xText->setText(SVX_RESSTR(RID_STR_AUTOFIELD));
+ xText->setText(SvxResId(RID_STR_AUTOFIELD));
xText->setEditable(false);
}
}
@@ -3585,7 +3585,7 @@ namespace
void displayErrorSetFocus( const OUString& _rMessage, const Reference< XControl >& _rxFocusControl, vcl::Window* _pDialogParent )
{
SQLContext aError;
- aError.Message = SVX_RESSTR(RID_STR_WRITEERROR);
+ aError.Message = SvxResId(RID_STR_WRITEERROR);
aError.Details = _rMessage;
displayException( aError, _pDialogParent );
@@ -3708,7 +3708,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
if ( !rColInfo.xColumn->getString().isEmpty() || !rColInfo.xColumn->wasNull() )
continue;
- OUString sMessage( SVX_RESSTR( RID_ERR_FIELDREQUIRED ) );
+ OUString sMessage( SvxResId( RID_ERR_FIELDREQUIRED ) );
sMessage = sMessage.replaceFirst( "#", rColInfo.sName );
// the control to focus
@@ -3971,11 +3971,11 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent)
sal_Int32 nLength = aEvent.Rows;
if ( nLength > 1 )
{
- sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS );
+ sTitle = SvxResId( RID_STR_DELETECONFIRM_RECORDS );
sTitle = sTitle.replaceFirst( "#", OUString::number(nLength) );
}
else
- sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD );
+ sTitle = SvxResId( RID_STR_DELETECONFIRM_RECORD );
try
{
@@ -3990,7 +3990,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent)
SQLWarning aWarning;
aWarning.Message = sTitle;
SQLWarning aDetails;
- aDetails.Message = SVX_RESSTR(RID_STR_DELETECONFIRM);
+ aDetails.Message = SvxResId(RID_STR_DELETECONFIRM);
aWarning.NextException <<= aDetails;
OInteractionRequest* pRequest = new OInteractionRequest( makeAny( aWarning ) );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index d1983f657108..fd91d43e9a39 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -450,8 +450,8 @@ namespace svxform
sIdent = aContextMenu->GetCurItemIdent();
if (sIdent == "form")
{
- OUString aStr(SVX_RESSTR(RID_STR_FORM));
- OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr);
+ OUString aStr(SvxResId(RID_STR_FORM));
+ OUString aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr);
pFormModel->BegUndo(aUndoStr);
// slot was only available, if there is only one selected entry,
@@ -461,8 +461,8 @@ namespace svxform
}
else if (sIdent == "hidden")
{
- OUString aStr(SVX_RESSTR(RID_STR_CONTROL));
- OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr);
+ OUString aStr(SvxResId(RID_STR_CONTROL));
+ OUString aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr);
pFormModel->BegUndo(aUndoStr);
// slot was valid for (exactly) one selected form
@@ -585,7 +585,7 @@ namespace svxform
// default-entry "Forms"
Image aRootImage(BitmapEx(RID_SVXBMP_FORMS));
- m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage,
+ m_pRootEntry = InsertEntry( SvxResId(RID_STR_FORMS), aRootImage, aRootImage,
nullptr, false, 0 );
}
else if (!m_bMarkingObjects && dynamic_cast<const FmNavRequestSelectHint*>(&rHint))
@@ -956,8 +956,8 @@ namespace svxform
// within undo
if (pFormModel)
{
- OUString aStr(SVX_RESSTR(RID_STR_CONTROL));
- OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr);
+ OUString aStr(SvxResId(RID_STR_CONTROL));
+ OUString aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr);
pFormModel->BegUndo(aUndoStr);
}
@@ -1031,7 +1031,7 @@ namespace svxform
if( bUndo )
{
- OUString strUndoDescription(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REPLACE));
+ OUString strUndoDescription(SvxResId(RID_STR_UNDO_CONTAINER_REPLACE));
pFormModel->BegUndo(strUndoDescription);
}
@@ -1425,9 +1425,9 @@ namespace svxform
// create base name
OUString aBaseName;
if( dynamic_cast<const FmFormData*>( pEntryData) != nullptr )
- aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME );
+ aBaseName = SvxResId( RID_STR_STDFORMNAME );
else if( dynamic_cast<const FmControlData*>( pEntryData) != nullptr )
- aBaseName = SVX_RESSTR( RID_STR_CONTROL );
+ aBaseName = SvxResId( RID_STR_CONTROL );
// create new name
@@ -1747,16 +1747,16 @@ namespace svxform
OUString aUndoStr;
if ( m_arrCurrentSelection.size() == 1 )
{
- aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE);
+ aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_REMOVE);
if (m_nFormsSelected)
- aUndoStr = aUndoStr.replaceFirst( "#", SVX_RESSTR( RID_STR_FORM ) );
+ aUndoStr = aUndoStr.replaceFirst( "#", SvxResId( RID_STR_FORM ) );
else
// it must be a control (else the root would be selected, but it cannot be deleted)
- aUndoStr = aUndoStr.replaceFirst( "#", SVX_RESSTR( RID_STR_CONTROL ) );
+ aUndoStr = aUndoStr.replaceFirst( "#", SvxResId( RID_STR_CONTROL ) );
}
else
{
- aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE);
+ aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE);
aUndoStr = aUndoStr.replaceFirst( "#", OUString::number( m_arrCurrentSelection.size() ) );
}
pFormModel->BegUndo(aUndoStr);
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 47481b7e3877..f7d6d3673973 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -262,9 +262,9 @@ namespace svxform
{
OUString aStr;
if (dynamic_cast<const FmFormData*>( pEntry) != nullptr)
- aStr = SVX_RESSTR(RID_STR_FORM);
+ aStr = SvxResId(RID_STR_FORM);
else
- aStr = SVX_RESSTR(RID_STR_CONTROL);
+ aStr = SvxResId(RID_STR_CONTROL);
Reference< XIndexContainer > xContainer;
if (pFolder)
@@ -276,7 +276,7 @@ namespace svxform
if( bUndo )
{
- OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
+ OUString aUndoStr(SvxResId(RID_STR_UNDO_CONTAINER_INSERT));
aUndoStr = aUndoStr.replaceFirst("#", aStr);
m_pFormModel->BegUndo(aUndoStr);
}
@@ -367,13 +367,13 @@ namespace svxform
{
OUString aStr;
if (dynamic_cast<const FmFormData*>( pEntry) != nullptr)
- aStr = SVX_RESSTR(RID_STR_FORM);
+ aStr = SvxResId(RID_STR_FORM);
else
- aStr = SVX_RESSTR(RID_STR_CONTROL);
+ aStr = SvxResId(RID_STR_CONTROL);
if( bUndo )
{
- OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE));
+ OUString aUndoStr(SvxResId(RID_STR_UNDO_CONTAINER_REMOVE));
aUndoStr = aUndoStr.replaceFirst("#", aStr);
m_pFormModel->BegUndo(aUndoStr);
}
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 307209796edd..c426054fcb7c 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -281,7 +281,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo
void FmFieldWin::UpdateContent(FmFormShell* pShell)
{
pListBox->Clear();
- OUString aTitle(SVX_RESSTR(RID_STR_FIELDSELECTION));
+ OUString aTitle(SvxResId(RID_STR_FIELDSELECTION));
SetText( aTitle );
if (!pShell || !pShell->GetImpl())
@@ -299,7 +299,7 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x
{
// delete ListBox
pListBox->Clear();
- OUString aTitle(SVX_RES(RID_STR_FIELDSELECTION));
+ OUString aTitle(SvxResId(RID_STR_FIELDSELECTION));
SetText(aTitle);
if (!xForm.is())
@@ -332,7 +332,7 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x
// set prefix
OUString aPrefix;
- ResStringArray aPrefixes(SVX_RES(RID_RSC_TABWIN_PREFIX));
+ ResStringArray aPrefixes(ResId(RID_RSC_TABWIN_PREFIX, DIALOG_MGR()));
switch (m_nObjectType)
{
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 43f8ca72016c..ead49e1532f2 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -153,7 +153,7 @@ SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText()
VclPtr<vcl::Window> SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent )
{
- OUString aText(SVX_RESSTR(RID_STR_REC_TEXT));
+ OUString aText(SvxResId(RID_STR_REC_TEXT));
VclPtrInstance<FixedText> pFixedText( pParent );
Size aSize( pFixedText->GetTextWidth( aText ), pFixedText->GetTextHeight( ) );
pFixedText->SetText( aText );
@@ -179,7 +179,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText()
VclPtr<vcl::Window> SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent )
{
- OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT));
+ OUString aText(SvxResId(RID_STR_REC_FROM_TEXT));
VclPtrInstance<FixedText> pFixedText( pParent, WB_CENTER );
Size aSize( pFixedText->GetTextWidth( aText ), pFixedText->GetTextHeight( ) );
aSize.Width() += 12;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 23:32:21 +0000