diff options
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 28 | ||||
-rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 18 | ||||
-rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/dialog/navigat.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/passwd.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/recfloat.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/securitypage.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/styledlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 20 |
12 files changed, 50 insertions, 50 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index ccacc752731c..83916da238ad 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -104,7 +104,7 @@ namespace { OUString CreateSizeText( sal_Int64 nSize ) { OUString aUnitStr(" "); - aUnitStr += SfxResId(STR_BYTES).toString(); + aUnitStr += SfxResId(STR_BYTES); sal_Int64 nSize1 = nSize; sal_Int64 nSize2 = nSize1; sal_Int64 nMega = 1024 * 1024; @@ -116,7 +116,7 @@ OUString CreateSizeText( sal_Int64 nSize ) { nSize1 /= 1024; aUnitStr = " "; - aUnitStr += SfxResId(STR_KB).toString(); + aUnitStr += SfxResId(STR_KB); fSize /= 1024; nDec = 0; } @@ -124,7 +124,7 @@ OUString CreateSizeText( sal_Int64 nSize ) { nSize1 /= nMega; aUnitStr = " "; - aUnitStr += SfxResId(STR_MB).toString(); + aUnitStr += SfxResId(STR_MB); fSize /= nMega; nDec = 2; } @@ -132,7 +132,7 @@ OUString CreateSizeText( sal_Int64 nSize ) { nSize1 /= nGiga; aUnitStr = " "; - aUnitStr += SfxResId(STR_GB).toString(); + aUnitStr += SfxResId(STR_GB); fSize /= nGiga; nDec = 3; } @@ -150,7 +150,7 @@ OUString CreateSizeText( sal_Int64 nSize ) aSizeStr += " ("; aSizeStr += rLocaleWrapper.getNum( nSize2, 0 ); aSizeStr += " "; - aSizeStr += SfxResId(STR_BYTES).toString(); + aSizeStr += SfxResId(STR_BYTES); aSizeStr += ")"; } return aSizeStr; @@ -1036,7 +1036,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) INetURLObject aURL(aFile); OUString aName = aURL.GetName( INetURLObject::DecodeMechanism::WithCharset ); if ( aName.isEmpty() || aURL.GetProtocol() == INetProtocol::PrivSoffice ) - aName = SfxResId( STR_NONAME ).toString(); + aName = SfxResId( STR_NONAME ); m_pNameED->SetText( aName ); // determine context symbol @@ -1063,7 +1063,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) OUString aDescription = SvFileInformationManager::GetDescription( INetURLObject(rMainURL) ); if ( aDescription.isEmpty() ) - aDescription = SfxResId( STR_SFX_NEWOFFICEDOC ).toString(); + aDescription = SfxResId( STR_SFX_NEWOFFICEDOC ); m_pShowTypeFT->SetText( aDescription ); // determine location @@ -1199,7 +1199,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent, aTitle = aTitle.replaceFirst("%1", aFile); } else - aTitle = aTitle.replaceFirst("%1", SfxResId( STR_NONAME ).toString()); + aTitle = aTitle.replaceFirst("%1", SfxResId( STR_NONAME )); } else { @@ -1226,7 +1226,7 @@ void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) void SfxDocumentInfoDialog::AddFontTabPage() { - AddTabPage( FONT_PAGE_ID, SfxResId( STR_FONT_TABPAGE ).toString(), SfxDocumentFontsPage::Create, nullptr); + AddTabPage( FONT_PAGE_ID, SfxResId( STR_FONT_TABPAGE ), SfxDocumentFontsPage::Create, nullptr); } // class CustomPropertiesYesNoButton ------------------------------------- @@ -1409,7 +1409,7 @@ namespace WB_AUTOSIZE|WB_AUTOHSCROLL)); aNameBox->SetPosSizePixel(aNameBox->LogicToPixel(Point(0, 2), MapUnit::MapAppFont), aNameBox->LogicToPixel(Size(60, 72), MapUnit::MapAppFont)); - ResStringArray aStrArr(SfxResId(SFX_CB_PROPERTY_STRINGARRAY)); + ResStringArray aStrArr(ResId(SFX_CB_PROPERTY_STRINGARRAY, *SfxResMgr::GetResMgr())); for (sal_uInt32 i = 0; i < aStrArr.Count(); ++i) aNameBox->InsertEntry(aStrArr.GetString(i)); return aNameBox; @@ -1422,7 +1422,7 @@ CustomPropertiesTypeBox::CustomPropertiesTypeBox(vcl::Window* pParent, CustomPro { SetPosSizePixel(LogicToPixel(Point(63, 2), MapUnit::MapAppFont), LogicToPixel(Size(60, 80), MapUnit::MapAppFont)); - ResStringArray aStrArr(SfxResId(SFX_LB_PROPERTY_STRINGARRAY)); + ResStringArray aStrArr(ResId(SFX_LB_PROPERTY_STRINGARRAY, *SfxResMgr::GetResMgr())); for (sal_uInt32 i = 0; i < aStrArr.Count(); ++i) { InsertEntry(aStrArr.GetString(i)); @@ -1438,7 +1438,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_aValueEdit ( VclPtr<CustomPropertiesEdit>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_LEFT, this ) ), m_aDateField ( VclPtr<CustomPropertiesDateField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ), m_aTimeField ( VclPtr<CustomPropertiesTimeField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ), - m_sDurationFormat( SfxResId( SFX_ST_DURATION_FORMAT ).toString() ), + m_sDurationFormat( SfxResId( SFX_ST_DURATION_FORMAT ) ), m_aDurationField( VclPtr<CustomPropertiesDurationField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_READONLY, this ) ), m_aEditButton ( VclPtr<CustomPropertiesEditButton>::Create(pParent, WB_TABSTOP, this) ), m_aYesNoButton ( VclPtr<CustomPropertiesYesNoButton>::Create(pParent) ), @@ -1452,9 +1452,9 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_aDateField->SetExtDateFormat( ExtDateFieldFormat::SystemShortYYYY ); m_aRemoveButton->SetModeImage(Image(BitmapEx(SFX_BMP_PROPERTY_REMOVE))); - m_aRemoveButton->SetQuickHelpText(SfxResId(STR_SFX_REMOVE_PROPERTY).toString()); + m_aRemoveButton->SetQuickHelpText(SfxResId(STR_SFX_REMOVE_PROPERTY)); - m_aEditButton->SetText(SfxResId(SFX_ST_EDIT).toString()); + m_aEditButton->SetText(SfxResId(SFX_ST_EDIT)); } void CustomPropertyLine::SetRemoved() diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 6ea2e62a316a..2026be6ad82e 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -618,7 +618,7 @@ void FileDialogHelper_Impl::updateVersions() uno::Sequence < util::RevisionTag > xVersions = SfxMedium::GetVersionList( xStorage ); aEntries.realloc( xVersions.getLength() + 1 ); - aEntries[0] = SfxResId( STR_SFX_FILEDLG_ACTUALVERSION ).toString(); + aEntries[0] = SfxResId( STR_SFX_FILEDLG_ACTUALVERSION ); for ( sal_Int32 i=0; i<xVersions.getLength(); i++ ) aEntries[ i + 1 ] = xVersions[i].Identifier; @@ -1092,7 +1092,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( // Export dialog if ( mbExport ) { - mxFileDlg->setTitle( SfxResId( STR_SFX_EXPLORERFILE_EXPORT ).toString() ); + mxFileDlg->setTitle( SfxResId( STR_SFX_EXPLORERFILE_EXPORT ) ); try { css::uno::Reference < XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY_THROW ); xCtrlAccess->enableControl( ExtendedFilePickerElementIds::LISTBOX_FILTER_SELECTOR, true ); @@ -1103,7 +1103,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( // Save a copy dialog if ( nFlags & FileDialogFlags::SaveACopy ) { - mxFileDlg->setTitle( SfxResId( STR_PB_SAVEACOPY ).toString() ); + mxFileDlg->setTitle( SfxResId( STR_PB_SAVEACOPY ) ); } // the "insert file" dialog needs another title @@ -1111,15 +1111,15 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( { if ( nFlags & FileDialogFlags::InsertCompare ) { - mxFileDlg->setTitle( SfxResId( STR_PB_COMPAREDOC ).toString() ); + mxFileDlg->setTitle( SfxResId( STR_PB_COMPAREDOC ) ); } else if ( nFlags & FileDialogFlags::InsertMerge ) { - mxFileDlg->setTitle( SfxResId( STR_PB_MERGEDOC ).toString() ); + mxFileDlg->setTitle( SfxResId( STR_PB_MERGEDOC ) ); } else { - mxFileDlg->setTitle( SfxResId( STR_SFX_EXPLORERFILE_INSERT ).toString() ); + mxFileDlg->setTitle( SfxResId( STR_SFX_EXPLORERFILE_INSERT ) ); } uno::Reference < XFilePickerControlAccess > xExtDlg( mxFileDlg, UNO_QUERY ); if ( xExtDlg.is() ) @@ -1127,7 +1127,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( try { xExtDlg->setLabel( CommonFilePickerElementIds::PUSHBUTTON_OK, - SfxResId( STR_SFX_EXPLORERFILE_BUTTONINSERT ).toString() ); + SfxResId( STR_SFX_EXPLORERFILE_BUTTONINSERT ) ); } catch( const IllegalArgumentException& ){} } @@ -1845,7 +1845,7 @@ void FileDialogHelper_Impl::addGraphicFilter() try { - OUString aAllFilterName = SfxResId( STR_SFX_IMPORT_ALL ).toString(); + OUString aAllFilterName = SfxResId( STR_SFX_IMPORT_ALL ); aAllFilterName = ::sfx2::addExtension( aAllFilterName, aExtensions, bIsInOpenMode, *this ); xFltMgr->appendFilter( aAllFilterName, aExtensions ); @@ -2610,7 +2610,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, // read-only to discourage editing (which would invalidate existing // signatures). if (nFlags & FileDialogFlags::SignPDF) - pDialog.reset(new FileDialogHelper(nDialogType, nFlags, SfxResId(STR_SFX_FILTERNAME_PDF).toString(), "pdf", rStandardDir, rBlackList)); + pDialog.reset(new FileDialogHelper(nDialogType, nFlags, SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rBlackList)); else pDialog.reset(new FileDialogHelper(nDialogType, nFlags, rFact, nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rBlackList)); diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 25f6e8001a5f..f6771e2e15cf 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -753,7 +753,7 @@ namespace sfx2 bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) { bool bHasAll = false; - _rAllFilterName = SfxResId( STR_SFX_FILTERNAME_ALL ).toString(); + _rAllFilterName = SfxResId( STR_SFX_FILTERNAME_ALL ); // check if there's already a filter <ALL> diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index ac01c0fc6e6f..bdf8a34d83d8 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -173,7 +173,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( //used in filter/source/pdf/impdialog.cxx uno::Sequence< beans::PropertyValue > aFilterDataValue(1); aFilterDataValue[0].Name = "_OkButtonString"; - aFilterDataValue[0].Value <<= SfxResId(STR_PDF_EXPORT_SEND ).toString(); + aFilterDataValue[0].Value <<= SfxResId(STR_PDF_EXPORT_SEND ); //add to the filterdata property, the only one the PDF export filter dialog will care for aPropsForDialog[0].Name = "FilterData"; diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index fca6b357efae..f39eec6f5a56 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -156,7 +156,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx { if ( pStyle->HasClearParentSupport() ) // the base template can be set to NULL - m_pBaseLb->InsertEntry( SfxResId(STR_NONE).toString() ); + m_pBaseLb->InsertEntry( SfxResId(STR_NONE) ); SfxStyleSheetBase* pPoolStyle = pPool->First(); @@ -523,11 +523,11 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) pStyle->SetParent( aParent ); if ( aParent.isEmpty() ) - m_pBaseLb->SelectEntry( SfxResId(STR_NONE).toString() ); + m_pBaseLb->SelectEntry( SfxResId(STR_NONE) ); else m_pBaseLb->SelectEntry( aParent ); - if ( SfxResId(STR_STANDARD).toString().equals(aName) ) + if ( SfxResId(STR_STANDARD).equals(aName) ) { // the default template can not be linked m_pBaseFt->Disable(); @@ -640,7 +640,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) { OUString aParentEntry( m_pBaseLb->GetSelectEntry() ); - if ( SfxResId(STR_NONE).toString().equals(aParentEntry) || aParentEntry == pStyle->GetName() ) + if ( SfxResId(STR_NONE).equals(aParentEntry) || aParentEntry == pStyle->GetName() ) aParentEntry.clear(); if ( pStyle->GetParent() != aParentEntry ) diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index c41717bfabb0..4b508bc97824 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -54,7 +54,7 @@ SfxNavigator::SfxNavigator( SfxBindings* pBind , nBits ) , pWrapper( pChildWin ) { - SetText( SfxResId(SID_NAVIGATOR).toString() ); + SetText( SfxResId(SID_NAVIGATOR) ); } void SfxNavigator::Resize() diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 5b3b7bd3fda4..0c030ee63f2b 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -84,9 +84,9 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl, Button*, void) SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText) : ModalDialog(pParent, "PasswordDialog", "sfx/ui/password.ui") - , maMinLenPwdStr(SFX2_RESSTR(STR_PASSWD_MIN_LEN)) - , maMinLenPwdStr1(SFX2_RESSTR(STR_PASSWD_MIN_LEN1)) - , maEmptyPwdStr(SFX2_RESSTR(STR_PASSWD_EMPTY)) + , maMinLenPwdStr(SfxResId(STR_PASSWD_MIN_LEN)) + , maMinLenPwdStr1(SfxResId(STR_PASSWD_MIN_LEN1)) + , maEmptyPwdStr(SfxResId(STR_PASSWD_EMPTY)) , mnMinLen(5) , mnExtras(SfxShowExtras::NONE) , mbAsciiOnly(false) diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index d80d89f965a1..7b2a592db670 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -61,8 +61,8 @@ bool SfxRecordingFloatWrapper_Impl::QueryClose() css::uno::Reference< css::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder(); if ( xRecorder.is() && !xRecorder->getRecordedMacro().isEmpty() ) { - ScopedVclPtrInstance< QueryBox > aBox(GetWindow(), WB_YES_NO | WB_DEF_NO , SfxResId(STR_MACRO_LOSS).toString()); - aBox->SetText( SfxResId(STR_CANCEL_RECORDING).toString() ); + ScopedVclPtrInstance< QueryBox > aBox(GetWindow(), WB_YES_NO | WB_DEF_NO , SfxResId(STR_MACRO_LOSS)); + aBox->SetText( SfxResId(STR_CANCEL_RECORDING) ); bRet = ( aBox->Execute() == RET_YES ); } diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 20c3dbab9b97..a6c00be522fd 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -124,7 +124,7 @@ static bool lcl_IsPasswordCorrect( const OUString &rPassword ) if (SvPasswordHelper::CompareHashPassword( aPasswordHash, rPassword )) bRes = true; // password was correct else - ScopedVclPtrInstance<InfoBox>(nullptr, SFX2_RESSTR(RID_SVXSTR_INCORRECT_PASSWORD))->Execute(); + ScopedVclPtrInstance<InfoBox>(nullptr, SfxResId(RID_SVXSTR_INCORRECT_PASSWORD))->Execute(); return bRes; } @@ -162,7 +162,7 @@ SfxSecurityPage_Impl::SfxSecurityPage_Impl( SfxSecurityPage &rTabPage ) : m_eRedlingMode ( RL_NONE ), m_bOrigPasswordIsConfirmed ( false ), m_bNewPasswordIsValid ( false ), - m_aEndRedliningWarning ( SFX2_RESSTR(RID_SVXSTR_END_REDLINING_WARNING) ), + m_aEndRedliningWarning ( SfxResId(RID_SVXSTR_END_REDLINING_WARNING) ), m_bEndRedliningWarningDone ( false ) { rTabPage.get(m_pOpenReadonlyCB, "readonly"); diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 038f01b241c7..3e174e3eccd5 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -134,7 +134,7 @@ IMPL_LINK_NOARG( SfxStyleDialog, CancelHdl, Button *, void ) OUString SfxStyleDialog::GenerateUnusedName(SfxStyleSheetBasePool &rPool) { - OUString aNoName(SfxResId(STR_NONAME).toString()); + OUString aNoName(SfxResId(STR_NONAME)); sal_uInt16 nNo = 1; OUString aNo(aNoName); aNoName += OUString::number(nNo); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index e4910a28e06c..592f59509829 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -455,7 +455,7 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) m_pOKBtn->SetClickHdl( LINK( this, SfxTabDialog, OkHdl ) ); m_pCancelBtn->SetClickHdl( LINK( this, SfxTabDialog, CancelHdl ) ); m_pResetBtn->SetClickHdl( LINK( this, SfxTabDialog, ResetHdl ) ); - m_pResetBtn->SetText( SfxResId( STR_RESET ).toString() ); + m_pResetBtn->SetText( SfxResId( STR_RESET ) ); m_pTabCtrl->SetActivatePageHdl( LINK( this, SfxTabDialog, ActivatePageHdl ) ); m_pTabCtrl->SetDeactivatePageHdl( @@ -477,7 +477,7 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) if ( bFmtFlag ) { - m_pBaseFmtBtn->SetText( SfxResId( STR_STANDARD_SHORTCUT ).toString() ); + m_pBaseFmtBtn->SetText( SfxResId( STR_STANDARD_SHORTCUT ) ); m_pBaseFmtBtn->SetClickHdl( LINK( this, SfxTabDialog, BaseFmtHdl ) ); m_pBaseFmtBtn->SetHelpId( HID_TABDLG_STANDARD_BTN ); m_pBaseFmtBtn->Show(); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index b2a323aa6fe7..48a874f34996 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -668,7 +668,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl , m_bWantHierarchical(false) , bBindingUpdate(true) { - aFmtLb->SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST).toString()); + aFmtLb->SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST)); aFmtLb->SetHelpId( HID_TEMPLATE_FMT ); aFilterLb->SetHelpId( HID_TEMPLATE_FILTER ); aFmtLb->SetStyle( aFmtLb->GetStyle() | WB_SORT | WB_HIDESELECTION ); @@ -1116,7 +1116,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags) aFilterLb->SetUpdateMode(false); aFilterLb->Clear(); //insert hierarchical at the beginning - sal_Int32 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString(), 0); + sal_Int32 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL), 0); aFilterLb->SetEntryData( nPos, reinterpret_cast<void*>(SFXSTYLEBIT_ALL) ); const SfxStyleFilter& rFilter = pItem->GetFilterList(); for(const SfxFilterTupel& i : rFilter) @@ -1138,7 +1138,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags) // if the tree view again, select family hierarchy if (pTreeBox || m_bWantHierarchical) { - aFilterLb->SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString()); + aFilterLb->SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)); EnableHierarchical(true); } @@ -1613,7 +1613,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) pTreeBox->SetOptimalImageIndent(); FillTreeBox(); SelectStyle(aSelectEntry); - pTreeBox->SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST).toString()); + pTreeBox->SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST)); pTreeBox->Show(); } } @@ -1631,7 +1631,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void ) { - if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString() == rBox.GetSelectEntry()) + if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL) == rBox.GetSelectEntry()) { EnableHierarchical(true); } @@ -1857,8 +1857,8 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl() SvTreeListEntry* pEntry = pTreeBox ? pTreeBox->FirstSelected() : aFmtLb->FirstSelected(); const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl(); - OUString aMsg = SfxResId(STR_DELETE_STYLE_USED).toString() - + SfxResId(STR_DELETE_STYLE).toString(); + OUString aMsg = SfxResId(STR_DELETE_STYLE_USED) + + SfxResId(STR_DELETE_STYLE); while (pEntry) { @@ -2161,13 +2161,13 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanel , m_aActionTbL(VclPtrInstance<DropToolBox_Impl>(pDlgWindow, this)) , m_aActionTbR(VclPtrInstance<ToolBox>(pDlgWindow)) { - m_aActionTbR->InsertItem(SID_STYLE_WATERCAN, Image(BitmapEx(RID_SFXBMP_WATERCAN)), SfxResId(STR_STYLE_FILL_FORMAT_MODE).toString()); + m_aActionTbR->InsertItem(SID_STYLE_WATERCAN, Image(BitmapEx(RID_SFXBMP_WATERCAN)), SfxResId(STR_STYLE_FILL_FORMAT_MODE)); m_aActionTbR->SetHelpId(SID_STYLE_WATERCAN, HID_TEMPLDLG_WATERCAN); - m_aActionTbR->InsertItem(SID_STYLE_NEW_BY_EXAMPLE, Image(BitmapEx(RID_SFXBMP_NEW_BY_EXAMPLE)), SfxResId(STR_STYLE_NEW_STYLE_FROM_SELECTION).toString()); + m_aActionTbR->InsertItem(SID_STYLE_NEW_BY_EXAMPLE, Image(BitmapEx(RID_SFXBMP_NEW_BY_EXAMPLE)), SfxResId(STR_STYLE_NEW_STYLE_FROM_SELECTION)); m_aActionTbR->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); - m_aActionTbR->InsertItem(SID_STYLE_UPDATE_BY_EXAMPLE, Image(BitmapEx(RID_SFXBMP_UPDATE_BY_EXAMPLE)), SfxResId(STR_STYLE_UPDATE_STYLE).toString()); + m_aActionTbR->InsertItem(SID_STYLE_UPDATE_BY_EXAMPLE, Image(BitmapEx(RID_SFXBMP_UPDATE_BY_EXAMPLE)), SfxResId(STR_STYLE_UPDATE_STYLE)); m_aActionTbR->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); Initialize(); |