summaryrefslogtreecommitdiff
path: root/sfx2/source/doc
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/doc')
-rw-r--r--sfx2/source/doc/doctempl.cxx4
-rw-r--r--sfx2/source/doc/doctemplates.cxx7
-rw-r--r--sfx2/source/doc/guisaveas.cxx4
-rw-r--r--sfx2/source/doc/new.cxx6
-rw-r--r--sfx2/source/doc/objcont.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx8
-rw-r--r--sfx2/source/doc/objserv.cxx8
-rw-r--r--sfx2/source/doc/objstor.cxx14
-rw-r--r--sfx2/source/doc/objxtor.cxx2
-rw-r--r--sfx2/source/doc/querytemplate.cxx4
-rw-r--r--sfx2/source/doc/saveastemplatedlg.cxx6
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx8
-rw-r--r--sfx2/source/doc/templatedlg.cxx44
13 files changed, 58 insertions, 59 deletions
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 3689525987c2..ca3ebf2428be 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -494,7 +494,7 @@ OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString)
for (int i = 0; i < NUM_TEMPLATE_NAMES; ++i)
{
if (rString == aTemplateNames[i])
- return SFX2_RESSTR(STR_TEMPLATE_NAME1 + i);
+ return SfxResId(STR_TEMPLATE_NAME1 + i);
}
return rString;
}
@@ -1604,7 +1604,7 @@ bool SfxDocTemplate_Impl::Construct( )
mbConstructed = true;
maRootURL = aRootContent->getIdentifier()->getContentIdentifier();
- ResStringArray aLongNames( SfxResId( TEMPLATE_LONG_NAMES_ARY ) );
+ ResStringArray aLongNames(ResId(TEMPLATE_LONG_NAMES_ARY, *SfxResMgr::GetResMgr()));
if ( aLongNames.Count() )
maStandardGroup = aLongNames.GetString( 0 );
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 334f2d4eed24..b4e59a4ce3f2 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -487,9 +487,8 @@ void SfxDocTplService_Impl::readFolderList()
{
SolarMutexGuard aGuard;
- ResStringArray aShortNames( SfxResId( TEMPLATE_SHORT_NAMES_ARY ) );
- ResStringArray aLongNames( SfxResId( TEMPLATE_LONG_NAMES_ARY ) );
-
+ ResStringArray aShortNames(ResId(TEMPLATE_SHORT_NAMES_ARY, *SfxResMgr::GetResMgr()));
+ ResStringArray aLongNames(ResId(TEMPLATE_LONG_NAMES_ARY, *SfxResMgr::GetResMgr()));
sal_uInt16 nCount = (sal_uInt16)( std::min( aShortNames.Count(), aLongNames.Count() ) );
@@ -2282,7 +2281,7 @@ void SAL_CALL SfxDocTplService::update()
WaitWindow_Impl::WaitWindow_Impl() : WorkWindow(nullptr, WB_BORDER | WB_3DLOOK)
{
tools::Rectangle aRect = tools::Rectangle(0, 0, 300, 30000);
- maText = SfxResId(RID_CNT_STR_WAITING).toString();
+ maText = SfxResId(RID_CNT_STR_WAITING);
maRect = GetTextRect(aRect, maText, mnTextStyle);
aRect = maRect;
aRect.Right() += 2 * X_OFFSET;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index a9e0b6033a9d..1df20de8d694 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -879,8 +879,8 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
if ( xControlAccess.is() )
{
- xControlAccess->setLabel( ui::dialogs::CommonFilePickerElementIds::PUSHBUTTON_OK, SfxResId(STR_EXPORTBUTTON).toString() );
- xControlAccess->setLabel( ui::dialogs::CommonFilePickerElementIds::LISTBOX_FILTER_LABEL, SfxResId(STR_LABEL_FILEFORMAT).toString() );
+ xControlAccess->setLabel( ui::dialogs::CommonFilePickerElementIds::PUSHBUTTON_OK, SfxResId(STR_EXPORTBUTTON) );
+ xControlAccess->setLabel( ui::dialogs::CommonFilePickerElementIds::LISTBOX_FILTER_LABEL, SfxResId(STR_LABEL_FILEFORMAT) );
}
}
else
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 82c78426603d..3c5716e9eed3 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -247,7 +247,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void )
sal_Int32 nc = aSel.indexOf('(');
if (nc != -1 && nc != 0)
aSel = aSel.replaceAt(nc-1, 1, "");
- if ( aSel.compareToIgnoreAsciiCase( SfxResId(STR_STANDARD).toString() ) == 0 )
+ if ( aSel.compareToIgnoreAsciiCase( SfxResId(STR_STANDARD) ) == 0 )
m_pTemplateLb->InsertEntry(aNone);
for (sal_uInt16 i = 0; i < nCount; ++i)
m_pTemplateLb->InsertEntry(aTemplates.GetName(nRegion, i));
@@ -295,7 +295,7 @@ sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
sal_Int32 nc = aSel.indexOf('(');
if (nc != -1 && nc != 0)
aSel = aSel.replaceAt(nc-1, 1, "");
- if ( aSel.compareToIgnoreAsciiCase(SfxResId(STR_STANDARD).toString()) != 0 )
+ if ( aSel.compareToIgnoreAsciiCase(SfxResId(STR_STANDARD)) != 0 )
nEntry++;
if (!m_pTemplateLb->GetSelectEntryCount())
nEntry = 0;
@@ -342,7 +342,7 @@ void SfxNewFileDialog_Impl::SetTemplateFlags(SfxTemplateFlags nSet)
SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
SfxNewFileDialog* pAntiImplP, SfxNewFileDialogMode nFl)
- : aNone(SfxResId(STR_NONE).toString())
+ : aNone(SfxResId(STR_NONE))
, nFlags(nFl)
, pAntiImpl(pAntiImplP)
{
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 32ece99f3782..ca419ab37d64 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -461,7 +461,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( )
bLoad = true;
else if ( bCanUpdateFromTemplate == document::UpdateDocMode::ACCORDING_TO_CONFIG )
{
- const OUString sMessage( SfxResId(STR_QRYTEMPL_MESSAGE).toString().replaceAll( "$(ARG1)", aTemplName ) );
+ const OUString sMessage( SfxResId(STR_QRYTEMPL_MESSAGE).replaceAll( "$(ARG1)", aTemplName ) );
ScopedVclPtrInstance< sfx2::QueryTemplateBox > aBox(GetDialogParent(), sMessage);
if ( RET_YES == aBox->Execute() )
bLoad = true;
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 543ac85a0416..ddb8cfb7098f 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -759,7 +759,7 @@ OUString SfxObjectShell::GetTitle( sal_uInt16 nMaxLength ) const
return pImpl->aTitle;
// must it be numbered?
- const OUString aNoName(SFX2_RESSTR(STR_NONAME));
+ const OUString aNoName(SfxResId(STR_NONAME));
if (pImpl->bIsNamedVisible)
{
// Append number
@@ -1833,10 +1833,10 @@ bool SfxObjectShell::IsContinueImportOnFilterExceptions(const OUString& aErrMess
if (Application::GetDialogCancelMode() == Application::DialogCancelMode::Off)
{
// Ask the user to try to continue or abort loading
- OUString aMessage = SfxResId(STR_QMSG_ERROR_OPENING_FILE).toString();
+ OUString aMessage = SfxResId(STR_QMSG_ERROR_OPENING_FILE);
if (!aErrMessage.isEmpty())
- aMessage += SfxResId(STR_QMSG_ERROR_OPENING_FILE_DETAILS).toString() + aErrMessage;
- aMessage += SfxResId(STR_QMSG_ERROR_OPENING_FILE_CONTINUE).toString();
+ aMessage += SfxResId(STR_QMSG_ERROR_OPENING_FILE_DETAILS) + aErrMessage;
+ aMessage += SfxResId(STR_QMSG_ERROR_OPENING_FILE_CONTINUE);
ScopedVclPtrInstance< MessageDialog > aBox(nullptr, aMessage, VclMessageType::Question, VclButtonsType::YesNo);
mbContinueImportOnFilterExceptions = (aBox->Execute() == RET_YES) ? yes : no;
}
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index d7a36c7aac37..6e1f008627df 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -952,7 +952,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
{
if ( !IsReadOnly() )
rSet.Put(SfxStringItem(
- nWhich, SfxResId(STR_SAVEDOC).toString()));
+ nWhich, SfxResId(STR_SAVEDOC)));
else
rSet.DisableItem(nWhich);
}
@@ -968,7 +968,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
if ( GetFlags() & SfxObjectShellFlags::DONTCLOSE )
rSet.DisableItem(nWhich);
else
- rSet.Put(SfxStringItem(nWhich, SfxResId(STR_CLOSEDOC).toString()));
+ rSet.Put(SfxStringItem(nWhich, SfxResId(STR_CLOSEDOC)));
break;
}
@@ -982,7 +982,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
if ( /*!pCombinedFilters ||*/ !GetMedium() )
rSet.DisableItem( nWhich );
else
- rSet.Put( SfxStringItem( nWhich, SfxResId(STR_SAVEASDOC).toString() ) );
+ rSet.Put( SfxStringItem( nWhich, SfxResId(STR_SAVEASDOC) ) );
break;
}
@@ -996,7 +996,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
if ( /*!pCombinedFilters ||*/ !GetMedium() )
rSet.DisableItem( nWhich );
else
- rSet.Put( SfxStringItem( nWhich, SfxResId(STR_SAVEACOPY).toString() ) );
+ rSet.Put( SfxStringItem( nWhich, SfxResId(STR_SAVEACOPY) ) );
break;
}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 56fdf502076f..759cc16b987c 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -522,7 +522,7 @@ bool SfxObjectShell::DoInitNew( SfxMedium* pMed )
// empty documents always get their macros from the user, so there is no reason to restrict access
pImpl->aMacroMode.allowMacroExecution();
if ( SfxObjectCreateMode::EMBEDDED == eCreateMode )
- SetTitle(SfxResId(STR_NONAME).toString());
+ SetTitle(SfxResId(STR_NONAME));
uno::Reference< frame::XModel > xModel ( GetModel(), uno::UNO_QUERY );
if ( xModel.is() )
@@ -734,7 +734,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
{
// set name before ConvertFrom, so that GetSbxObject() already works
bHasName = true;
- SetName( SfxResId(STR_NONAME).toString() );
+ SetName( SfxResId(STR_NONAME) );
if( !bHasStorage )
pMedium->GetInStream();
@@ -2903,7 +2903,7 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::
if ( SvtSecurityOptions().IsOptionSet( eOption ) )
{
- OUString sMessage( SfxResId(STR_HIDDENINFO_CONTAINS).toString() );
+ OUString sMessage( SfxResId(STR_HIDDENINFO_CONTAINS) );
HiddenInformation nWantedStates = HiddenInformation::RECORDEDCHANGES | HiddenInformation::NOTES;
if ( eFact != HiddenWarningFact::WhenPrinting )
nWantedStates |= HiddenInformation::DOCUMENTVERSIONS;
@@ -2912,19 +2912,19 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::
if ( nStates & HiddenInformation::RECORDEDCHANGES )
{
- sMessage += SfxResId(STR_HIDDENINFO_RECORDCHANGES).toString();
+ sMessage += SfxResId(STR_HIDDENINFO_RECORDCHANGES);
sMessage += "\n";
bWarning = true;
}
if ( nStates & HiddenInformation::NOTES )
{
- sMessage += SfxResId(STR_HIDDENINFO_NOTES).toString();
+ sMessage += SfxResId(STR_HIDDENINFO_NOTES);
sMessage += "\n";
bWarning = true;
}
if ( nStates & HiddenInformation::DOCUMENTVERSIONS )
{
- sMessage += SfxResId(STR_HIDDENINFO_DOCVERSIONS).toString();
+ sMessage += SfxResId(STR_HIDDENINFO_DOCVERSIONS);
sMessage += "\n";
bWarning = true;
}
@@ -2932,7 +2932,7 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::
if ( bWarning )
{
sMessage += "\n";
- sMessage += SfxResId(nResId).toString();
+ sMessage += SfxResId(nResId);
ScopedVclPtrInstance< WarningBox > aWBox(pParent, WB_YES_NO | WB_DEF_NO, sMessage);
nRet = aWBox->Execute();
}
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 4e097f91b471..d17203cf5328 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -598,7 +598,7 @@ bool SfxObjectShell::PrepareClose
const SfxPoolItem *pPoolItem;
if ( IsSaveVersionOnClose() )
{
- SfxStringItem aItem( SID_DOCINFO_COMMENTS, SfxResId(STR_AUTOMATICVERSION).toString() );
+ SfxStringItem aItem( SID_DOCINFO_COMMENTS, SfxResId(STR_AUTOMATICVERSION) );
SfxBoolItem aWarnItem( SID_FAIL_ON_WARNING, bUI );
const SfxPoolItem* ppArgs[] = { &aItem, &aWarnItem, nullptr };
pPoolItem = pFrame->GetBindings().ExecuteSynchron( SID_SAVEDOC, ppArgs );
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index f61d8069ba3a..d4fce41f8a5c 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -33,9 +33,9 @@ QueryTemplateBox::QueryTemplateBox( vcl::Window* pParent, const OUString& rMessa
SetImage( QueryBox::GetStandardImage() );
SetHelpId( HID_QUERY_LOAD_TEMPLATE );
- AddButton( SfxResId( STR_QRYTEMPL_UPDATE_BTN ).toString(), RET_YES,
+ AddButton( SfxResId( STR_QRYTEMPL_UPDATE_BTN ), RET_YES,
ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus );
- AddButton( SfxResId(STR_QRYTEMPL_KEEP_BTN).toString(), RET_NO, ButtonDialogFlags::Cancel );
+ AddButton( SfxResId(STR_QRYTEMPL_KEEP_BTN), RET_NO, ButtonDialogFlags::Cancel );
}
} // end of namespace sfx2
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx
index 746c0ed8fab1..cd4b0ada4c0a 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -52,7 +52,7 @@ SfxSaveAsTemplateDialog::SfxSaveAsTemplateDialog():
mpOKButton->SetClickHdl(LINK(this, SfxSaveAsTemplateDialog, OkClickHdl));
mpOKButton->Disable();
- mpOKButton->SetText(SfxResId(STR_SAVEDOC).toString());
+ mpOKButton->SetText(SfxResId(STR_SAVEDOC));
}
SfxSaveAsTemplateDialog::~SfxSaveAsTemplateDialog()
@@ -81,7 +81,7 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void)
if(!IsTemplateNameUnique())
{
- OUString sQueryMsg(SfxResId(STR_QMSG_TEMPLATE_OVERWRITE).toString());
+ OUString sQueryMsg(SfxResId(STR_QMSG_TEMPLATE_OVERWRITE));
sQueryMsg = sQueryMsg.replaceFirst("$1",msTemplateName);
aQueryDlg->set_primary_text(sQueryMsg.replaceFirst("$2", msSelectedCategory));
@@ -93,7 +93,7 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void)
Close();
else
{
- OUString sText( SfxResId(STR_ERROR_SAVEAS).toString() );
+ OUString sText( SfxResId(STR_ERROR_SAVEAS) );
ScopedVclPtrInstance<MessageDialog>(this, sText.replaceFirst("$1", msTemplateName))->Execute();
}
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 183ee4ae1aea..7430b1a02b9d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3850,16 +3850,16 @@ OUString SAL_CALL SfxBaseModel::getTitle()
}
const SfxBoolItem* pRepairedDocItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_REPAIRPACKAGE, false);
if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
- aResult += SfxResId(STR_REPAIREDDOCUMENT).toString();
+ aResult += SfxResId(STR_REPAIREDDOCUMENT);
}
if ( m_pData->m_pObjectShell->IsReadOnlyUI() || (pMedium && pMedium->IsReadOnly()) )
- aResult += SfxResId(STR_READONLY).toString();
+ aResult += SfxResId(STR_READONLY);
else if ( m_pData->m_pObjectShell->IsDocShared() )
- aResult += SfxResId(STR_SHARED).toString();
+ aResult += SfxResId(STR_SHARED);
if ( m_pData->m_pObjectShell->GetDocumentSignatureState() == SignatureState::OK )
- aResult += SfxResId(RID_XMLSEC_DOCUMENTSIGNED).toString();
+ aResult += SfxResId(RID_XMLSEC_DOCUMENTSIGNED);
}
return aResult;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index a5ae425edc26..d337fd325240 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -170,17 +170,17 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
// Create popup menus
mpActionMenu = VclPtr<PopupMenu>::Create();
mpActionMenu->InsertItem(MNI_ACTION_NEW_FOLDER,
- SfxResId(STR_CATEGORY_NEW).toString(),
+ SfxResId(STR_CATEGORY_NEW),
Image(BitmapEx(BMP_ACTION_REFRESH)));
mpActionMenu->InsertItem(MNI_ACTION_RENAME_FOLDER,
- SfxResId(STR_CATEGORY_RENAME).toString());
+ SfxResId(STR_CATEGORY_RENAME));
mpActionMenu->InsertItem(MNI_ACTION_DELETE_FOLDER,
- SfxResId(STR_CATEGORY_DELETE).toString());
+ SfxResId(STR_CATEGORY_DELETE));
mpActionMenu->InsertSeparator();
mpActionMenu->InsertItem(MNI_ACTION_REFRESH,
- SfxResId(STR_ACTION_REFRESH).toString(),
+ SfxResId(STR_ACTION_REFRESH),
Image(BitmapEx(BMP_ACTION_REFRESH)));
- mpActionMenu->InsertItem(MNI_ACTION_DEFAULT,SfxResId(STR_ACTION_DEFAULT).toString());
+ mpActionMenu->InsertItem(MNI_ACTION_DEFAULT,SfxResId(STR_ACTION_DEFAULT));
mpActionMenu->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl));
mpTemplateDefaultMenu = VclPtr<PopupMenu>::Create();
@@ -246,7 +246,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
mpExportButton->Disable();
mpMoveButton->Disable();
- mpOKButton->SetText(SfxResId(STR_OPEN).toString());
+ mpOKButton->SetText(SfxResId(STR_OPEN));
mpCBApp->SetSelectHdl(LINK(this, SfxTemplateManagerDlg, SelectApplicationHdl));
mpCBFolder->SetSelectHdl(LINK(this, SfxTemplateManagerDlg, SelectRegionHdl));
@@ -629,7 +629,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, ImportClickHdl, Button*, void)
}
else
{
- OUString aMsg( SfxResId(STR_CREATE_ERROR).toString() );
+ OUString aMsg( SfxResId(STR_CREATE_ERROR) );
ScopedVclPtrInstance<MessageDialog>(this, aMsg.replaceFirst("$1", sCategory))->Execute();
return;
}
@@ -747,7 +747,7 @@ IMPL_LINK(SfxTemplateManagerDlg, DeleteTemplateHdl, ThumbnailViewItem*, pItem, v
if (!aDeletedTemplate.isEmpty())
{
- OUString aMsg( SfxResId(STR_MSG_ERROR_DELETE_TEMPLATE).toString() );
+ OUString aMsg( SfxResId(STR_MSG_ERROR_DELETE_TEMPLATE) );
ScopedVclPtrInstance<MessageDialog>(this, aMsg.replaceFirst("$1",aDeletedTemplate))->Execute();
}
}
@@ -892,12 +892,12 @@ void SfxTemplateManagerDlg::OnTemplateImportCategory(const OUString& sCategory)
sfx2::FileDialogHelper aFileDlg(nDialogType, FileDialogFlags::MultiSelection);
// add "All" filter
- aFileDlg.AddFilter( SfxResId(STR_SFX_FILTERNAME_ALL).toString(),
+ aFileDlg.AddFilter( SfxResId(STR_SFX_FILTERNAME_ALL),
FILEDIALOG_FILTER_ALL );
// add template filter
OUString sFilterExt;
- OUString sFilterName( SfxResId( STR_TEMPLATE_FILTER ).toString() );
+ OUString sFilterName( SfxResId( STR_TEMPLATE_FILTER ) );
// add filters of modules which are installed
SvtModuleOptions aModuleOpt;
@@ -967,7 +967,7 @@ void SfxTemplateManagerDlg::OnTemplateImportCategory(const OUString& sCategory)
if (!aTemplateList.isEmpty())
{
- OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT).toString());
+ OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT));
aMsg = aMsg.replaceFirst("$1",pContItem->maTitle);
ScopedVclPtrInstance<MessageDialog>(this, aMsg.replaceFirst("$2",aTemplateList))->Execute();
}
@@ -1057,12 +1057,12 @@ void SfxTemplateManagerDlg::OnTemplateExport()
if (!aTemplateList.isEmpty())
{
- OUString aText( SfxResId(STR_MSG_ERROR_EXPORT).toString() );
+ OUString aText( SfxResId(STR_MSG_ERROR_EXPORT) );
ScopedVclPtrInstance<MessageDialog>(this, aText.replaceFirst("$1",aTemplateList))->Execute();
}
else
{
- OUString sText( SfxResId(STR_MSG_EXPORT_SUCCESS).toString() );
+ OUString sText( SfxResId(STR_MSG_EXPORT_SUCCESS) );
ScopedVclPtrInstance<MessageDialog>(this, sText.replaceFirst("$1", OUString::number(nCount)), VclMessageType::Info)->Execute();
}
}
@@ -1110,7 +1110,7 @@ void SfxTemplateManagerDlg::OnTemplateOpen ()
void SfxTemplateManagerDlg::OnCategoryNew()
{
- ScopedVclPtrInstance< InputDialog > dlg(SfxResId(STR_INPUT_NEW).toString(),this);
+ ScopedVclPtrInstance< InputDialog > dlg(SfxResId(STR_INPUT_NEW),this);
int ret = dlg->Execute();
@@ -1122,7 +1122,7 @@ void SfxTemplateManagerDlg::OnCategoryNew()
mpCBFolder->InsertEntry(aName);
else
{
- OUString aMsg( SfxResId(STR_CREATE_ERROR).toString() );
+ OUString aMsg( SfxResId(STR_CREATE_ERROR) );
ScopedVclPtrInstance<MessageDialog>(this, aMsg.replaceFirst("$1", aName))->Execute();
}
}
@@ -1131,7 +1131,7 @@ void SfxTemplateManagerDlg::OnCategoryNew()
void SfxTemplateManagerDlg::OnCategoryRename()
{
OUString sCategory = mpCBFolder->GetSelectEntry();
- ScopedVclPtrInstance< InputDialog > dlg(SfxResId(STR_INPUT_NEW).toString(),this);
+ ScopedVclPtrInstance< InputDialog > dlg(SfxResId(STR_INPUT_NEW),this);
dlg->SetEntryText(sCategory);
int ret = dlg->Execute();
@@ -1152,7 +1152,7 @@ void SfxTemplateManagerDlg::OnCategoryRename()
}
else
{
- OUString aMsg( SfxResId(STR_CREATE_ERROR).toString() );
+ OUString aMsg( SfxResId(STR_CREATE_ERROR) );
ScopedVclPtrInstance<MessageDialog>(this, aMsg.replaceFirst("$1", aName))->Execute();
}
}
@@ -1163,8 +1163,8 @@ void SfxTemplateManagerDlg::OnCategoryDelete()
ScopedVclPtrInstance< SfxTemplateCategoryDialog > aDlg;
aDlg->SetCategoryLBEntries(mpLocalView->getFolderNames());
aDlg->HideNewCategoryOption();
- aDlg->SetText(SfxResId(STR_CATEGORY_DELETE).toString());
- aDlg->SetSelectLabelText(SfxResId(STR_CATEGORY_SELECT).toString());
+ aDlg->SetText(SfxResId(STR_CATEGORY_DELETE));
+ aDlg->SetSelectLabelText(SfxResId(STR_CATEGORY_SELECT));
if (aDlg->Execute() == RET_OK)
{
@@ -1180,7 +1180,7 @@ void SfxTemplateManagerDlg::OnCategoryDelete()
if (!mpLocalView->removeRegion(nItemId))
{
- OUString sMsg( SfxResId(STR_MSG_ERROR_DELETE_FOLDER).toString() );
+ OUString sMsg( SfxResId(STR_MSG_ERROR_DELETE_FOLDER) );
ScopedVclPtrInstance<MessageDialog>(this, sMsg.replaceFirst("$1",sCategory))->Execute();
}
else
@@ -1246,7 +1246,7 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16 nItemId)
if(!mpLocalView->moveTemplate(pItem,pItem->mnRegionId,nItemId))
{
OUString sDst = mpLocalView->getRegionItemName(nItemId);
- OUString sMsg(SfxResId(STR_MSG_ERROR_LOCAL_MOVE).toString());
+ OUString sMsg(SfxResId(STR_MSG_ERROR_LOCAL_MOVE));
sMsg = sMsg.replaceFirst("$1",sDst);
ScopedVclPtrInstance<MessageDialog>(this, sMsg.replaceFirst( "$2",pItem->maTitle))->Execute();
}
@@ -1401,7 +1401,7 @@ SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(vcl::Window* pParent):
{
mpCBApp->SelectEntryPos(MNI_IMPRESS);
mpCBFolder->SelectEntryPos(0);
- SetText(SfxResId(STR_TEMPLATE_SELECTION).toString());
+ SetText(SfxResId(STR_TEMPLATE_SELECTION));
if(mpLocalView->IsVisible())
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 05:17:35 +0000