From eae2e87ba4de1ae59779cbfc56109aa6c27fbc17 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 7 Apr 2014 12:12:50 +0100 Subject: Resolves: fdo#51818 format word count numbers with locale rules Change-Id: Ia203a622ab2cd63d644895bb792b0569a61eb81a --- sw/source/ui/dialog/wordcountdialog.cxx | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index ff2e582ef461..7fe4ec61d77c 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -29,7 +29,9 @@ #include #include #include +#include #include +#include IMPL_LINK_NOARG(SwWordCountFloatDlg, CloseHdl) { @@ -48,23 +50,23 @@ SwWordCountFloatDlg::~SwWordCountFloatDlg() namespace { - void setValue(FixedText *pWidget, sal_uLong nValue) + void setValue(FixedText *pWidget, sal_uLong nValue, const LocaleDataWrapper& rLocaleData) { - OUString sValue(OUString::number(nValue)); - pWidget->SetText(sValue); + pWidget->SetText(rLocaleData.getNum(nValue, 0)); } } void SwWordCountFloatDlg::SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc) { - setValue(m_pCurrentWordFT, rCurrent.nWord); - setValue(m_pCurrentCharacterFT, rCurrent.nChar); - setValue(m_pCurrentCharacterExcludingSpacesFT, rCurrent.nCharExcludingSpaces); - setValue(m_pCurrentCjkcharsFT, rCurrent.nAsianWord); - setValue(m_pDocWordFT, rDoc.nWord); - setValue(m_pDocCharacterFT, rDoc.nChar); - setValue(m_pDocCharacterExcludingSpacesFT, rDoc.nCharExcludingSpaces); - setValue(m_pDocCjkcharsFT, rDoc.nAsianWord); + const LocaleDataWrapper& rLocaleData = GetSettings().GetUILocaleDataWrapper(); + setValue(m_pCurrentWordFT, rCurrent.nWord, rLocaleData); + setValue(m_pCurrentCharacterFT, rCurrent.nChar, rLocaleData); + setValue(m_pCurrentCharacterExcludingSpacesFT, rCurrent.nCharExcludingSpaces, rLocaleData); + setValue(m_pCurrentCjkcharsFT, rCurrent.nAsianWord, rLocaleData); + setValue(m_pDocWordFT, rDoc.nWord, rLocaleData); + setValue(m_pDocCharacterFT, rDoc.nChar, rLocaleData); + setValue(m_pDocCharacterExcludingSpacesFT, rDoc.nCharExcludingSpaces, rLocaleData); + setValue(m_pDocCjkcharsFT, rDoc.nAsianWord, rLocaleData); bool bShowCJK = (SvtCJKOptions().IsAnyEnabled() || rDoc.nAsianWord); bool bToggleCJK = m_pCurrentCjkcharsFT->IsVisible() != bShowCJK; -- cgit v1.2.3