summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-18 21:14:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-21 19:28:59 +0200
commitd666c2f87d56da1f4dd3d421665ac3078c447a17 (patch)
treefb837b5b12955d94c06e1abdb0ccb09ceb901607 /svtools
parentd3ba63909740262e0cd64648e2eb00096b4626d2 (diff)
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to functions that return a OUString drop various defines drop unnecessary toString calls Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92 Reviewed-on: https://gerrit.libreoffice.org/37817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2155e04d6343638ca9815d394cbc4f78c2b17c3a) drop toString Change-Id: I0f67c8931523bbe90bfbc8cc7d9a5bd523758ee5 (cherry picked from commit 8b1101023f01b2c7478a014b5ead73ada4fd4861) pNameResId is unused Change-Id: Ic1fe6abc7066517187695266c4d1a0888b41ffe7 (cherry picked from commit c2667d7ff558a1b7bf83e694909465f00d1a16f6) Reviewed-on: https://gerrit.libreoffice.org/37843 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/fileview.cxx24
-rw-r--r--svtools/source/contnr/svtabbx.cxx4
-rw-r--r--svtools/source/contnr/templwin.cxx2
-rw-r--r--svtools/source/control/calendar.cxx8
-rw-r--r--svtools/source/control/collatorres.cxx26
-rw-r--r--svtools/source/control/ctrlbox.cxx16
-rw-r--r--svtools/source/control/ctrltool.cxx24
-rw-r--r--svtools/source/control/filectrl.cxx2
-rw-r--r--svtools/source/control/indexentryres.cxx22
-rw-r--r--svtools/source/control/tabbar.cxx10
-rw-r--r--svtools/source/dialogs/PlaceEditDialog.cxx2
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx66
-rw-r--r--svtools/source/dialogs/insdlg.cxx6
-rw-r--r--svtools/source/dialogs/prnsetup.cxx4
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx2
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx6
-rw-r--r--svtools/source/filter/exportdialog.cxx20
-rw-r--r--svtools/source/misc/imagemgr.cxx6
-rw-r--r--svtools/source/misc/langtab.cxx4
-rw-r--r--svtools/source/misc/svtresid.cxx11
20 files changed, 128 insertions, 137 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 0c75869623a1..0052bfbab596 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -435,25 +435,25 @@ OUString CreateExactSizeText( sal_Int64 nSize )
if ( nSize < 10000 )
{
- aUnitStr += SVT_RESSTR(STR_SVT_BYTES );
+ aUnitStr += SvtResId(STR_SVT_BYTES );
nDec = 0;
}
else if ( nSize < nMega )
{
fSize /= 1024;
- aUnitStr += SVT_RESSTR(STR_SVT_KB);
+ aUnitStr += SvtResId(STR_SVT_KB);
nDec = 1;
}
else if ( nSize < nGiga )
{
fSize /= nMega;
- aUnitStr += SVT_RESSTR(STR_SVT_MB);
+ aUnitStr += SvtResId(STR_SVT_MB);
nDec = 2;
}
else
{
fSize /= nGiga;
- aUnitStr += SVT_RESSTR(STR_SVT_GB);
+ aUnitStr += SvtResId(STR_SVT_GB);
nDec = 3;
}
@@ -474,9 +474,9 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin,
mpHeaderBar ( nullptr ),
mpParent ( pParent ),
- msAccessibleDescText( SVT_RESSTR(STR_SVT_ACC_DESC_FILEVIEW) ),
- msFolder ( SVT_RESSTR(STR_SVT_ACC_DESC_FOLDER) ),
- msFile ( SVT_RESSTR(STR_SVT_ACC_DESC_FILE) ),
+ msAccessibleDescText( SvtResId(STR_SVT_ACC_DESC_FILEVIEW) ),
+ msFolder ( SvtResId(STR_SVT_ACC_DESC_FOLDER) ),
+ msFile ( SvtResId(STR_SVT_ACC_DESC_FILE) ),
mnSearchIndex ( 0 ),
mbResizeDisabled ( false ),
mbAutoResize ( false ),
@@ -493,7 +493,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin,
long pTabs[] = { 2, 20, 600 };
SetTabs(&pTabs[0], MapUnit::MapPixel);
- mpHeaderBar->InsertItem(COLUMN_TITLE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TITLE), 600, nBits | HeaderBarItemBits::UPARROW);
+ mpHeaderBar->InsertItem(COLUMN_TITLE, SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE), 600, nBits | HeaderBarItemBits::UPARROW);
}
else
{
@@ -501,13 +501,13 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin,
SetTabs(&pTabs[0], MapUnit::MapPixel);
SetTabJustify(2, AdjustRight); // column "Size"
- mpHeaderBar->InsertItem(COLUMN_TITLE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TITLE), 180, nBits | HeaderBarItemBits::UPARROW);
+ mpHeaderBar->InsertItem(COLUMN_TITLE, SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE), 180, nBits | HeaderBarItemBits::UPARROW);
if (nFlags & FileViewFlags::SHOW_TYPE)
{
- mpHeaderBar->InsertItem(COLUMN_TYPE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TYPE), 140, nBits);
+ mpHeaderBar->InsertItem(COLUMN_TYPE, SvtResId(STR_SVT_FILEVIEW_COLUMN_TYPE), 140, nBits);
}
- mpHeaderBar->InsertItem(COLUMN_SIZE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_SIZE), 80, nBits);
- mpHeaderBar->InsertItem(COLUMN_DATE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_DATE), 500, nBits);
+ mpHeaderBar->InsertItem(COLUMN_SIZE, SvtResId(STR_SVT_FILEVIEW_COLUMN_SIZE), 80, nBits);
+ mpHeaderBar->InsertItem(COLUMN_DATE, SvtResId(STR_SVT_FILEVIEW_COLUMN_DATE), 500, nBits);
}
Size aHeadSize = mpHeaderBar->GetSizePixel();
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 4bddb65a48ce..f0d823840e8b 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -402,7 +402,7 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
{
OUString sRet = static_cast<const SvLBoxString&>(rBoxItem).GetText();
if ( sRet.isEmpty() )
- sRet = SVT_RESSTR( STR_SVT_ACC_EMPTY_FIELD );
+ sRet = SvtResId( STR_SVT_ACC_EMPTY_FIELD );
return sRet;
}
--nCol;
@@ -996,7 +996,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBr
sal_Int32 nRow = _nPos / nColumnCount;
sal_uInt16 nColumn = static_cast< sal_uInt16 >( _nPos % nColumnCount );
- OUString aText( SVT_RESSTR(STR_SVT_ACC_DESC_TABLISTBOX) );
+ OUString aText( SvtResId(STR_SVT_ACC_DESC_TABLISTBOX) );
aText = aText.replaceFirst( sVar1, OUString::number( nRow ) );
OUString sColHeader = m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( nColumn ) );
if ( sColHeader.isEmpty() )
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index ff0036e266c9..d88d0e134826 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -23,7 +23,7 @@
// class SvtDocInfoTable_Impl --------------------------------------------
SvtDocInfoTable_Impl::SvtDocInfoTable_Impl()
- : ResStringArray(SvtResId(STRARY_SVT_DOCINFO))
+ : ResStringArray(ResId(STRARY_SVT_DOCINFO, *SvtResMgr::GetResMgr()))
{
}
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 0c2528207a2c..4ed627ea5a21 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -197,8 +197,8 @@ void Calendar::ImplInit( WinBits nWinStyle )
ImplCalendarSelectDate( mpSelectTable, maCurDate, true );
// Sonstige Strings erzeugen
- maDayText = SVT_RESSTR(STR_SVT_CALENDAR_DAY);
- maWeekText = SVT_RESSTR(STR_SVT_CALENDAR_WEEK);
+ maDayText = SvtResId(STR_SVT_CALENDAR_DAY);
+ maWeekText = SvtResId(STR_SVT_CALENDAR_WEEK);
// Tagestexte anlegen
for (sal_Int32 i = 0; i < 31; ++i)
@@ -2020,7 +2020,7 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( bool bEnable )
if ( !mpTodayBtn )
{
mpTodayBtn = VclPtr<PushButton>::Create( this, WB_NOPOINTERFOCUS );
- OUString aTodayText(SVT_RESSTR(STR_SVT_CALENDAR_TODAY));
+ OUString aTodayText(SvtResId(STR_SVT_CALENDAR_TODAY));
mpTodayBtn->SetText( aTodayText );
Size aSize;
aSize.Width() = mpTodayBtn->GetCtrlTextWidth( mpTodayBtn->GetText() );
@@ -2046,7 +2046,7 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( bool bEnable )
if ( !mpNoneBtn )
{
mpNoneBtn = VclPtr<PushButton>::Create( this, WB_NOPOINTERFOCUS );
- OUString aNoneText(SVT_RESSTR(STR_SVT_CALENDAR_NONE));
+ OUString aNoneText(SvtResId(STR_SVT_CALENDAR_NONE));
mpNoneBtn->SetText( aNoneText );
Size aSize;
aSize.Width() = mpNoneBtn->GetCtrlTextWidth( mpNoneBtn->GetText() );
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index b11cfceca646..15ea3a6afb1e 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -24,20 +24,18 @@
// implementation of the collator-algorithm-name translation
CollatorResource::CollatorResource()
{
- #define RESSTR(rid) SvtResId(rid).toString()
-
- m_aData.push_back(CollatorResourceData("alphanumeric", RESSTR(STR_SVT_COLLATE_ALPHANUMERIC)));
- m_aData.push_back(CollatorResourceData("charset", RESSTR(STR_SVT_COLLATE_CHARSET)));
- m_aData.push_back(CollatorResourceData("dict", RESSTR(STR_SVT_COLLATE_DICTIONARY)));
- m_aData.push_back(CollatorResourceData("normal", RESSTR(STR_SVT_COLLATE_NORMAL)));
- m_aData.push_back(CollatorResourceData("pinyin", RESSTR(STR_SVT_COLLATE_PINYIN)));
- m_aData.push_back(CollatorResourceData("radical", RESSTR(STR_SVT_COLLATE_RADICAL)));
- m_aData.push_back(CollatorResourceData("stroke", RESSTR(STR_SVT_COLLATE_STROKE)));
- m_aData.push_back(CollatorResourceData("unicode", RESSTR(STR_SVT_COLLATE_UNICODE)));
- m_aData.push_back(CollatorResourceData("zhuyin", RESSTR(STR_SVT_COLLATE_ZHUYIN)));
- m_aData.push_back(CollatorResourceData("phonebook", RESSTR(STR_SVT_COLLATE_PHONEBOOK)));
- m_aData.push_back(CollatorResourceData("phonetic (alphanumeric first)", RESSTR(STR_SVT_COLLATE_PHONETIC_F)));
- m_aData.push_back(CollatorResourceData("phonetic (alphanumeric last)", RESSTR(STR_SVT_COLLATE_PHONETIC_L)));
+ m_aData.push_back(CollatorResourceData("alphanumeric", SvtResId(STR_SVT_COLLATE_ALPHANUMERIC)));
+ m_aData.push_back(CollatorResourceData("charset", SvtResId(STR_SVT_COLLATE_CHARSET)));
+ m_aData.push_back(CollatorResourceData("dict", SvtResId(STR_SVT_COLLATE_DICTIONARY)));
+ m_aData.push_back(CollatorResourceData("normal", SvtResId(STR_SVT_COLLATE_NORMAL)));
+ m_aData.push_back(CollatorResourceData("pinyin", SvtResId(STR_SVT_COLLATE_PINYIN)));
+ m_aData.push_back(CollatorResourceData("radical", SvtResId(STR_SVT_COLLATE_RADICAL)));
+ m_aData.push_back(CollatorResourceData("stroke", SvtResId(STR_SVT_COLLATE_STROKE)));
+ m_aData.push_back(CollatorResourceData("unicode", SvtResId(STR_SVT_COLLATE_UNICODE)));
+ m_aData.push_back(CollatorResourceData("zhuyin", SvtResId(STR_SVT_COLLATE_ZHUYIN)));
+ m_aData.push_back(CollatorResourceData("phonebook", SvtResId(STR_SVT_COLLATE_PHONEBOOK)));
+ m_aData.push_back(CollatorResourceData("phonetic (alphanumeric first)", SvtResId(STR_SVT_COLLATE_PHONETIC_F)));
+ m_aData.push_back(CollatorResourceData("phonetic (alphanumeric last)", SvtResId(STR_SVT_COLLATE_PHONETIC_L)));
}
const OUString&
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index cbd2227cd21f..0291420b8a8d 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1075,14 +1075,14 @@ FontStyleBox::FontStyleBox(vcl::Window* pParent, WinBits nBits)
{
//Use the standard texts to get an optimal size and stick to that size.
//That should stop the character dialog dancing around.
- InsertEntry(SVT_RESSTR(STR_SVT_STYLE_LIGHT));
- InsertEntry(SVT_RESSTR(STR_SVT_STYLE_LIGHT_ITALIC));
- InsertEntry(SVT_RESSTR(STR_SVT_STYLE_NORMAL));
- InsertEntry(SVT_RESSTR(STR_SVT_STYLE_NORMAL_ITALIC));
- InsertEntry(SVT_RESSTR(STR_SVT_STYLE_BOLD));
- InsertEntry(SVT_RESSTR(STR_SVT_STYLE_BOLD_ITALIC));
- InsertEntry(SVT_RESSTR(STR_SVT_STYLE_BLACK));
- InsertEntry(SVT_RESSTR(STR_SVT_STYLE_BLACK_ITALIC));
+ InsertEntry(SvtResId(STR_SVT_STYLE_LIGHT));
+ InsertEntry(SvtResId(STR_SVT_STYLE_LIGHT_ITALIC));
+ InsertEntry(SvtResId(STR_SVT_STYLE_NORMAL));
+ InsertEntry(SvtResId(STR_SVT_STYLE_NORMAL_ITALIC));
+ InsertEntry(SvtResId(STR_SVT_STYLE_BOLD));
+ InsertEntry(SvtResId(STR_SVT_STYLE_BOLD_ITALIC));
+ InsertEntry(SvtResId(STR_SVT_STYLE_BLACK));
+ InsertEntry(SvtResId(STR_SVT_STYLE_BLACK_ITALIC));
aOptimalSize = GetOptimalSize();
Clear();
}
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 22bf7c16e561..0aeb07318966 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -341,14 +341,14 @@ FontList::FontList(OutputDevice* pDevice, OutputDevice* pDevice2)
mpSizeAry = nullptr;
// store style names
- maLight = SVT_RESSTR(STR_SVT_STYLE_LIGHT);
- maLightItalic = SVT_RESSTR(STR_SVT_STYLE_LIGHT_ITALIC);
- maNormal = SVT_RESSTR(STR_SVT_STYLE_NORMAL);
- maNormalItalic = SVT_RESSTR(STR_SVT_STYLE_NORMAL_ITALIC);
- maBold = SVT_RESSTR(STR_SVT_STYLE_BOLD);
- maBoldItalic = SVT_RESSTR(STR_SVT_STYLE_BOLD_ITALIC);
- maBlack = SVT_RESSTR(STR_SVT_STYLE_BLACK);
- maBlackItalic = SVT_RESSTR(STR_SVT_STYLE_BLACK_ITALIC);
+ maLight = SvtResId(STR_SVT_STYLE_LIGHT);
+ maLightItalic = SvtResId(STR_SVT_STYLE_LIGHT_ITALIC);
+ maNormal = SvtResId(STR_SVT_STYLE_NORMAL);
+ maNormalItalic = SvtResId(STR_SVT_STYLE_NORMAL_ITALIC);
+ maBold = SvtResId(STR_SVT_STYLE_BOLD);
+ maBoldItalic = SvtResId(STR_SVT_STYLE_BOLD_ITALIC);
+ maBlack = SvtResId(STR_SVT_STYLE_BLACK);
+ maBlackItalic = SvtResId(STR_SVT_STYLE_BLACK_ITALIC);
ImplInsertFonts(pDevice, true);
@@ -492,7 +492,7 @@ OUString FontList::GetFontMapText( const FontMetric& rInfo ) const
if ( !pData )
{
if (maMapNotAvailable.isEmpty())
- maMapNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_NOTAVAILABLE);
+ maMapNotAvailable = SvtResId(STR_SVT_FONTMAP_NOTAVAILABLE);
return maMapNotAvailable;
}
@@ -520,7 +520,7 @@ OUString FontList::GetFontMapText( const FontMetric& rInfo ) const
if ( !bNotSynthetic )
{
if (maMapStyleNotAvailable.isEmpty())
- const_cast<FontList*>(this)->maMapStyleNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_STYLENOTAVAILABLE);
+ const_cast<FontList*>(this)->maMapStyleNotAvailable = SvtResId(STR_SVT_FONTMAP_STYLENOTAVAILABLE);
return maMapStyleNotAvailable;
}
}
@@ -529,13 +529,13 @@ OUString FontList::GetFontMapText( const FontMetric& rInfo ) const
if ( nType == FontListFontNameType::PRINTER )
{
if (maMapPrinterOnly.isEmpty())
- const_cast<FontList*>(this)->maMapPrinterOnly = SVT_RESSTR(STR_SVT_FONTMAP_PRINTERONLY);
+ const_cast<FontList*>(this)->maMapPrinterOnly = SvtResId(STR_SVT_FONTMAP_PRINTERONLY);
return maMapPrinterOnly;
}
else
{
if (maMapBoth.isEmpty())
- const_cast<FontList*>(this)->maMapBoth = SVT_RESSTR(STR_SVT_FONTMAP_BOTH);
+ const_cast<FontList*>(this)->maMapBoth = SvtResId(STR_SVT_FONTMAP_BOTH);
return maMapBoth;
}
}
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index e0ccea2978bc..7fc74b545618 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -37,7 +37,7 @@ FileControl::FileControl( vcl::Window* pParent, WinBits nStyle ) :
Window( pParent, nStyle|WB_DIALOGCONTROL ),
maEdit( VclPtr<Edit>::Create(this, (nStyle&(~WB_BORDER))|WB_NOTABSTOP) ),
maButton( VclPtr<PushButton>::Create( this, (nStyle&(~WB_BORDER))|WB_NOLIGHTBORDER|WB_NOPOINTERFOCUS|WB_NOTABSTOP ) ),
- maButtonText( SVT_RESSTR(STR_FILECTRL_BUTTONTEXT) ),
+ maButtonText( SvtResId(STR_FILECTRL_BUTTONTEXT) ),
mnInternalFlags( FileControlMode_Internal::ORIGINALBUTTONTEXT )
{
maButton->SetClickHdl( LINK( this, FileControl, ButtonHdl ) );
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index 11e1acf2b3d3..cb8d5084de2b 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -25,18 +25,16 @@
// implementation of the indexentry-algorithm-name translation
IndexEntryResource::IndexEntryResource()
{
- #define RESSTR(rid) SvtResId(rid).toString()
-
- m_aData.push_back(IndexEntryResourceData("alphanumeric", RESSTR(STR_SVT_INDEXENTRY_ALPHANUMERIC)));
- m_aData.push_back(IndexEntryResourceData("dict", RESSTR(STR_SVT_INDEXENTRY_DICTIONARY)));
- m_aData.push_back(IndexEntryResourceData("pinyin", RESSTR(STR_SVT_INDEXENTRY_PINYIN)));
- m_aData.push_back(IndexEntryResourceData("radical", RESSTR(STR_SVT_INDEXENTRY_RADICAL)));
- m_aData.push_back(IndexEntryResourceData("stroke", RESSTR(STR_SVT_INDEXENTRY_STROKE)));
- m_aData.push_back(IndexEntryResourceData("zhuyin", RESSTR(STR_SVT_INDEXENTRY_ZHUYIN)));
- m_aData.push_back(IndexEntryResourceData("phonetic (alphanumeric first) (grouped by syllable)", RESSTR(STR_SVT_INDEXENTRY_PHONETIC_FS)));
- m_aData.push_back(IndexEntryResourceData("phonetic (alphanumeric first) (grouped by consonant)", RESSTR(STR_SVT_INDEXENTRY_PHONETIC_FC)));
- m_aData.push_back(IndexEntryResourceData("phonetic (alphanumeric last) (grouped by syllable)", RESSTR(STR_SVT_INDEXENTRY_PHONETIC_LS)));
- m_aData.push_back(IndexEntryResourceData("phonetic (alphanumeric last) (grouped by consonant)", RESSTR(STR_SVT_INDEXENTRY_PHONETIC_LC)));
+ m_aData.push_back(IndexEntryResourceData("alphanumeric", SvtResId(STR_SVT_INDEXENTRY_ALPHANUMERIC)));
+ m_aData.push_back(IndexEntryResourceData("dict", SvtResId(STR_SVT_INDEXENTRY_DICTIONARY)));
+ m_aData.push_back(IndexEntryResourceData("pinyin", SvtResId(STR_SVT_INDEXENTRY_PINYIN)));
+ m_aData.push_back(IndexEntryResourceData("radical", SvtResId(STR_SVT_INDEXENTRY_RADICAL)));
+ m_aData.push_back(IndexEntryResourceData("stroke", SvtResId(STR_SVT_INDEXENTRY_STROKE)));
+ m_aData.push_back(IndexEntryResourceData("zhuyin", SvtResId(STR_SVT_INDEXENTRY_ZHUYIN)));
+ m_aData.push_back(IndexEntryResourceData("phonetic (alphanumeric first) (grouped by syllable)", SvtResId(STR_SVT_INDEXENTRY_PHONETIC_FS)));
+ m_aData.push_back(IndexEntryResourceData("phonetic (alphanumeric first) (grouped by consonant)", SvtResId(STR_SVT_INDEXENTRY_PHONETIC_FC)));
+ m_aData.push_back(IndexEntryResourceData("phonetic (alphanumeric last) (grouped by syllable)", SvtResId(STR_SVT_INDEXENTRY_PHONETIC_LS)));
+ m_aData.push_back(IndexEntryResourceData("phonetic (alphanumeric last) (grouped by consonant)", SvtResId(STR_SVT_INDEXENTRY_PHONETIC_LC)));
}
const OUString& IndexEntryResource::GetTranslation(const OUString &r_Algorithm)
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index b459522cc7b3..62be41f9eede 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -560,16 +560,16 @@ void TabBar::ImplInit( WinBits nWinStyle )
ImplInitControls();
if (mpImpl->mpFirstButton)
- mpImpl->mpFirstButton->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVET0HOME));
+ mpImpl->mpFirstButton->SetAccessibleName(SvtResId(STR_TABBAR_PUSHBUTTON_MOVET0HOME));
if (mpImpl->mpPrevButton)
- mpImpl->mpPrevButton->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVELEFT));
+ mpImpl->mpPrevButton->SetAccessibleName(SvtResId(STR_TABBAR_PUSHBUTTON_MOVELEFT));
if (mpImpl->mpNextButton)
- mpImpl->mpNextButton->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVERIGHT));
+ mpImpl->mpNextButton->SetAccessibleName(SvtResId(STR_TABBAR_PUSHBUTTON_MOVERIGHT));
if (mpImpl->mpLastButton)
- mpImpl->mpLastButton->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVETOEND));
+ mpImpl->mpLastButton->SetAccessibleName(SvtResId(STR_TABBAR_PUSHBUTTON_MOVETOEND));
if (mpImpl->mpAddButton)
- mpImpl->mpAddButton->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_ADDTAB));
+ mpImpl->mpAddButton->SetAccessibleName(SvtResId(STR_TABBAR_PUSHBUTTON_ADDTAB));
SetSizePixel( Size( 100, CalcWindowSizePixel().Height() ) );
ImplInitSettings( true, true );
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 5c887e742b6a..c60df5fd7ed5 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -175,7 +175,7 @@ void PlaceEditDialog::InitDetails( )
unsigned int nPos = 0;
for ( sal_Int32 i = 0; i < aTypesUrlsList.getLength( ) && aTypesNamesList.getLength( ); ++i )
{
- OUString sUrl = aTypesUrlsList[i].replaceFirst("<host", "<" + SVT_RESSTR(STR_SVT_HOST)).replaceFirst("port>", SVT_RESSTR(STR_SVT_PORT) + ">");
+ OUString sUrl = aTypesUrlsList[i].replaceFirst("<host", "<" + SvtResId(STR_SVT_HOST)).replaceFirst("port>", SvtResId(STR_SVT_PORT) + ">");
if ((sUrl == GDRIVE_BASE_URL && bSkipGDrive) ||
(sUrl.startsWith( ALFRESCO_CLOUD_BASE_URL) && bSkipAlfresco) ||
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 414f3f434715..c79e3ab01978 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -485,7 +485,7 @@ void AssignmentPersistentData::ImplCommit()
AddressBookSourceDialog::AddressBookSourceDialog(vcl::Window* _pParent,
const Reference< XComponentContext >& _rxORB )
: ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui")
- , m_sNoFieldSelection(SVT_RESSTR(STR_NO_FIELD_SELECTION))
+ , m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION))
, m_xORB(_rxORB)
, m_pImpl( new AddressBookSourceDialogData )
{
@@ -497,7 +497,7 @@ void AssignmentPersistentData::ImplCommit()
const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName,
const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping )
: ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui")
- , m_sNoFieldSelection(SVT_RESSTR(STR_NO_FIELD_SELECTION))
+ , m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION))
, m_xORB(_rxORB)
, m_pImpl( new AddressBookSourceDialogData( _rxTransientDS, _rDataSourceName, _rTable, _rMapping ) )
{
@@ -537,37 +537,37 @@ void AssignmentPersistentData::ImplCommit()
// should be adjustable with a rather small effort.)
// initialize the strings for the field labels
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_FIRSTNAME ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_LASTNAME ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_COMPANY));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_DEPARTMENT ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_STREET ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ZIPCODE ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_CITY ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_STATE));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_COUNTRY ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_HOMETEL ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_WORKTEL ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_OFFICETEL));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_MOBILE));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_TELOTHER));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_PAGER));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_FAX ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_EMAIL ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_URL ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_TITLE ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_POSITION ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_INITIALS ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ADDRFORM ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_SALUTATION ));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ID));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_CALENDAR));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_INVITE));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_NOTE));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER1));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER2));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER3));
- m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER4));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_FIRSTNAME ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_LASTNAME ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_COMPANY));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_DEPARTMENT ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_STREET ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_ZIPCODE ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_CITY ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_STATE));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_COUNTRY ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_HOMETEL ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_WORKTEL ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_OFFICETEL));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_MOBILE));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_TELOTHER));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_PAGER));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_FAX ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_EMAIL ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_URL ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_TITLE ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_POSITION ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_INITIALS ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_ADDRFORM ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_SALUTATION ));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_ID));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_CALENDAR));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_INVITE));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_NOTE));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_USER1));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_USER2));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_USER3));
+ m_pImpl->aFieldLabels.push_back( SvtResId( STR_FIELD_USER4));
long nLabelWidth = 0;
long nListBoxWidth = m_pImpl->pFields[0]->approximate_char_width() * 20;
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 312a2cfb725e..50e81b579da3 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -174,7 +174,7 @@ void SvObjectServerList::FillInsertObjects()
#ifdef _WIN32
SvGlobalName aOleFact( SO3_OUT_CLASSID );
- OUString aOleObj( SVT_RESSTR( STR_FURTHER_OBJECT ) );
+ OUString aOleObj( SvtResId( STR_FURTHER_OBJECT ) );
aObjectServerList.push_back( SvObjectServer( aOleFact, aOleObj ) );
#endif
@@ -277,7 +277,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId )
}
if( nResId )
- aUIName = SVT_RESSTR( nResId );
+ aUIName = SvtResId( nResId );
else
aUIName = SotExchange::GetFormatName( nId );
@@ -334,7 +334,7 @@ bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, O
_rSource += pSrcOfCopy;
}
else
- _rSource = SVT_RESSTR(STR_UNKNOWN_SOURCE);
+ _rSource = SvtResId(STR_UNKNOWN_SOURCE);
}
bRet = true;
}
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 84d3283dc520..aa805f9e886c 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -129,7 +129,7 @@ static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddSt
static OUString ImplPrnDlgAddResString(const OUString& rStr, sal_uInt16 nResId)
{
- return ImplPrnDlgAddString(rStr, SVT_RESSTR(nResId));
+ return ImplPrnDlgAddString(rStr, SvtResId(nResId));
}
@@ -199,7 +199,7 @@ OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
sal_uLong nJobs = rInfo.GetJobs();
if ( nJobs && (nJobs != QUEUE_JOBS_DONTKNOW) )
{
- OUString aJobStr( SVT_RESSTR( STR_SVT_PRNDLG_JOBCOUNT ) );
+ OUString aJobStr( SvtResId( STR_SVT_PRNDLG_JOBCOUNT ) );
OUString aJobs( OUString::number( nJobs ) );
aStr = ImplPrnDlgAddString(aStr, aJobStr.replaceAll("%d", aJobs));
}
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 356988b4bc6f..5ccc4cdf60a1 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -129,7 +129,7 @@ namespace svt
SetEmptyViewMargin();
m_pImpl->pRoadmap.disposeAndReset( VclPtr<ORoadmap>::Create( this, WB_TABSTOP ) );
- m_pImpl->pRoadmap->SetText( SVT_RESSTR( STR_WIZDLG_ROADMAP_TITLE ) );
+ m_pImpl->pRoadmap->SetText( SvtResId( STR_WIZDLG_ROADMAP_TITLE ) );
m_pImpl->pRoadmap->SetPosPixel( Point( 0, 0 ) );
m_pImpl->pRoadmap->SetItemSelectHdl( LINK( this, RoadmapWizard, OnRoadmapItemSelected ) );
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 6edc96012d01..3a4f5a750531 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -136,7 +136,7 @@ namespace svt
m_pPrevPage = VclPtr<PushButton>::Create(this, WB_TABSTOP);
m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS );
m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pPrevPage->SetText(SVT_RESSTR(STR_WIZDLG_PREVIOUS));
+ m_pPrevPage->SetText(SvtResId(STR_WIZDLG_PREVIOUS));
m_pPrevPage->Show();
m_pPrevPage->set_id("previous");
@@ -154,7 +154,7 @@ namespace svt
m_pNextPage = VclPtr<PushButton>::Create(this, WB_TABSTOP);
m_pNextPage->SetHelpId( HID_WIZARD_NEXT );
m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pNextPage->SetText(OUString(SVT_RESSTR(STR_WIZDLG_NEXT)));
+ m_pNextPage->SetText(OUString(SvtResId(STR_WIZDLG_NEXT)));
m_pNextPage->Show();
m_pNextPage->set_id("next");
@@ -168,7 +168,7 @@ namespace svt
{
m_pFinish = VclPtr<OKButton>::Create(this, WB_TABSTOP);
m_pFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pFinish->SetText(SVT_RESSTR(STR_WIZDLG_FINISH));
+ m_pFinish->SetText(SvtResId(STR_WIZDLG_FINISH));
m_pFinish->Show();
m_pFinish->set_id("finish");
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 228d265f65ff..94ff492a9ab5 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -521,16 +521,16 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara,
, mxSourceDocument(rxSourceDocument)
, mpSbCompression(nullptr)
, mpNfCompression(nullptr)
- , msEstimatedSizePix1(SVT_RESSTR(STR_SVT_ESTIMATED_SIZE_PIX_1))
- , msEstimatedSizePix2(SVT_RESSTR(STR_SVT_ESTIMATED_SIZE_PIX_2))
- , msEstimatedSizeVec(SVT_RESSTR(STR_SVT_ESTIMATED_SIZE_VEC))
- , ms1BitTreshold(SVT_RESSTR(STR_SVT_1BIT_THRESHOLD))
- , ms1BitDithered(SVT_RESSTR(STR_SVT_1BIT_DITHERED))
- , ms4BitGrayscale(SVT_RESSTR(STR_SVT_4BIT_GRAYSCALE))
- , ms4BitColorPalette(SVT_RESSTR(STR_SVT_4BIT_COLOR_PALETTE))
- , ms8BitGrayscale(SVT_RESSTR(STR_SVT_8BIT_GRAYSCALE))
- , ms8BitColorPalette(SVT_RESSTR(STR_SVT_8BIT_COLOR_PALETTE))
- , ms24BitColor(SVT_RESSTR(STR_SVT_24BIT_TRUE_COLOR))
+ , msEstimatedSizePix1(SvtResId(STR_SVT_ESTIMATED_SIZE_PIX_1))
+ , msEstimatedSizePix2(SvtResId(STR_SVT_ESTIMATED_SIZE_PIX_2))
+ , msEstimatedSizeVec(SvtResId(STR_SVT_ESTIMATED_SIZE_VEC))
+ , ms1BitTreshold(SvtResId(STR_SVT_1BIT_THRESHOLD))
+ , ms1BitDithered(SvtResId(STR_SVT_1BIT_DITHERED))
+ , ms4BitGrayscale(SvtResId(STR_SVT_4BIT_GRAYSCALE))
+ , ms4BitColorPalette(SvtResId(STR_SVT_4BIT_COLOR_PALETTE))
+ , ms8BitGrayscale(SvtResId(STR_SVT_8BIT_GRAYSCALE))
+ , ms8BitColorPalette(SvtResId(STR_SVT_8BIT_COLOR_PALETTE))
+ , ms24BitColor(SvtResId(STR_SVT_24BIT_TRUE_COLOR))
, maExt(rPara.aFilterExt)
, mnFormat(FORMAT_UNKNOWN)
, mnMaxFilesizeForRealtimePreview(0)
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 7260958fdc91..e72d6e0564bd 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -449,7 +449,7 @@ static OUString GetDescriptionByFactory_Impl( const OUString& rFactory )
if ( nResId )
{
SolarMutexGuard aGuard;
- return SvtResId(nResId).toString();
+ return SvtResId(nResId);
}
return OUString();
}
@@ -750,7 +750,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
sDescription += "-";
}
SolarMutexGuard aGuard;
- sDescription += SvtResId(nResId).toString();
+ sDescription += SvtResId(nResId);
}
DBG_ASSERT( !sDescription.isEmpty(), "file without description" );
@@ -829,7 +829,7 @@ OUString SvFileInformationManager::GetFolderDescription( const svtools::VolumeIn
else if ( rInfo.m_bIsRemoveable || rInfo.m_bIsVolume )
nResId = STR_DESCRIPTION_LOCALE_VOLUME;
- return SvtResId(nResId).toString();
+ return SvtResId(nResId);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index bfbbad62bb23..49fb5bbd9826 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -130,8 +130,8 @@ const OUString ApplyLreOrRleEmbedding( const OUString &rText )
return aRes;
}
-SvtLanguageTableImpl::SvtLanguageTableImpl() :
- ResStringArray( SvtResId( STR_ARR_SVT_LANGUAGE_TABLE ) )
+SvtLanguageTableImpl::SvtLanguageTableImpl()
+ : ResStringArray(ResId(STR_ARR_SVT_LANGUAGE_TABLE, *SvtResMgr::GetResMgr()))
{
auto xNA = officecfg::VCL::ExtraLanguages::get();
uno::Sequence <OUString> rElementNames = xNA->getElementNames();
diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx
index 24906fd8eef5..59da66bcd51c 100644
--- a/svtools/source/misc/svtresid.cxx
+++ b/svtools/source/misc/svtresid.cxx
@@ -32,19 +32,14 @@ namespace
pMgr = ResMgr::CreateResMgr("svt", aLocale );
return pMgr;
}
-
- ResMgr* getResMgr()
- {
- return getResMgr(Application::GetSettings().GetUILanguageTag());
- }
}
-SvtResId::SvtResId(sal_uInt16 nId) :
- ResId(nId, *getResMgr())
+ResMgr* SvtResMgr::GetResMgr()
{
+ return getResMgr(Application::GetSettings().GetUILanguageTag());
}
-void SvtResId::DeleteResMgr()
+void SvtResMgr::DeleteResMgr()
{
DELETEZ( pMgr );
}