[Libreoffice-commits] core.git: sw/source

[Jian Hong Cheng]

 sw/source/filter/ww8/ww8par5.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit f9a3a8a41dc448d551405c53d17f67e9ad1928dc
Author: Jian Hong Cheng <chen...@apache.org>
Date:   Wed Aug 29 04:27:52 2012 +0000

    Fix issue #i120654: Number range variable filed shows in AOO
    
    * sw/source/filter/ww8/ww8par5.cxx
    MS Word Binary compatibility
    
    Patch by: Jane Kang,<kangjane2...@gmail.com>
    Found by: Yan Ji,<yanji...@gmail.com>
    Review by: Jian Hong Cheng,<chen...@apache.org>
    
    (cherry picked from commit 720fc77527377968a45631d1c6a711b4cae02d39)
    
    Change-Id: I428fadd46bbd5b57081e35dcbfd6bb0c10c08282

diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 8cfdeed..163f9b8 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1524,6 +1524,8 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, 
String& rStr )
 {
     String aSequenceName;
     String aBook;
+    bool bHidden    = false;
+    bool bFormat    = false;
     bool bCountOn   = true;
     String sStart;
     SvxExtNumType eNumFormat = SVX_NUM_ARABIC;
@@ -1541,9 +1543,12 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, 
String& rStr )
             break;
 
         case 'h':
+            if( !bFormat )
+                bHidden = true;             // Hidden-Flag aktivieren
             break;
 
         case '*':
+            bFormat = true;                 // Format-Flag aktivieren
             nRet = aReadParam.SkipToNextToken();
             if( -2 == nRet && !( 
aReadParam.GetResult().EqualsAscii("MERGEFORMAT") || 
aReadParam.GetResult().EqualsAscii("CHARFORMAT") ))
                 eNumFormat = GetNumTypeFromName( aReadParam.GetResult() );
@@ -1576,6 +1581,10 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, 
String& rStr )
                         SwSetExpFieldType( &rDoc, aSequenceName, 
nsSwGetSetExpType::GSE_SEQ ) );
     SwSetExpField aFld( pFT, aEmptyStr, eNumFormat );
 
+    //#i120654# Add bHidden for /h flag (/h: Hide the field result.)
+    if (bHidden)
+        aFld.SetSubType(aFld.GetSubType() | 
nsSwExtendedSubType::SUB_INVISIBLE);
+
     if (sStart.Len())
         aFld.SetFormula( ( aSequenceName += '=' ) += sStart );
     else if (!bCountOn)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits