summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorRobert Roth <robert.roth.off@gmail.com>2013-02-06 01:36:54 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-02-06 00:24:45 +0000
commit947041e1ab4de4723c537eebd37421d929836700 (patch)
tree7b71cb378ebd3813071c21c3f9a10ecc6d3d4a00 /sw
parentd8675086874694543e2bc1b32bee3407936a9132 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/app/app.src4
-rw-r--r--sw/source/ui/uiview/view2.cxx4
2 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4bf680123536..38f114febcf8 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 33266ad6f25f..f5aff2af3675 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));