migrate one GetOutputString variatn to OUString

that create some clutter on some of the caller, this will
be resolved as things progress to ward OUString only
This is done that way to be incremental and avoid creating too big patches

Change-Id: I4a881d85cc2ee1eb53bc0c0d0902838b1d3720a2

2 files changed, 5 insertions, 8 deletions

diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 4c7b949021dd..71e6bbabf6ab 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -490,13 +490,6 @@ public:
     /** Format a string according to a format index, return string and color.
         Formats only if the format code is of type text or the 4th subcode
         of a format code is specified, otherwise sOutString will be == "" */
-    void GetOutputString( String& sString, sal_uInt32 nFIndex,
-                          String& sOutString, Color** ppColor, bool bUseStarFormat = false );
-
-
-    /** Format a string according to a format index, return string and color.
-        Formats only if the format code is of type text or the 4th subcode
-        of a format code is specified, otherwise sOutString will be == "" */
     void GetOutputString( OUString& sString, sal_uInt32 nFIndex,
                           OUString& sOutString, Color** ppColor, bool bUseStarFormat = false );
 
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 5abec42b9c88..6e13b2ddf028 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -248,7 +248,7 @@ public:
     bool GetOutputString( double fNumber, sal_uInt16 nCharCount, String& rOutString ) const;
 
     bool GetOutputString( double fNumber, String& OutString, Color** ppColor );
-    bool GetOutputString( String& sString, String& OutString, Color** ppColor );
+    bool GetOutputString( OUString& sString, OUString& OutString, Color** ppColor );
 
     // True if type text
     bool IsTextFormat() const { return (eType & NUMBERFORMAT_TEXT) != 0; }
@@ -388,6 +388,10 @@ public:
         the width of character c for underscore formats */
     static xub_StrLen InsertBlanks( String& r, xub_StrLen nPos, sal_Unicode c );
 
+    /** Insert the number of blanks into the string that is needed to simulate
+        the width of character c for underscore formats */
+    static sal_Int32 InsertBlanks( OUStringBuffer& r, sal_Int32 nPos, sal_Unicode c );
+
     /// One of YMD,DMY,MDY if date format
     DateFormat GetDateOrder() const;