[Libreoffice-commits] .: sc/source

[Cédric Bosdonnat]

 sc/source/ui/dbgui/pfiltdlg.cxx |    4 +---
 sc/source/ui/dbgui/tpsort.cxx   |   11 +++++------
 sc/source/ui/dbgui/tpsubt.cxx   |    6 ++----
 sc/source/ui/src/scstring.src   |    4 ++--
 4 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit bd465b57caf1bf5eba04c37a2095e902c8b4e4f9
Author: Bence Babati <b.baabsi at gmail.com>
Date:   Wed Aug 15 10:55:32 2012 +0200

    fix a linguistic issue on Calc UI
    
    Change-Id: I1d69be65e2d55f1de0a3d800cd920cc881e8a8ce

diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index b23df01..3245b4c 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -305,9 +305,7 @@ void ScPivotFilterDlg::FillFieldLists()
             {
                rtl::OUStringBuffer aBuf;
                 aBuf.append(aStrColumn);
-                aBuf.append(sal_Unicode(' '));
-                aBuf.append(ScColToAlpha(col));
-                aFieldName = aBuf.makeStringAndClear();
+                aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col ));
             }
             aLbField1.InsertEntry( aFieldName, i );
             aLbField2.InsertEntry( aFieldName, i );
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 9c235c6..7f586db 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -361,9 +361,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
                     {
                         rtl::OUStringBuffer aBuf;
                         aBuf.append(aStrColumn);
-                        aBuf.append(sal_Unicode(' '));
-                        aBuf.append(ScColToAlpha(col));
-                        aFieldName = aBuf.makeStringAndClear();
+                        aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col ));
                     }
                     nFieldArr.push_back( col );
 
@@ -385,10 +383,11 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
                     if ( !bHasHeader || aFieldName.isEmpty() )
                     {
                         rtl::OUStringBuffer aBuf;
+                        rtl::OUStringBuffer tempBuf;
+
                         aBuf.append(aStrRow);
-                        aBuf.append(sal_Unicode(' '));
-                        aBuf.append(row+1);
-                        aFieldName = aBuf.makeStringAndClear();
+                        tempBuf.append(row+1 );
+                        aFieldName = aBuf.makeStringAndClear().replaceAll("%1", tempBuf.makeStringAndClear());
                     }
                     nFieldArr.push_back( row );
 
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 510f348..ea24d6c 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -288,11 +288,9 @@ void ScTpSubTotalGroup::FillListBoxes()
             pDoc->GetString( col, nFirstRow, nTab, aFieldName );
             if ( aFieldName.isEmpty() )
             {
-                rtl::OUStringBuffer aBuf;
+               rtl::OUStringBuffer aBuf;
                 aBuf.append(aStrColumn);
-                aBuf.append(sal_Unicode(' '));
-                aBuf.append(ScColToAlpha(col));
-                aFieldName = aBuf.makeStringAndClear();
+                aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col ));
             }
             nFieldArr[i] = col;
             aLbGroup.InsertEntry( aFieldName, i+1 );
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 50335dc..05ea091 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -203,12 +203,12 @@ String SCSTR_NONAME
 
 String SCSTR_COLUMN
 {
-    Text [ en-US ] = "Column" ;
+    Text [ en-US ] = "Column %1" ;
 };
 
 String SCSTR_ROW
 {
-    Text [ en-US ] = "Row" ;
+    Text [ en-US ] = "Row %1" ;
 };
 
 String SCSTR_NEW