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

[Jian Fang Zhang]

 sw/source/core/unocore/unotext.cxx           |   12 +++++++++---
 sw/source/filter/ww8/ww8par6.cxx             |    6 +++---
 writerfilter/source/dmapper/DomainMapper.cxx |    6 ------
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 8943478b8d34216d3f2d64dfccd48d181d1a0f91
Author: Jian Fang Zhang <zhangjf at apache.org>
Date:   Tue Sep 11 11:44:52 2012 +0000

    Related #i120832#, the style and color set on table text by user...
    
    should have higher priority than that from table style
    
    Found by: Jinlong Wu,wujinlong at gmail.com
    Patch by: bjcheny,companycy at gmail.com
    Review by: zhangjf
    
    (cherry picked from commit fe7e723a727f6def90ee80ef2964a40546b37a90)
    
    Conflicts:
    	writerfilter/source/dmapper/DomainMapper.cxx
    
    Change-Id: I3f4c96d49de40b21cc3da9bcb5e588a270434cd8

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 00c6e85..aadcb08 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2165,9 +2165,15 @@ lcl_ApplyCellProperties(
                     xCellText->createTextCursor();
                 xCellCurs->gotoStart( sal_False );
                 xCellCurs->gotoEnd( sal_True );
-                const uno::Reference< beans::XPropertySet > xCellTextProps(
-                        xCellCurs, uno::UNO_QUERY);
-                xCellTextProps->setPropertyValue(rName, rValue);
+                const uno::Reference< beans::XPropertyState >
+                    xCellTextPropState(xCellCurs, uno::UNO_QUERY);
+                const beans::PropertyState state = xCellTextPropState->getPropertyState(rName);
+                if (state == beans::PropertyState_DEFAULT_VALUE)
+                {
+                    const uno::Reference< beans::XPropertySet >
+                        xCellTextProps(xCellCurs, uno::UNO_QUERY);
+                    xCellTextProps->setPropertyValue(rName, rValue);
+                }
             }
         }
     }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 0d9a638..c33eec1 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1396,8 +1396,8 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray,
                          : (pbrc[WW8_RIGHT].aBits2[ 1 ] & 0x20 ) )
                 && (pSizeArray && pSizeArray[WW8_RIGHT])
                 );
-    if (bRet)
-    {
+    //if (bRet)
+    //{
         rShadow.SetColor(Color(COL_BLACK));
         short nVal = pSizeArray[WW8_RIGHT];
         if (nVal < 0x10)
@@ -1405,7 +1405,7 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray,
         rShadow.SetWidth(nVal);
         rShadow.SetLocation(SVX_SHADOW_BOTTOMRIGHT);
         bRet = true;
-    }
+    //}
     return bRet;
 }
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 10a018a..5612434 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3547,12 +3547,6 @@ void DomainMapper::PopListProperties()
 void DomainMapper::lcl_startCharacterGroup()
 {
     m_pImpl->PushProperties(CONTEXT_CHARACTER);
-    DomainMapperTableManager& rTableManager = m_pImpl->getTableManager();
-    if( !rTableManager.getTableStyleName().isEmpty() )
-    {
-        PropertyMapPtr pTopContext = m_pImpl->GetTopContext();
-        rTableManager.CopyTextProperties(pTopContext, m_pImpl->GetStyleSheetTable());
-    }
 }
 
 void DomainMapper::lcl_endCharacterGroup()