CWS-TOOLING: integrate CWS writerfilter32bugfixes01

2009-10-16 10:25:35 +0200 os  r276956 : warning fixed
2009-10-16 10:18:35 +0200 os  r276954 : using namespace std removed from headers
2009-10-16 10:18:19 +0200 os  r276953 : using namespace std removed from headers
2009-10-16 10:17:35 +0200 os  r276952 : using namespace std removed from headers
2009-10-14 12:14:16 +0200 cedricbosdo  r276890 : Fixed warnings
2009-10-09 08:36:35 +0200 cedricbosdo  r276796 : Rebased to OOO320_m1
2009-10-05 11:32:53 +0200 cedricbosdo  r276668 :  * Fixed namespace_preprocess for windows build
* Removed some unused variable
* Set a default value for GetCurrentToken
2009-09-07 13:05:30 +0200 os  r275892 : #i104155# support for empty URLs if called from writerfilter re-introduced
2009-09-04 14:36:14 +0200 cedricbosdo  r275803 : CWS-TOOLING: rebase CWS writerfilter32bugfixes01 to trunk@275331 (milestone: DEV300:m56)
2009-05-15 17:36:28 +0200 cedricbosdo  r271958 : Added file to test docx numbering import fixes
2009-05-15 17:28:27 +0200 cedricbosdo  r271955 : * Implemented a VML import basis.
* Fixed some docx numbering import bugs
* Implemented docx outline style import
2009-03-16 11:42:06 +0100 hbrinkm  r269515 : moved clog inside #ifdef
2009-03-13 18:30:14 +0100 cedricbosdo  r269493 : Fixed a dummy paragraph ending problem
2009-03-13 13:57:58 +0100 cedricbosdo  r269477 : Added the missing headers
2009-03-13 12:03:25 +0100 cedricbosdo  r269466 : Fixed i#93786 and i#100176
2009-03-12 11:39:10 +0100 cedricbosdo  r269377 : Fixed a crash in the redlines patch
2009-03-12 10:11:48 +0100 cedricbosdo  r269362 : Fixes for the docx import
2009-03-12 10:10:37 +0100 cedricbosdo  r269361 : docx import fixes for:
+ tables styles
+ pictures positionning
+ redlines
Started to implement the docx settings.xml import

1 files changed, 7 insertions, 1 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 106f20440031..63140b486472 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -137,6 +137,8 @@ void BorderHandler::sprm(Sprm & rSprm)
                 pProperties->resolve(*this);
             ConversionHelper::MakeBorderLine( m_nLineWidth,   m_nLineType, m_nLineColor,
                                    m_aBorderLines[rSprm.getId() - NS_ooxml::LN_CT_TblBorders_top], m_bOOXML );
+
+            m_aFilledLines[ rSprm.getId( ) - NS_ooxml::LN_CT_TblBorders_top] = true;
         }
         break;
         default:;
@@ -161,7 +163,11 @@ PropertyMapPtr  BorderHandler::getProperties()
     if( m_bOOXML || m_nCurrentBorderPosition )
     {
         for( sal_Int32 nProp = 0; nProp < BORDER_COUNT; ++nProp)
-            pPropertyMap->Insert( aPropNames[nProp], false, uno::makeAny( m_aBorderLines[nProp] ) );
+        {
+            if ( m_aFilledLines[nProp] ) {
+                pPropertyMap->Insert( aPropNames[nProp], false, uno::makeAny( m_aBorderLines[nProp] ) );
+            }
+        }
     }
     return pPropertyMap;
 }