[Libreoffice-commits] core.git: cui/source
Caolán McNamara
caolanm at redhat.com
Thu May 18 08:28:25 UTC 2017
cui/source/customize/cfg.cxx | 20 +++++------
cui/source/customize/cfgutil.cxx | 14 +++----
cui/source/customize/macropg.cxx | 2 -
cui/source/dialogs/cuifmsearch.cxx | 2 -
cui/source/dialogs/cuigaldlg.cxx | 4 --
cui/source/dialogs/cuihyperdlg.cxx | 18 +++++-----
cui/source/dialogs/hangulhanjadlg.cxx | 6 +--
cui/source/dialogs/hldocntp.cxx | 4 +-
cui/source/dialogs/hlmarkwn.cxx | 4 +-
cui/source/dialogs/hltpbase.cxx | 10 ++---
cui/source/dialogs/insdlg.cxx | 2 -
cui/source/dialogs/insrc.cxx | 4 +-
cui/source/dialogs/scriptdlg.cxx | 20 +++++------
cui/source/dialogs/thesdlg.cxx | 2 -
cui/source/inc/dialmgr.hxx | 1
cui/source/options/optdict.cxx | 6 +--
cui/source/options/optjava.cxx | 2 -
cui/source/options/optpath.cxx | 30 -----------------
cui/source/options/personalization.cxx | 2 -
cui/source/tabpages/align.cxx | 6 +--
cui/source/tabpages/autocdlg.cxx | 58 ++++++++++++++++-----------------
cui/source/tabpages/border.cxx | 4 +-
cui/source/tabpages/connect.cxx | 2 -
cui/source/tabpages/grfpage.cxx | 2 -
cui/source/tabpages/measure.cxx | 2 -
cui/source/tabpages/page.cxx | 12 +++---
cui/source/tabpages/paragrph.cxx | 6 +--
27 files changed, 105 insertions(+), 140 deletions(-)
New commits:
commit cda860a8c99abfee6b37dda37351f0b45a7c9616
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 18 09:25:30 2017 +0100
can drop CUI_RESSTR now
Change-Id: I2e2319e661614dc8ba464479324b4719bcfa120e
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 3228f627e6ab..d01b948205b3 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2617,11 +2617,11 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void )
SvxConfigEntry* pMenuData = GetTopLevelSelection();
OUString aNewName( stripHotKey( pMenuData->GetName() ) );
- OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU );
- pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) );
+ pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_MENU ) );
if ( pNameDialog->Execute() == RET_OK ) {
pNameDialog->GetName( aNewName );
@@ -2661,11 +2661,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void )
static_cast<SvxConfigEntry*>(pActEntry->GetUserData());
OUString aNewName( stripHotKey( pEntry->GetName() ) );
- OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM );
- pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) );
+ pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_MENU ) );
if ( pNameDialog->Execute() == RET_OK ) {
pNameDialog->GetName(aNewName);
@@ -2743,11 +2743,11 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, AddSeparatorHdl, Button *, void )
IMPL_LINK_NOARG( SvxMenuConfigPage, AddSubmenuHdl, Button *, void )
{
OUString aNewName;
- OUString aDesc = CUI_RESSTR( RID_SVXSTR_SUBMENU_NAME );
+ OUString aDesc = CUI_RES( RID_SVXSTR_SUBMENU_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU );
- pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) );
+ pNameDialog->SetText( CUI_RES( RID_SVXSTR_ADD_SUBMENU ) );
if ( pNameDialog->Execute() == RET_OK )
{
@@ -3288,11 +3288,11 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void )
else if (sCommand == "modtoolrename")
{
OUString aNewName( stripHotKey( pToolbar->GetName() ) );
- OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR );
- pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
+ pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_TOOLBAR ) );
if ( pNameDialog->Execute() == RET_OK )
{
@@ -3327,11 +3327,11 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void )
static_cast<SvxConfigEntry*>(pActEntry->GetUserData());
OUString aNewName( stripHotKey( pEntry->GetName() ) );
- OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM );
- pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
+ pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_TOOLBAR ) );
if ( pNameDialog->Execute() == RET_OK ) {
pNameDialog->GetName(aNewName);
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 408c74331950..1d43a3182fac 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -388,11 +388,11 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
m_libImage(BitmapEx(RID_CUIBMP_LIB)),
m_macImage(BitmapEx(RID_CUIBMP_MACRO)),
m_docImage(BitmapEx(RID_CUIBMP_DOC)),
- m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)),
- m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
- m_sMacros(CUI_RESSTR(RID_SVXSTR_BASICMACROS)),
- m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
- m_aStrGroupStyles(CUI_RESSTR(RID_SVXSTR_GROUP_STYLES)),
+ m_sMyMacros(CUI_RES(RID_SVXSTR_MYMACROS)),
+ m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS)),
+ m_sMacros(CUI_RES(RID_SVXSTR_BASICMACROS)),
+ m_sDlgMacros(CUI_RES(RID_SVXSTR_PRODMACROS)),
+ m_aStrGroupStyles(CUI_RES(RID_SVXSTR_GROUP_STYLES)),
m_collapsedImage(BitmapEx(RID_CUIBMP_COLLAPSED)),
m_expandedImage(BitmapEx(RID_CUIBMP_EXPANDED))
{
@@ -1176,7 +1176,7 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog(
if (m_bShowSlots)
{
// If we are showing Slot API commands update labels in the UI
- SetText(CUI_RESSTR(RID_SVXSTR_SELECTOR_ADD_COMMANDS));
+ SetText(CUI_RES(RID_SVXSTR_SELECTOR_ADD_COMMANDS));
get(m_pCancelButton, "close");
get(m_pDialogDescription, "helptoolbar");
get(m_pOKButton, "add");
@@ -1306,7 +1306,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void )
void
SvxScriptSelectorDialog::SetRunLabel()
{
- m_pOKButton->SetText(CUI_RESSTR(RID_SVXSTR_SELECTOR_RUN));
+ m_pOKButton->SetText(CUI_RES(RID_SVXSTR_SELECTOR_RUN));
}
void
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 2d689be9a3ba..343fd5dabb10 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -530,7 +530,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
}
OUString eventURL = h_it->second.second;
- OUString displayName( CUI_RES( displayableEvent->nEventResourceID ) );
+ OUString displayName(CUI_RES(displayableEvent->nEventResourceID));
displayName += "\t";
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index f3a5e843d64d..01db8f5688e8 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -712,7 +712,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
break;
case FmSearchProgress::State::ProgressCounting:
- m_pftHint->SetText(CUI_RESSTR(RID_STR_SEARCH_COUNTING));
+ m_pftHint->SetText(CUI_RES(RID_STR_SEARCH_COUNTING));
m_pftHint->Invalidate();
m_pftRecord->SetText(OUString::number(pProgress->nCurrentRecord));
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 018f78b71719..ff298167227d 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -695,14 +695,12 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
m_pFiMSImage->SetImage(Image(BitmapEx(sId)));
}
-
bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
{
pData->aEditedTitle = m_pEdtMSName->GetText();
return true;
}
-
VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return VclPtr<TPGalleryThemeGeneral>::Create( pParent, *rSet );
@@ -949,7 +947,7 @@ void TPGalleryThemeProperties::FillFilterList()
#endif
pFilterEntry = new FilterEntry;
- pFilterEntry->aFilterName = CUI_RESSTR(RID_SVXSTR_GALLERY_ALLFILES);
+ pFilterEntry->aFilterName = CUI_RES(RID_SVXSTR_GALLERY_ALLFILES);
pFilterEntry->aFilterName = addExtension( pFilterEntry->aFilterName, aExtensions );
size_t pos = m_pCbbFileType->InsertEntry( pFilterEntry->aFilterName, 0 );
if ( pos < aFilterEntryList.size() ) {
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 8c023fde7861..9f9e01406f89 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -98,21 +98,21 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality);
aImage = Image(aBitmap);
}
- aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP );
+ aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLINETTP );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create );
- pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
- aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP );
+ pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
+ aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLMAILTP );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create );
- pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
- aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP );
+ pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
+ aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCTP );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
- pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
- aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP );
+ pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
+ aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCNTP );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
- pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
+ pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
// set OK/Cancel - button
- GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
+ GetCancelButton().SetText ( CUI_RES(RID_SVXSTR_HYPDLG_CLOSEBUT) );
// create itemset for tabpages
mpItemSet = new SfxItemSet( SfxGetpApp()->GetPool(), SID_HYPERLINK_GETLINK,
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 7cbc09cb18d6..cb959b327987 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -574,8 +574,8 @@ namespace svx
m_pSuggestions->set_height_request( m_pSuggestions->GetTextHeight() * 5 );
m_pSuggestions->set_width_request( m_pSuggestions->approximate_char_width() * 48 );
- const OUString sHangul(CUI_RESSTR(RID_SVXSTR_HANGUL));
- const OUString sHanja(CUI_RESSTR(RID_SVXSTR_HANJA));
+ const OUString sHangul(CUI_RES(RID_SVXSTR_HANGUL));
+ const OUString sHanja(CUI_RES(RID_SVXSTR_HANJA));
m_pHanjaAbove->init( sHangul, sHanja, PseudoRubyText::eAbove );
m_pHanjaBelow->init( sHangul, sHanja, PseudoRubyText::eBelow );
m_pHangulAbove->init( sHanja, sHangul, PseudoRubyText::eAbove );
@@ -1730,7 +1730,7 @@ namespace svx
HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict )
:ModalDialog ( _pParent, "HangulHanjaEditDictDialog", "cui/ui/hangulhanjaeditdictdialog.ui" )
- ,m_aEditHintText ( CUI_RESSTR(RID_SVXSTR_EDITHINT) )
+ ,m_aEditHintText ( CUI_RES(RID_SVXSTR_EDITHINT) )
,m_rDictList ( _rDictList )
,m_nCurrentDict ( 0xFFFFFFFF )
,m_pSuggestions ( nullptr )
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 2b4c4e533a6f..112c27359e82 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -275,7 +275,7 @@ bool SvxHyperlinkNewDocTp::AskApply()
bool bRet = ImplGetURLObject( m_pCbbPath->GetText(), m_pCbbPath->GetBaseURL(), aINetURLObject );
if ( !bRet )
{
- ScopedVclPtrInstance< WarningBox > aWarning( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
+ ScopedVclPtrInstance< WarningBox > aWarning( this, WB_OK, CUI_RES(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
aWarning->Execute();
}
return bRet;
@@ -323,7 +323,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
if( bOk )
{
- ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CUI_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
+ ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CUI_RES(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
bCreate = aWarning->Execute() == RET_YES;
}
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index ad50188d1db1..db14236bfa33 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -109,10 +109,10 @@ void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const ::tools:
switch (mpParentWnd->mnError)
{
case LERR_NOENTRIES :
- aStrMessage = CUI_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
+ aStrMessage = CUI_RES( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
break;
case LERR_DOCNOTOPEN :
- aStrMessage = CUI_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
+ aStrMessage = CUI_RES( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
break;
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 255c6759532d..bc4172da4c4b 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -246,8 +246,8 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( const SvxHyperlinkItem* pH
mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() );
// Form
- OUString aStrFormText = CUI_RESSTR( RID_SVXSTR_HYPERDLG_FROM_TEXT );
- OUString aStrFormButton = CUI_RESSTR( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
+ OUString aStrFormText = CUI_RES( RID_SVXSTR_HYPERDLG_FROM_TEXT );
+ OUString aStrFormButton = CUI_RES( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
if( pHyperlinkItem->GetInsertMode() & HLINK_HTMLMODE )
{
@@ -340,13 +340,13 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void)
SfxMacroTabPage *pMacroPage = static_cast<SfxMacroTabPage*>( aDlg->GetTabPage() );
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOverObject )
- pMacroPage->AddEvent( OUString( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT1) ),
+ pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT1) ),
SFX_EVENT_MOUSEOVER_OBJECT );
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseClickObject )
- pMacroPage->AddEvent( OUString( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT2) ),
+ pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT2) ),
SFX_EVENT_MOUSECLICK_OBJECT);
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOutObject )
- pMacroPage->AddEvent( OUString( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ),
+ pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT3) ),
SFX_EVENT_MOUSEOUT_OBJECT);
if ( bIsInputEnabled )
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index fe127421ac19..7f64b780fee7 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -637,7 +637,7 @@ IMPL_LINK_NOARG( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void)
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, OUString() );
// set the title
- aFileDlg.SetTitle(CUI_RESSTR(RID_SVXSTR_SELECT_FILE_IFRAME));
+ aFileDlg.SetTitle(CUI_RES(RID_SVXSTR_SELECT_FILE_IFRAME));
// show the dialog
if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index a6d6a4bd2304..4c907d34635f 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -34,8 +34,8 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& sHelpId )
: m_pDialog(VclPtr<ModalDialog>::Create(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui"))
- , aRow(CUI_RESSTR(RID_SVXSTR_ROW))
- , aCol(CUI_RESSTR(RID_SVXSTR_COL))
+ , aRow(CUI_RES(RID_SVXSTR_ROW))
+ , aCol(CUI_RES(RID_SVXSTR_COL))
, bColumn(bCol)
{
m_pDialog->get(m_pCountEdit, "insert_number");
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index ca8bd5d5c392..9b5b753c2e9a 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -82,8 +82,8 @@ SFTreeListBox::SFTreeListBox(vcl::Window* pParent)
, m_libImage(BitmapEx(RID_CUIBMP_LIB))
, m_macImage(BitmapEx(RID_CUIBMP_MACRO))
, m_docImage(BitmapEx(RID_CUIBMP_DOC))
- , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
- , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
+ , m_sMyMacros(CUI_RES(RID_SVXSTR_MYMACROS))
+ , m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS))
{
SetSelectionMode( SelectionMode::Single );
@@ -451,15 +451,15 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& la
: SfxModalDialog(pParent, "ScriptOrganizerDialog",
"cui/ui/scriptorganizer.ui")
, m_sLanguage(language)
- , m_delErrStr(CUI_RESSTR(RID_SVXSTR_DELFAILED))
- , m_delErrTitleStr(CUI_RESSTR(RID_SVXSTR_DELFAILED_TITLE))
+ , m_delErrStr(CUI_RES(RID_SVXSTR_DELFAILED))
+ , m_delErrTitleStr(CUI_RES(RID_SVXSTR_DELFAILED_TITLE))
, m_delQueryStr(CUI_RES(RID_SVXSTR_DELQUERY))
- , m_delQueryTitleStr(CUI_RESSTR(RID_SVXSTR_DELQUERY_TITLE))
- , m_createErrStr(CUI_RESSTR(RID_SVXSTR_CREATEFAILED))
- , m_createDupStr(CUI_RESSTR(RID_SVXSTR_CREATEFAILEDDUP))
- , m_createErrTitleStr(CUI_RESSTR(RID_SVXSTR_CREATEFAILED_TITLE))
- , m_renameErrStr(CUI_RESSTR(RID_SVXSTR_RENAMEFAILED))
- , m_renameErrTitleStr(CUI_RESSTR(RID_SVXSTR_RENAMEFAILED_TITLE))
+ , m_delQueryTitleStr(CUI_RES(RID_SVXSTR_DELQUERY_TITLE))
+ , m_createErrStr(CUI_RES(RID_SVXSTR_CREATEFAILED))
+ , m_createDupStr(CUI_RES(RID_SVXSTR_CREATEFAILEDDUP))
+ , m_createErrTitleStr(CUI_RES(RID_SVXSTR_CREATEFAILED_TITLE))
+ , m_renameErrStr(CUI_RES(RID_SVXSTR_RENAMEFAILED))
+ , m_renameErrTitleStr(CUI_RES(RID_SVXSTR_RENAMEFAILED_TITLE))
{
get(m_pScriptsBox, "scripts");
get(m_pRunButton, "run");
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 299176c7e131..f0ebda71297a 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -443,7 +443,7 @@ SvxThesaurusDialog::SvxThesaurusDialog(
const OUString &rWord,
LanguageType nLanguage)
: SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui")
- , m_aErrStr(CUI_RESSTR(RID_SVXSTR_ERR_TEXTNOTFOUND))
+ , m_aErrStr(CUI_RES(RID_SVXSTR_ERR_TEXTNOTFOUND))
, xThesaurus(nullptr)
, aLookUpText()
, nLookUpLanguage(LANGUAGE_NONE)
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index 059ff9446c62..07226a0063e3 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -25,7 +25,6 @@
#define CUI_MGR() (*CuiResMgr::GetResMgr())
#define CUI_RES(i) ResId(i,CUI_MGR())
-#define CUI_RESSTR(i) CUI_RES(i).toString()
class ResMgr;
struct CuiResMgr
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index f6896bdc5e16..b09975f0a9b9 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -153,7 +153,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
if ( bFound )
{
// duplicate names?
- ScopedVclPtrInstance<MessageDialog>(this, CUI_RESSTR(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute();
pNameEdit->GrabFocus();
return;
}
@@ -177,13 +177,11 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
catch(...)
{
xNewDic = nullptr;
-
// error: couldn't create new dictionary
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, OUString(),
this, RID_SVXERRCTX, &DIALOG_MGR() );
ErrorHandler::HandleError( *new StringErrorInfo(
ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
-
EndDialog();
}
@@ -219,7 +217,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
ModalDialog( pParent, "EditDictionaryDialog" ,"cui/ui/editdictionarydialog.ui" ),
- sModify (CUI_RESSTR(STR_MODIFY)),
+ sModify (CUI_RES(STR_MODIFY)),
nOld ( NOACTDICT ),
bFirstSelect (true),
bDoNothing (false),
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index bc261500f6fe..1213b3d10a69 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -810,7 +810,7 @@ void SvxJavaParameterDlg::EditParameter()
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ScopedVclPtrInstance< InputDialog > pParamEditDlg( CUI_RES( RID_SVXSTR_JAVA_START_PARAM ).toString(), this);
+ ScopedVclPtrInstance< InputDialog > pParamEditDlg(CUI_RES(RID_SVXSTR_JAVA_START_PARAM), this);
OUString editableClassPath = m_pAssignedList->GetSelectEntry();
pParamEditDlg->SetEntryText( editableClassPath );
pParamEditDlg->HideHelpBtn();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 34ac217eb4f9..af910b355f37 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -344,37 +344,9 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
aTabs[3] = aTabs[2] + nWidth2 + 12;
pPathBox->SetTabs(aTabs, MapUnit::MapPixel);
-#if 0
- String aUserData = GetUserData();
- if ( aUserData.Len() )
- {
- fprintf(stderr, "FOO\n");
-
- // restore column width
- rBar.SetItemSize( ITEMID_TYPE, aUserData.GetToken(0).ToInt32() );
- HeaderEndDrag_Impl( &rBar );
- // restore sort direction
- sal_Bool bUp = (sal_Bool)(sal_uInt16)aUserData.GetToken(1).ToInt32();
- HeaderBarItemBits nBits = rBar.GetItemBits(ITEMID_TYPE);
-
- if ( bUp )
- {
- nBits &= ~HeaderBarItemBits::UPARROW;
- nBits |= HeaderBarItemBits::DOWNARROW;
- }
- else
- {
- nBits &= ~HeaderBarItemBits::DOWNARROW;
- nBits |= HeaderBarItemBits::UPARROW;
- }
- rBar.SetItemBits( ITEMID_TYPE, nBits );
- HeaderSelect_Impl( &rBar );
- }
-#endif
PathSelect_Impl( nullptr );
}
-
void SvxPathTabPage::FillUserData()
{
HeaderBar &rBar = pPathBox->GetTheHeaderBar();
@@ -386,7 +358,6 @@ void SvxPathTabPage::FillUserData()
SetUserData( aUserData );
}
-
IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void)
{
sal_uInt16 nSelCount = 0;
@@ -407,7 +378,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void)
m_pStandardBtn->Enable( nSelCount > 0 && bEnable);
}
-
IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, Button*, void)
{
SvTreeListEntry* pEntry = pPathBox->FirstSelected();
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 13087f5e352a..b07433d5985c 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -209,7 +209,7 @@ IMPL_LINK( SelectPersonaDialog, SelectPersona, Button*, pButton, void )
// get the persona name from the setting variable to show in the progress.
sal_Int32 nNameIndex = m_aSelectedPersona.indexOf( ';' );
OUString aName = m_aSelectedPersona.copy( 0, nNameIndex );
- OUString aProgress = CUI_RESSTR( RID_SVXSTR_SELECTEDPERSONA ) + aName;
+ OUString aProgress = OUString(CUI_RES(RID_SVXSTR_SELECTEDPERSONA)) + aName;
SetProgress( aProgress );
}
break;
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index a4ee1d46facd..8a16acd0b546 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -212,9 +212,9 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor
// Asian vertical mode
m_pCbAsianMode->Show( SvtCJKOptions().IsVerticalTextEnabled() );
- m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
- m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
- m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
+ m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
+ m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
// This page needs ExchangeSupport.
SetExchangeSupport();
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b731fc6f35f8..96445f32a1b3 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -193,14 +193,14 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void)
OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", &rSet)
- , m_sInput(CUI_RESSTR(RID_SVXSTR_USE_REPLACE))
- , m_sDoubleCaps(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD))
- , m_sStartCap(CUI_RESSTR(RID_SVXSTR_CPTL_STT_SENT))
- , m_sBoldUnderline(CUI_RESSTR(RID_SVXSTR_BOLD_UNDER))
- , m_sURL(CUI_RESSTR(RID_SVXSTR_DETECT_URL))
- , m_sNoDblSpaces(CUI_RESSTR(RID_SVXSTR_NO_DBL_SPACES))
- , m_sDash(CUI_RESSTR(RID_SVXSTR_DASH))
- , m_sAccidentalCaps(CUI_RESSTR(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
+ , m_sInput(CUI_RES(RID_SVXSTR_USE_REPLACE))
+ , m_sDoubleCaps(CUI_RES(RID_SVXSTR_CPTL_STT_WORD))
+ , m_sStartCap(CUI_RES(RID_SVXSTR_CPTL_STT_SENT))
+ , m_sBoldUnderline(CUI_RES(RID_SVXSTR_BOLD_UNDER))
+ , m_sURL(CUI_RES(RID_SVXSTR_DETECT_URL))
+ , m_sNoDblSpaces(CUI_RES(RID_SVXSTR_NO_DBL_SPACES))
+ , m_sDash(CUI_RES(RID_SVXSTR_DASH))
+ , m_sAccidentalCaps(CUI_RES(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
{
get(m_pCheckLB, "checklist");
}
@@ -413,24 +413,24 @@ enum OfaAutoFmtOptions
OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", &rSet)
- , sDeleteEmptyPara(CUI_RESSTR(RID_SVXSTR_DEL_EMPTY_PARA))
- , sUseReplaceTbl(CUI_RESSTR(RID_SVXSTR_USE_REPLACE))
- , sCapitalStartWord(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD))
- , sCapitalStartSentence(CUI_RESSTR(RID_SVXSTR_CPTL_STT_SENT))
- , sUserStyle(CUI_RESSTR(RID_SVXSTR_USER_STYLE))
- , sBullet(CUI_RESSTR(RID_SVXSTR_BULLET))
- , sBoldUnder(CUI_RESSTR(RID_SVXSTR_BOLD_UNDER))
- , sNoDblSpaces(CUI_RESSTR(RID_SVXSTR_NO_DBL_SPACES))
- , sCorrectCapsLock(CUI_RESSTR(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
- , sDetectURL(CUI_RESSTR(RID_SVXSTR_DETECT_URL))
- , sDash(CUI_RESSTR(RID_SVXSTR_DASH))
- , sRightMargin(CUI_RESSTR(RID_SVXSTR_RIGHT_MARGIN))
- , sNum(CUI_RESSTR(RID_SVXSTR_NUM))
- , sBorder(CUI_RESSTR(RID_SVXSTR_BORDER))
- , sTable(CUI_RESSTR(RID_SVXSTR_CREATE_TABLE))
- , sReplaceTemplates(CUI_RESSTR(RID_SVXSTR_REPLACE_TEMPLATES))
- , sDelSpaceAtSttEnd(CUI_RESSTR(RID_SVXSTR_DEL_SPACES_AT_STT_END))
- , sDelSpaceBetweenLines(CUI_RESSTR(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES))
+ , sDeleteEmptyPara(CUI_RES(RID_SVXSTR_DEL_EMPTY_PARA))
+ , sUseReplaceTbl(CUI_RES(RID_SVXSTR_USE_REPLACE))
+ , sCapitalStartWord(CUI_RES(RID_SVXSTR_CPTL_STT_WORD))
+ , sCapitalStartSentence(CUI_RES(RID_SVXSTR_CPTL_STT_SENT))
+ , sUserStyle(CUI_RES(RID_SVXSTR_USER_STYLE))
+ , sBullet(CUI_RES(RID_SVXSTR_BULLET))
+ , sBoldUnder(CUI_RES(RID_SVXSTR_BOLD_UNDER))
+ , sNoDblSpaces(CUI_RES(RID_SVXSTR_NO_DBL_SPACES))
+ , sCorrectCapsLock(CUI_RES(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
+ , sDetectURL(CUI_RES(RID_SVXSTR_DETECT_URL))
+ , sDash(CUI_RES(RID_SVXSTR_DASH))
+ , sRightMargin(CUI_RES(RID_SVXSTR_RIGHT_MARGIN))
+ , sNum(CUI_RES(RID_SVXSTR_NUM))
+ , sBorder(CUI_RES(RID_SVXSTR_BORDER))
+ , sTable(CUI_RES(RID_SVXSTR_CREATE_TABLE))
+ , sReplaceTemplates(CUI_RES(RID_SVXSTR_REPLACE_TEMPLATES))
+ , sDelSpaceAtSttEnd(CUI_RES(RID_SVXSTR_DEL_SPACES_AT_STT_END))
+ , sDelSpaceBetweenLines(CUI_RES(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES))
, nPercent(50)
, pCheckButtonData(nullptr)
{
@@ -1812,8 +1812,8 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol)
OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet)
- , sNonBrkSpace(CUI_RESSTR(RID_SVXSTR_NON_BREAK_SPACE))
- , sOrdinal(CUI_RESSTR(RID_SVXSTR_ORDINAL))
+ , sNonBrkSpace(CUI_RES(RID_SVXSTR_NON_BREAK_SPACE))
+ , sOrdinal(CUI_RES(RID_SVXSTR_ORDINAL))
, pCheckButtonData(nullptr)
, cSglStartQuote(0)
, cSglEndQuote(0)
@@ -2060,7 +2060,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void )
ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true );
pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT,
LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne ));
- pMap->SetText(nMode < SGL_END ? CUI_RESSTR(RID_SVXSTR_STARTQUOTE) : CUI_RESSTR(RID_SVXSTR_ENDQUOTE) );
+ pMap->SetText(nMode < SGL_END ? CUI_RES(RID_SVXSTR_STARTQUOTE) : CUI_RES(RID_SVXSTR_ENDQUOTE) );
sal_UCS4 cDlg;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType();
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index a4fbb998f0a2..73c912d15d0a 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1014,7 +1014,7 @@ void SvxBorderTabPage::FillPresetVS()
{
m_pWndPresets->InsertItem( nVSIdx );
m_pWndPresets->SetItemImage(nVSIdx, Image(m_aBorderImgVec[nVSIdx-1]));
- m_pWndPresets->SetItemText( nVSIdx, CUI_RESSTR( GetPresetStringId( nVSIdx ) ) );
+ m_pWndPresets->SetItemText( nVSIdx, CUI_RES( GetPresetStringId( nVSIdx ) ) );
}
// show the control
@@ -1037,7 +1037,7 @@ void SvxBorderTabPage::FillShadowVS()
{
m_pWndShadows->InsertItem( nVSIdx );
m_pWndShadows->SetItemImage(nVSIdx, Image(m_aShadowImgVec[nVSIdx-1]));
- m_pWndShadows->SetItemText( nVSIdx, CUI_RESSTR( pnStrIds[ nVSIdx - 1 ] ) );
+ m_pWndShadows->SetItemText( nVSIdx, CUI_RES( pnStrIds[ nVSIdx - 1 ] ) );
}
// show the control
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index f1461118f82a..ed1d7e6dfecd 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -59,7 +59,7 @@ SvxConnectionDialog::SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet
_pPage->Construct();
SetTabPage( _pPage );
- SetText(CUI_RESSTR( RID_SVXSTR_CONNECTOR ));
+ SetText(CUI_RES( RID_SVXSTR_CONNECTOR ));
}
/*************************************************************************
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 6937157e1dab..9df84cd66d4e 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -708,7 +708,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
sal_Int32 ay = sal_Int32(floor((float)aOrigPixelSize.Height() /
((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
sTemp += " ";
- sTemp += CUI_RESSTR( RID_SVXSTR_PPI );
+ sTemp += CUI_RES( RID_SVXSTR_PPI );
OUString sPPI = OUString::number(ax);
if (abs(ax - ay) > 1) {
sPPI += OUStringLiteral1(0x00D7) + OUString::number(ay);
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index d355e4bd9228..e6466fb640c2 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -69,7 +69,7 @@ SvxMeasureDialog::SvxMeasureDialog( vcl::Window* pParent, const SfxItemSet& rInA
_pPage->Construct();
SetTabPage(_pPage );
- SetText(CUI_RESSTR(RID_SVXSTR_DIMENSION_LINE));
+ SetText(CUI_RES(RID_SVXSTR_DIMENSION_LINE));
}
/*************************************************************************
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 90cb36a24609..e0f701220d48 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -218,11 +218,11 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
// fill text flow listbox with valid entries
- m_pTextFlowBox->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_HORI ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_LTR_HORI ), SvxFrameDirection::Horizontal_LR_TB );
if( bCTL )
- m_pTextFlowBox->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
+ m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
// #109989# do not show vertical directions in Writer/Web
@@ -230,8 +230,8 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
{
if( bCJK )
{
- m_pTextFlowBox->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
- m_pTextFlowBox->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
+ m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
+ m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
}
}
@@ -484,7 +484,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
OUString aBinName;
if ( PAPERBIN_PRINTER_SETTINGS == nPaperBin )
- aBinName = EditResId::GetString( RID_SVXSTR_PAPERBIN_SETTINGS );
+ aBinName = EditResId(RID_SVXSTR_PAPERBIN_SETTINGS);
else
aBinName = mpDefPrinter->GetPaperBinName( (sal_uInt16)nPaperBin );
@@ -900,7 +900,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, Control&, void)
m_pPaperTrayBox->SetUpdateMode( false );
m_pPaperTrayBox->Clear();
sal_Int32 nEntryPos = m_pPaperTrayBox->InsertEntry(
- EditResId::GetString( RID_SVXSTR_PAPERBIN_SETTINGS ) );
+ EditResId( RID_SVXSTR_PAPERBIN_SETTINGS ) );
m_pPaperTrayBox->SetEntryData( nEntryPos,
reinterpret_cast<void*>((sal_uLong)PAPERBIN_PRINTER_SETTINGS) );
OUString aPaperBin( EditResId( RID_SVXSTR_PAPERBIN ) );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 3871af5d4635..fece2c82efe8 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1044,9 +1044,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet
m_pLastLineLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, LastLineHdl_Impl ) );
m_pTextDirectionLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, TextDirectionHdl_Impl ) );
- m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
- m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
- m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
+ m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
+ m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
setPreviewsToSamePlace(pParent, this);
}
More information about the Libreoffice-commits
mailing list