calc56: #i108385# make TEXT return text if text was passed, handling text formats that include a @ code

3 files changed, 62 insertions, 1 deletions

diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 598295797ea6..5492759d4d36 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -520,6 +520,15 @@ public:
                           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 String& sFormatString, const String& sPreviewString,
+                          String& sOutString, Color** ppColor,
+                          LanguageType eLnge = LANGUAGE_DONTKNOW );
+
     /** Test whether the format code string is already present in container
         @return
             NUMBERFORMAT_ENTRY_NOT_FOUND if not found, else the format index.
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index cb66a75558c2..7343a0a9c0e6 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1697,6 +1697,58 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
     return FALSE;
 }
 
+BOOL SvNumberFormatter::GetPreviewString( const String& sFormatString,
+                                          const String& sPreviewString,
+                                          String& sOutString,
+                                          Color** ppColor,
+                                          LanguageType eLnge )
+{
+    if (sFormatString.Len() == 0)               // no empty string
+        return FALSE;
+
+    xub_StrLen nCheckPos = STRING_NOTFOUND;
+    sal_uInt32 nKey;
+    if (eLnge == LANGUAGE_DONTKNOW)
+        eLnge = IniLnge;
+    ChangeIntl(eLnge);                          // switch if needed
+    eLnge = ActLnge;
+    String sTmpString = sFormatString;
+    SvNumberformat* p_Entry = new SvNumberformat( sTmpString,
+                                                  pFormatScanner,
+                                                  pStringScanner,
+                                                  nCheckPos,
+                                                  eLnge);
+    if (nCheckPos == 0)                          // String ok
+    {
+        String aNonConstPreview( sPreviewString);
+        // May have to create standard formats for this locale.
+        sal_uInt32 CLOffset = ImpGenerateCL(eLnge);
+        nKey = ImpIsEntry( p_Entry->GetFormatstring(), CLOffset, eLnge);
+        if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND)       // already present
+            GetOutputString( aNonConstPreview, nKey, sOutString, ppColor);
+        else
+        {
+            // If the format is valid but not a text format and does not
+            // include a text subformat, an empty string would result. Same as
+            // in SvNumberFormatter::GetOutputString()
+            if (p_Entry->IsTextFormat() || p_Entry->HasTextFormat())
+                p_Entry->GetOutputString( aNonConstPreview, sOutString, ppColor);
+            else
+            {
+                *ppColor = NULL;
+                sOutString = sPreviewString;
+            }
+        }
+        delete p_Entry;
+        return TRUE;
+    }
+    else
+    {
+        delete p_Entry;
+        return FALSE;
+    }
+}
+
 sal_uInt32 SvNumberFormatter::TestNewString(const String& sFormatString,
                                       LanguageType eLnge)
 {
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 2d0909c8782b..97f06171a4fc 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2057,7 +2057,7 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
             OutString = rScan.GetFalseString();
         return FALSE;
     }
-    if (eType & NUMBERFORMAT_TEXT && bStandard)
+    if (eType & NUMBERFORMAT_TEXT)
     {
         ImpGetOutputStandard(fNumber, OutString);
         return FALSE;