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

[Xisco Fauli]

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

New commits:
commit bc2fe616febbaccb3cda16f66101d393e91232cd
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu May 16 01:38:17 2013 +0200

    Wae: unused variable
    
    Change-Id: I1025bb9766d6d6aad2d60467a72a15d3a3af97d4

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d852358..0d9a638 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3952,7 +3952,6 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
                     {
                         if (!lcl_HasExplicitLeft(pPlcxMan, bVer67))
                         {
-                            int tmp = pNumFmt->GetIndentAt();
                             aLR.SetTxtLeft(pNumFmt->GetIndentAt());
 
                             // If have not explicit left, set number format list tab position is doc default tab
commit b858429f2495fceb820de20815318cff8882ed78
Author: Lei De Bin <leidb at apache.org>
Date:   Wed Aug 29 04:44:52 2012 +0000

    Related:#119576# fix indent and spacing between bullets and text
    
    they are inconsistent with MS word
    
    Reported by: Yan Ji
    Patch by: Lei De Bin
    Review by: Chen Zuo Jun
    Conflicts:
    	sw/source/filter/ww8/ww8par6.cxx
    
    Change-Id: I48a6761a8e8fb1c052aa4f2a261aefb850d6c112

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 78733af..d852358 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3822,6 +3822,18 @@ void SwWW8ImplReader::Read_NoLineNumb(sal_uInt16 , const sal_uInt8* pData, short
     NewAttr( aLN );
 }
 
+bool lcl_HasExplicitLeft(const WW8PLCFMan *pPlcxMan, bool bVer67)
+{
+    WW8PLCFx_Cp_FKP *pPap = pPlcxMan ? pPlcxMan->GetPapPLCF() : 0;
+    if (pPap)
+    {
+        if (bVer67)
+            return pPap->HasSprm(17);
+        else
+            return (pPap->HasSprm(0x840F) || pPap->HasSprm(0x845E));
+    }
+    return false;
+}
 // Sprm 16, 17
 void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLen )
 {
@@ -3931,6 +3943,26 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
             }
 
             aLR.SetTxtFirstLineOfst(nPara);
+
+            if (!pAktColl)
+            {
+                if (const SwTxtNode* pNode = pPaM->GetNode()->GetTxtNode())
+                {
+                    if ( const SwNumFmt *pNumFmt = GetNumFmtFromTxtNode(*pNode) )
+                    {
+                        if (!lcl_HasExplicitLeft(pPlcxMan, bVer67))
+                        {
+                            int tmp = pNumFmt->GetIndentAt();
+                            aLR.SetTxtLeft(pNumFmt->GetIndentAt());
+
+                            // If have not explicit left, set number format list tab position is doc default tab
+                            const SvxTabStopItem *pDefaultStopItem = (const SvxTabStopItem *)rDoc.GetAttrPool().GetPoolDefaultItem(RES_PARATR_TABSTOP);
+                            if ( pDefaultStopItem &&  pDefaultStopItem->Count() > 0 )
+                                ((SwNumFmt*)(pNumFmt))->SetListtabPos( ((SvxTabStop&)(*pDefaultStopItem)[0]).GetTabPos() );
+                        }
+                    }
+                }
+            }
             if (pAktColl && nAktColl < vColl.size())
             {
                 vColl[nAktColl].bListReleventIndentSet = true;