summaryrefslogtreecommitdiff
path: root/sw/source/ui/frmdlg
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/frmdlg')
-rw-r--r--sw/source/ui/frmdlg/column.cxx16
-rw-r--r--sw/source/ui/frmdlg/cption.cxx12
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx4
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx2
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
6 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 602227c588a3..61ffc364c731 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -447,19 +447,19 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)
switch( i )
{
case 0:
- aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM0 ) ;
+ aItemText = SwResId( STR_COLUMN_VALUESET_ITEM0 ) ;
break;
case 1:
- aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM1 ) ;
+ aItemText = SwResId( STR_COLUMN_VALUESET_ITEM1 ) ;
break;
case 2:
- aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM2 ) ;
+ aItemText = SwResId( STR_COLUMN_VALUESET_ITEM2 ) ;
break;
case 3:
- aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM3 );
+ aItemText = SwResId( STR_COLUMN_VALUESET_ITEM3 );
break;
default:
- aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM4 );
+ aItemText = SwResId( STR_COLUMN_VALUESET_ITEM4 );
break;
}
m_pDefaultVS->InsertItem( i + 1, aItemText, i );
@@ -497,7 +497,7 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)
m_pLineTypeDLB->SetSourceUnit( FUNIT_TWIP );
// Fill the line styles listbox
- m_pLineTypeDLB->SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) );
+ m_pLineTypeDLB->SetNone( SvxResId( RID_SVXSTR_NONE ) );
m_pLineTypeDLB->InsertEntry(
::editeng::SvxBorderLine::getWidthImpl(SvxBorderLineStyle::SOLID),
SvxBorderLineStyle::SOLID );
@@ -926,12 +926,12 @@ void SwColumnPage::SetLabels( sal_uInt16 nVis )
const OUString sLbl3(OUString::number( nVis + 3 ));
m_pLbl3->SetText(sLbl3.replaceAt(sLbl3.getLength()-1, 0, sLbl));
- const OUString sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH ) ;
+ const OUString sColumnWidth = SwResId( STR_ACCESS_COLUMN_WIDTH ) ;
m_aEd1.SetAccessibleName(sColumnWidth.replaceFirst("%1", sLbl1));
m_aEd2.SetAccessibleName(sColumnWidth.replaceFirst("%1", sLbl2));
m_aEd3.SetAccessibleName(sColumnWidth.replaceFirst("%1", sLbl3));
- const OUString sDist = SW_RESSTR( STR_ACCESS_PAGESETUP_SPACING ) ;
+ const OUString sDist = SwResId( STR_ACCESS_PAGESETUP_SPACING ) ;
m_aDistEd1.SetAccessibleName(
sDist.replaceFirst("%1", sLbl1).replaceFirst("%2", sLbl2));
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index d44ecc9e6624..5eae4234f373 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -94,7 +94,7 @@ OUString TextFilterAutoConvert::filter(const OUString &rText)
SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ),
- m_sNone( SW_RESSTR(SW_STR_NONE) ),
+ m_sNone( SwResId(SW_STR_NONE) ),
m_aTextFilter(m_sNone),
rView( rV ),
pMgr( new SwFieldMgr(rView.GetWrtShellPtr()) ),
@@ -234,14 +234,14 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
|| eType == SelectionType::DrawObject
|| eType == (SelectionType::DrawObject | SelectionType::Ornament))
{
- m_pPosBox->InsertEntry(SW_RESSTR(STR_CAPTION_ABOVE));
- m_pPosBox->InsertEntry(SW_RESSTR(STR_CAPTION_BELOW));
+ m_pPosBox->InsertEntry(SwResId(STR_CAPTION_ABOVE));
+ m_pPosBox->InsertEntry(SwResId(STR_CAPTION_BELOW));
}
else if(eType == SelectionType::Frame
|| eType == SelectionType::Text)
{
- m_pPosBox->InsertEntry(SW_RESSTR(STR_CAPTION_BEGINNING));
- m_pPosBox->InsertEntry(SW_RESSTR(STR_CAPTION_END ));
+ m_pPosBox->InsertEntry(SwResId(STR_CAPTION_BEGINNING));
+ m_pPosBox->InsertEntry(SwResId(STR_CAPTION_END ));
}
m_pPosBox->SelectEntryPos(1);
@@ -440,7 +440,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV
SwWrtShell &rSh = rView.GetWrtShell();
- const OUString sNone(SW_RESSTR(SW_STR_NONE));
+ const OUString sNone(SwResId(SW_STR_NONE));
m_pLbLevel->InsertEntry(sNone);
for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 3dab469a0cc1..96282d5fc67b 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -81,7 +81,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame* pViewFrame,
if(pStr)
{
- SetText(GetText() + SW_RESSTR(STR_COLL_HEADER) + *pStr + ")");
+ SetText(GetText() + SwResId(STR_COLL_HEADER) + *pStr + ")");
}
m_nStdId = AddTabPage("type", SwFramePage::Create, nullptr);
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 2c78119b8932..b26dd9916e82 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -955,9 +955,9 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
else
{
if ( m_bNew )
- SetText( SW_RESSTR(STR_OLE_INSERT));
+ SetText( SwResId(STR_OLE_INSERT));
else
- SetText( SW_RESSTR(STR_OLE_EDIT));
+ SetText( SwResId(STR_OLE_EDIT));
}
}
else
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 17a363d88911..ca2e467ff638 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -27,7 +27,7 @@ SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxSingleTabDialog(pParent, rSet)
{
- SetText(SW_RESSTR(STR_FRMUI_PATTERN));
+ SetText(SwResId(STR_FRMUI_PATTERN));
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND );
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 0b9e07793b0a..f0e95a46cd28 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -33,7 +33,7 @@ SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes n
SfxSingleTabDialog(pParent, rSet)
{
- SetText(SW_RESSTR(STR_FRMUI_BORDER));
+ SetText(SwResId(STR_FRMUI_BORDER));
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
generated by cgit (git 2.34.1) at 2024-07-25 02:55:25 +0000