Skip to content

C
core
Kaydet (Commit) 35d99caf authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Related: #i56998# use locale rules to format percentage 

Change-Id: I9d27359fe2c343593455eebf69bca6efdb7c5079
üst 28e68298
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
sw/Library_swui.mk
Dosyayı görüntüle @ 35d99caf
...@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,swui,\ ...@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,swui,\
cppuhelper \ cppuhelper \
editeng \ editeng \
i18nlangtag \ i18nlangtag \
i18nutil \
msfilter \ msfilter \
sal \ sal \
sfx \ sfx \
......
sw/source/ui/dbui/mmlayoutpage.cxx
Dosyayı görüntüle @ 35d99caf
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <mailmergehelper.hxx> #include <mailmergehelper.hxx>
#include <unotools.hxx> #include <unotools.hxx>
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <i18nutil/unicode.hxx>
#include <unotools/tempfile.hxx> #include <unotools/tempfile.hxx>
#include <uitool.hxx> #include <uitool.hxx>
#include <svx/dlgutil.hxx> #include <svx/dlgutil.hxx>
...@@ -51,6 +52,7 @@ ...@@ -51,6 +52,7 @@
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#include <shellio.hxx> #include <shellio.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <vcl/settings.hxx>
#include <unoprnms.hxx> #include <unoprnms.hxx>
#include <mmlayoutpage.hrc> #include <mmlayoutpage.hrc>
...@@ -126,9 +128,10 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : ...@@ -126,9 +128,10 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
m_pLeftMF->SetValue(m_pLeftMF->Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP); m_pLeftMF->SetValue(m_pLeftMF->Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP);
m_pTopMF->SetValue(m_pTopMF->Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP); m_pTopMF->SetValue(m_pTopMF->Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP);
m_pZoomLB->InsertEntry(OUString("50 %"), 1); const LanguageTag& rLang = Application::GetSettings().GetUILanguageTag();
m_pZoomLB->InsertEntry(OUString("75 %"), 2); m_pZoomLB->InsertEntry(unicode::formatPercent(50, rLang), 1);
m_pZoomLB->InsertEntry(OUString("100 %"), 3); m_pZoomLB->InsertEntry(unicode::formatPercent(75, rLang), 2);
m_pZoomLB->InsertEntry(unicode::formatPercent(100, rLang), 3);
m_pZoomLB->SelectEntryPos(0); //page size m_pZoomLB->SelectEntryPos(0); //page size
m_pZoomLB->SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl)); m_pZoomLB->SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment