diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 21:14:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-21 19:28:59 +0200 |
| commit | d666c2f87d56da1f4dd3d421665ac3078c447a17 (patch) | |
| tree | fb837b5b12955d94c06e1abdb0ccb09ceb901607 /cui/source/tabpages/page.cxx | |
| parent | d3ba63909740262e0cd64648e2eb00096b4626d2 (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 'cui/source/tabpages/page.cxx')
| -rw-r--r-- | cui/source/tabpages/page.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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 ); } } |