[Libreoffice-commits] core.git: sw/source

[Robert Roth]

 sw/source/ui/app/app.src      |    4 ++--
 sw/source/ui/uiview/view2.cxx |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 947041e1ab4de4723c537eebd37421d929836700
Author: Robert Roth <robert.roth.off at gmail.com>
Date:   Wed Feb 6 01:36:54 2013 +0200

    Show character count with word count in writer statusbar, fdo#59962
    
    Change-Id: I65f9ce6bc9851c97e25aaf5b131a4b319f00fed0
    Reviewed-on: https://gerrit.libreoffice.org/2013
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4bf6801..38f114f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -594,12 +594,12 @@ String STR_OUTLINE_NUMBERING
 
 String STR_STATUSBAR_WORDCOUNT_NO_SELECTION
 {
-    Text [ en-US ] = "Words: $1";
+    Text [ en-US ] = "Words (characters): $1 ($2)";
 };
 
 String STR_STATUSBAR_WORDCOUNT
 {
-    Text [ en-US ] = "Words: $1 Selected: $2";
+    Text [ en-US ] = "Words (characters): $1 ($2) Selected: $3 ($4)";
 };
 
 String STR_CONVERT_TEXT_TABLE
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 33266ad..f5aff2a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1247,9 +1247,11 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                 const sal_uInt32 stringId = selectionStats.nWord? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION;
                 rtl::OUString wordCount(SW_RES(stringId));
                 wordCount = wordCount.replaceAll("$1", OUString::number(documentStats.nWord));
+                wordCount = wordCount.replaceAll("$2", OUString::number(documentStats.nChar));
                 if (selectionStats.nWord)
                 {
-                    wordCount = wordCount.replaceAll("$2", OUString::number(selectionStats.nWord));
+                    wordCount = wordCount.replaceAll("$3", OUString::number(selectionStats.nWord));
+                    wordCount = wordCount.replaceAll("$4", OUString::number(selectionStats.nChar));
                 }
                 rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT, wordCount));