summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r--cui/source/tabpages/align.cxx6
-rw-r--r--cui/source/tabpages/autocdlg.cxx58
-rw-r--r--cui/source/tabpages/backgrnd.cxx4
-rw-r--r--cui/source/tabpages/border.cxx6
-rw-r--r--cui/source/tabpages/chardlg.cxx10
-rw-r--r--cui/source/tabpages/connect.cxx2
-rw-r--r--cui/source/tabpages/grfpage.cxx2
-rw-r--r--cui/source/tabpages/measure.cxx4
-rw-r--r--cui/source/tabpages/numfmt.cxx2
-rw-r--r--cui/source/tabpages/numpages.cxx6
-rw-r--r--cui/source/tabpages/page.cxx8
-rw-r--r--cui/source/tabpages/paragrph.cxx6
-rw-r--r--cui/source/tabpages/tpbitmap.cxx2
-rw-r--r--cui/source/tabpages/tpcolor.cxx4
-rw-r--r--cui/source/tabpages/tpgradnt.cxx8
-rw-r--r--cui/source/tabpages/tphatch.cxx8
-rw-r--r--cui/source/tabpages/tpline.cxx10
-rw-r--r--cui/source/tabpages/tplnedef.cxx6
-rw-r--r--cui/source/tabpages/tplneend.cxx2
-rw-r--r--cui/source/tabpages/tppattern.cxx6
20 files changed, 80 insertions, 80 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 8a16acd0b546..2586a454f71e 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_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 );
+ m_pLbFrameDir->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pLbFrameDir->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
+ m_pLbFrameDir->InsertEntryValue( CuiResId( 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 96445f32a1b3..758859897bf9 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_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))
+ , m_sInput(CuiResId(RID_SVXSTR_USE_REPLACE))
+ , m_sDoubleCaps(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
+ , m_sStartCap(CuiResId(RID_SVXSTR_CPTL_STT_SENT))
+ , m_sBoldUnderline(CuiResId(RID_SVXSTR_BOLD_UNDER))
+ , m_sURL(CuiResId(RID_SVXSTR_DETECT_URL))
+ , m_sNoDblSpaces(CuiResId(RID_SVXSTR_NO_DBL_SPACES))
+ , m_sDash(CuiResId(RID_SVXSTR_DASH))
+ , m_sAccidentalCaps(CuiResId(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_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))
+ , sDeleteEmptyPara(CuiResId(RID_SVXSTR_DEL_EMPTY_PARA))
+ , sUseReplaceTbl(CuiResId(RID_SVXSTR_USE_REPLACE))
+ , sCapitalStartWord(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
+ , sCapitalStartSentence(CuiResId(RID_SVXSTR_CPTL_STT_SENT))
+ , sUserStyle(CuiResId(RID_SVXSTR_USER_STYLE))
+ , sBullet(CuiResId(RID_SVXSTR_BULLET))
+ , sBoldUnder(CuiResId(RID_SVXSTR_BOLD_UNDER))
+ , sNoDblSpaces(CuiResId(RID_SVXSTR_NO_DBL_SPACES))
+ , sCorrectCapsLock(CuiResId(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
+ , sDetectURL(CuiResId(RID_SVXSTR_DETECT_URL))
+ , sDash(CuiResId(RID_SVXSTR_DASH))
+ , sRightMargin(CuiResId(RID_SVXSTR_RIGHT_MARGIN))
+ , sNum(CuiResId(RID_SVXSTR_NUM))
+ , sBorder(CuiResId(RID_SVXSTR_BORDER))
+ , sTable(CuiResId(RID_SVXSTR_CREATE_TABLE))
+ , sReplaceTemplates(CuiResId(RID_SVXSTR_REPLACE_TEMPLATES))
+ , sDelSpaceAtSttEnd(CuiResId(RID_SVXSTR_DEL_SPACES_AT_STT_END))
+ , sDelSpaceBetweenLines(CuiResId(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_RES(RID_SVXSTR_NON_BREAK_SPACE))
- , sOrdinal(CUI_RES(RID_SVXSTR_ORDINAL))
+ , sNonBrkSpace(CuiResId(RID_SVXSTR_NON_BREAK_SPACE))
+ , sOrdinal(CuiResId(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_RES(RID_SVXSTR_STARTQUOTE) : CUI_RES(RID_SVXSTR_ENDQUOTE) );
+ pMap->SetText(nMode < SGL_END ? CuiResId(RID_SVXSTR_STARTQUOTE) : CuiResId(RID_SVXSTR_ENDQUOTE) );
sal_UCS4 cDlg;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType();
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 2f332aee4232..407550d2bf3f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -382,7 +382,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe
m_pBackgroundColorSet->SetSelectHdl( HDL(BackgroundColorHdl_Impl) );
m_pBackgroundColorSet->SetStyle(m_pBackgroundColorSet->GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD);
- m_pBackgroundColorSet->SetText(SVX_RESSTR(RID_SVXSTR_NOFILL));
+ m_pBackgroundColorSet->SetText(SvxResId(RID_SVXSTR_NOFILL));
}
SvxBackgroundTabPage::~SvxBackgroundTabPage()
@@ -1528,7 +1528,7 @@ void SvxBackgroundTabPage::PageCreated(const SfxAllItemSet& aSet)
}
if ( nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING )
{
- m_pBackGroundColorLabelFT->SetText(CUI_RES(RID_SVXSTR_CHARNAME_HIGHLIGHTING));
+ m_pBackGroundColorLabelFT->SetText(CuiResId(RID_SVXSTR_CHARNAME_HIGHLIGHTING));
bHighlighting = true;
}
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 73c912d15d0a..606e66309205 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_RES( GetPresetStringId( nVSIdx ) ) );
+ m_pWndPresets->SetItemText( nVSIdx, CuiResId( 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_RES( pnStrIds[ nVSIdx - 1 ] ) );
+ m_pWndShadows->SetItemText( nVSIdx, CuiResId( pnStrIds[ nVSIdx - 1 ] ) );
}
// show the control
@@ -1096,7 +1096,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
m_pLbLineStyle->SetSourceUnit( FUNIT_TWIP );
- m_pLbLineStyle->SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) );
+ m_pLbLineStyle->SetNone( SvxResId( RID_SVXSTR_NONE ) );
for (size_t i = 0, n = SAL_N_ELEMENTS(aLines); i < n; ++i)
{
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ae83f627e6f3..667e09955298 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -254,7 +254,7 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet
: SvxCharBasePage(pParent, "CharNamePage", "cui/ui/charnamepage.ui", rInSet)
, m_pImpl(new SvxCharNamePage_Impl)
{
- m_pImpl->m_aNoStyleText = CUI_RES( RID_SVXSTR_CHARNAME_NOSTYLE );
+ m_pImpl->m_aNoStyleText = CuiResId( RID_SVXSTR_CHARNAME_NOSTYLE );
SvtLanguageOptions aLanguageOptions;
bool bShowCJK = aLanguageOptions.IsCJKFontEnabled();
@@ -319,18 +319,18 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet
//In Windows the standard dialogs name font-name, font-style as
//Font, Style
#ifdef _WIN32
- OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FONT));
+ OUString sFontFamilyString(CuiResId(RID_SVXSTR_CHARNAME_FONT));
#else
- OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FAMILY));
+ OUString sFontFamilyString(CuiResId(RID_SVXSTR_CHARNAME_FAMILY));
#endif
m_pWestFontNameFT->SetText(sFontFamilyString);
m_pEastFontNameFT->SetText(sFontFamilyString);
m_pCTLFontNameFT->SetText(sFontFamilyString);
#ifdef MACOSX
- OUString sFontStyleString(CUI_RES(RID_SVXSTR_CHARNAME_TYPEFACE));
+ OUString sFontStyleString(CuiResId(RID_SVXSTR_CHARNAME_TYPEFACE));
#else
- OUString sFontStyleString(CUI_RES(RID_SVXSTR_CHARNAME_STYLE));
+ OUString sFontStyleString(CuiResId(RID_SVXSTR_CHARNAME_STYLE));
#endif
m_pWestFontStyleFT->SetText(sFontStyleString);
m_pEastFontStyleFT->SetText(sFontStyleString);
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index ed1d7e6dfecd..f4d566875385 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_RES( RID_SVXSTR_CONNECTOR ));
+ SetText(CuiResId( RID_SVXSTR_CONNECTOR ));
}
/*************************************************************************
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 9df84cd66d4e..b0e0325e8995 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_RES( RID_SVXSTR_PPI );
+ sTemp += CuiResId( 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 e6466fb640c2..8f90eac08a6d 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_RES(RID_SVXSTR_DIMENSION_LINE));
+ SetText(CuiResId(RID_SVXSTR_DIMENSION_LINE));
}
/*************************************************************************
@@ -804,7 +804,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
void SvxMeasurePage::FillUnitLB()
{
// fill ListBox with metrics
- SvxStringArray aMetricArr( SVX_RES( RID_SVXSTR_FIELDUNIT_TABLE ) );
+ SvxStringArray aMetricArr(ResId(RID_SVXSTR_FIELDUNIT_TABLE, DIALOG_MGR()));
sal_IntPtr nUnit = FUNIT_NONE;
OUString aStrMetric( m_pFtAutomatic->GetText());
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 6a48ae3316d1..8e7944d5c625 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -237,7 +237,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent,
, pNumItem(nullptr)
, pNumFmtShell(nullptr)
, nInitFormat(ULONG_MAX)
- , sAutomaticEntry(CUI_RES(RID_SVXSTR_AUTO_ENTRY))
+ , sAutomaticEntry(CuiResId(RID_SVXSTR_AUTO_ENTRY))
, pLastActivWindow(nullptr)
{
get(m_pFtCategory, "categoryft");
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e6d35cf4e517..0c3d313c8686 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -990,7 +990,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void)
{
sfx2::FileDialogHelper aFileDialog(0);
- aFileDialog.SetTitle(CUI_RES(RID_SVXSTR_ADD_IMAGE));
+ aFileDialog.SetTitle(CuiResId(RID_SVXSTR_ADD_IMAGE));
if ( aFileDialog.Execute() != ERRCODE_NONE )
return;
@@ -1178,7 +1178,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
// Fill ListBox with predefined / translated numbering types.
- ResStringArray aNames( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE ));
+ ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
sal_uInt32 nCount = aNames.Count();
for (sal_uInt32 i = 0; i < nCount; ++i)
{
@@ -1950,7 +1950,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void )
OUString aGrfName;
Size aSize;
bool bSucc(false);
- SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_SVXSTR_EDIT_GRAPHIC) );
+ SvxOpenGraphicDialog aGrfDlg( CuiResId(RID_SVXSTR_EDIT_GRAPHIC) );
if(MN_GALLERY_ENTRY <= nItemId )
{
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index e0f701220d48..16100cc46413 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_RES( RID_SVXSTR_PAGEDIR_LTR_HORI ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_LTR_HORI ), SvxFrameDirection::Horizontal_LR_TB );
if( bCTL )
- m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
+ m_pTextFlowBox->InsertEntryValue( CuiResId( 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_RES( RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
- m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
+ m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
+ m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
}
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index fece2c82efe8..986f433852e0 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_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 );
+ m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
+ m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
setPreviewsToSamePlace(pParent, this);
}
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 1bdbe8ac7752..d4f2513d8b98 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -557,7 +557,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void)
if( nPos != VALUESET_ITEM_NOTFOUND )
{
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_BITMAP ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_NEW_BITMAP ) );
OUString aName( m_pBitmapList->GetBitmap( nPos )->GetName() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 848e476313cd..232dc45e2f64 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -352,8 +352,8 @@ IMPL_LINK(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void)
IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, Button*, void)
{
- OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) );
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_COLOR ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_COLOR ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_COLOR ) );
OUString aName;
long j = 1;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index c82d4bf4b5f7..f7f2de67e2ae 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -187,7 +187,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& rSet )
// determining (and possibly cutting) the name and
// displaying it in the GroupBox
- OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+ OUString aString( CuiResId( RID_SVXSTR_TABLE ) );
aString += ": ";
INetURLObject aURL( m_pGradientList->GetPath() );
@@ -360,8 +360,8 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl )
IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
{
- OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_GRADIENT ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_GRADIENT ) );
OUString aName;
long nCount = m_pGradientList->Count();
@@ -501,7 +501,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void
if ( nPos != VALUESET_ITEM_NOTFOUND )
{
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_GRADIENT ) );
OUString aName( m_pGradientList->GetGradient( nPos )->GetName() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 377400f56ce7..42e7c6e39231 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -174,7 +174,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
// determining (possibly cutting) the name
// and displaying it in the GroupBox
- OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+ OUString aString( CuiResId( RID_SVXSTR_TABLE ) );
aString += ": ";
INetURLObject aURL( m_pHatchingList->GetPath() );
@@ -431,8 +431,8 @@ void SvxHatchTabPage::ChangeHatchHdl_Impl()
IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
{
- OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_HATCH ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_HATCH ) );
OUString aName;
long nCount = m_pHatchingList->Count();
@@ -563,7 +563,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void )
if( nPos != VALUESET_ITEM_NOTFOUND )
{
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_HATCH ) );
OUString aName( m_pHatchingList->GetHatch( nPos )->GetName() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 437cda7f6cd6..52830e93919f 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -463,7 +463,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
break;
default:
{
- SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_SVXSTR_EDIT_GRAPHIC));
+ SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC));
aGrfDlg.EnableLink(false);
aGrfDlg.AsLink(false);
if( !aGrfDlg.Execute() )
@@ -525,7 +525,7 @@ void SvxLineTabPage::FillListboxes()
m_pLbLineStyle->SelectEntryPos( nOldSelect );
// Line end style
- OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
+ OUString sNone( SvxResId( RID_SVXSTR_NONE ) );
nOldSelect = m_pLbStartStyle->GetSelectEntryPos();
m_pLbStartStyle->Clear();
m_pLbStartStyle->InsertEntry( sNone );
@@ -562,8 +562,8 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
nPos = m_pLbLineStyle->GetSelectEntryPos();
m_pLbLineStyle->Clear();
- m_pLbLineStyle->InsertEntry( SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
- m_pLbLineStyle->InsertEntry( SVX_RESSTR( RID_SVXSTR_SOLID ) );
+ m_pLbLineStyle->InsertEntry( SvxResId( RID_SVXSTR_INVISIBLE ) );
+ m_pLbLineStyle->InsertEntry( SvxResId( RID_SVXSTR_SOLID ) );
m_pLbLineStyle->Fill( m_pDashList );
nCount = m_pLbLineStyle->GetEntryCount();
@@ -589,7 +589,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
*m_pnLineEndListState = ChangeType::NONE;
nPos = m_pLbLineStyle->GetSelectEntryPos();
- OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
+ OUString sNone( SvxResId( RID_SVXSTR_NONE ) );
m_pLbStartStyle->Clear();
m_pLbStartStyle->InsertEntry( sNone );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 1708ed4bf7d3..12aaf3c9c964 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -203,7 +203,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
// determining (and possibly cutting) the name
// and displaying it in the GroupBox
-// OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+// OUString aString( CuiResId( RID_SVXSTR_TABLE ) );
// aString += ": ";
INetURLObject aURL( pDashList->GetPath() );
@@ -244,7 +244,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
ScopedVclPtrInstance<SvxMessDialog> aMessDlg( GetParentDialog(),
- SVX_RESSTR( RID_SVXSTR_LINESTYLE ),
+ SvxResId( RID_SVXSTR_LINESTYLE ),
OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialog creation failed!");
@@ -534,7 +534,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void)
{
ResMgr& rMgr = CUI_MGR();
- OUString aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_LINESTYLE ) );
OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
OUString aName;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 2eaac554ff91..924a9895dc70 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
SdrObject::Free( pConvPolyObj );
ResMgr& rMgr = CUI_MGR();
- OUString aNewName( SVX_RES( RID_SVXSTR_LINEEND ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_LINEEND ) );
OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
OUString aName;
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 5bed8420105b..df6a58249fec 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -176,7 +176,7 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& rSet )
// determining (possibly cutting) the name and
// displaying it in the GroupBox
- OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+ OUString aString( CuiResId( RID_SVXSTR_TABLE ) );
aString += ": ";
INetURLObject aURL( m_pPatternList->GetPath() );
@@ -350,8 +350,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void)
IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void)
{
- OUString aNewName( SVX_RES( RID_SVXSTR_PATTERN_UNTITLED ) );
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_PATTERN ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_PATTERN_UNTITLED ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_NEW_PATTERN ) );
OUString aName;
long nCount = m_pPatternList->Count();
generated by cgit (git 2.34.1) at 2024-07-10 20:43:32 +0000