diff options
| author | Dobra Gabor <dobragab@gmail.com> | 2015-04-02 14:48:41 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-04-10 12:30:20 +0000 |
| commit | 4d000e85633c8e97e73bfc68a128dd7bea31223f (patch) | |
| tree | 796906d7224eeb7f8f30b3f6b94b9f7b4a2a2a23 /sc | |
| parent | 2819ee71da631116662401f14f8a0fb78c2a7f3a (diff) | |
tdf#89641 Page numbering in Calc and Draw/Impress
Change-Id: I5ce2f528ae4a243ea8402c787b5c77cf75052d2e
Format: "Slide 2 / 3" changed to "Slide 2 of 3 (1)".
Reviewed-on: https://gerrit.libreoffice.org/14806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/globstr.hrc | 4 | ||||
| -rw-r--r-- | sc/source/ui/src/globstr.src | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/cellsh.cxx | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 9ef50d511db8..07896d451d3c 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -698,7 +698,9 @@ #define STR_UNQUOTED_STRING 533 #define STR_ENTER_VALUE 534 -#define SC_GLOBSTR_STR_COUNT 535 /**< the count of permanently resident strings */ +#define STR_TABLE_COUNT 535 + +#define SC_GLOBSTR_STR_COUNT 536 /**< the count of permanently resident strings */ #endif diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index 40b6b93ee716..318ec1d9daf4 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -2089,6 +2089,10 @@ Resource RID_GLOBSTR { Text[ en-US ] = "Enter a value!"; }; + String STR_TABLE_COUNT + { + Text [ en-US ] = "Sheet %1 of %2"; + }; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 6078b6cf0f60..c0eac46a29ba 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -678,11 +678,12 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_STATUS_DOCPOS: { - OUString aStr = ScGlobal::GetRscString( STR_TABLE ) + - " " + OUString::number( nTab + 1 ) + - " / " + OUString::number( nTabCount ); - rSet.Put( SfxStringItem( nWhich, aStr ) ); - } + OUString aStr = ScGlobal::GetRscString( STR_TABLE_COUNT ); + + aStr = aStr.replaceFirst("%1", OUString::number( nTab + 1 ) ); + aStr = aStr.replaceFirst("%2", OUString::number( nTabCount ) ); + + rSet.Put( SfxStringItem( nWhich, aStr ) ); } break; case SID_ROWCOL_SELCOUNT: |