summaryrefslogtreecommitdiff
path: root/svl/inc
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-11-25 13:48:51 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-11-27 23:00:04 -0600
commitfb4685458544670fba5f627d4572ea780f9f7785 (patch)
treedd4313bfc40c55f01b7a1e9a0a685a23037083aa /svl/inc
parent7796d003bd6e0c5b2e4325ea79b4ad022e8e5938 (diff)
more wrapper in zforlist to isolate String/OUString issues
Change-Id: I53e5e60f59739bdcedb6e7b13006850e0e5b22c0
Diffstat (limited to 'svl/inc')
-rw-r--r--svl/inc/svl/zforlist.hxx18
1 files changed, 13 insertions, 5 deletions
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 4558dc99bde6..c31499867483 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -494,7 +494,7 @@ 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( OUString& sString, sal_uInt32 nFIndex,
+ void GetOutputString( const OUString& sString, sal_uInt32 nFIndex,
OUString& sOutString, Color** ppColor, bool bUseStarFormat = false );
/** Format a number according to the standard default format matching
@@ -524,18 +524,26 @@ public:
/** Same as <method>GetPreviewString</method> but the format code string
may be either language/country eLnge or en_US english US */
+ bool GetPreviewStringGuess( const OUString& sFormatString, double fPreviewNumber,
+ OUString& sOutString, Color** ppColor,
+ LanguageType eLnge = LANGUAGE_DONTKNOW );
+
bool GetPreviewStringGuess( const String& sFormatString, double fPreviewNumber,
- String& sOutString, Color** ppColor,
- LanguageType eLnge = LANGUAGE_DONTKNOW );
+ String& sOutString, Color** ppColor,
+ LanguageType eLnge = LANGUAGE_DONTKNOW );
/** Format a string according to a format code string to be scanned.
@return
<FALSE/> if format code contains an error
<TRUE/> else, in which case the string and color are returned.
*/
+ bool GetPreviewString( const OUString& sFormatString, const OUString& sPreviewString,
+ OUString& sOutString, Color** ppColor,
+ LanguageType eLnge = LANGUAGE_DONTKNOW );
+
bool GetPreviewString( const String& sFormatString, const String& sPreviewString,
- String& sOutString, Color** ppColor,
- LanguageType eLnge = LANGUAGE_DONTKNOW );
+ String& sOutString, Color** ppColor,
+ LanguageType eLnge = LANGUAGE_DONTKNOW );
/** Test whether the format code string is already present in container
@return