[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Tue Jun 29 08:08:35 PDT 2010


 patches/dev300/apply                       |    2 
 patches/dev300/docx-fixes02.diff           |   75 ++++++-------------
 patches/dev300/oox-chart-export-part1.diff |  112 +++++++++++++++++++----------
 3 files changed, 102 insertions(+), 87 deletions(-)

New commits:
commit 8a927248152a4df3d95bab11fef97f97e96dc360
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Jun 29 17:07:14 2010 +0200

    Moved docx-fixes02.diff outsite OOXMLExport321 section
    
    Did that to have that patch applied when applying OOXMLExportDevel
    section as well.
    
    * patches/dev300/apply:
    * patches/dev300/docx-fixes02.diff:
    * patches/dev300/oox-chart-export-part1.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7379064..1686bb9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3615,10 +3615,10 @@ gnome-screen-saver.diff, i#106372, cmc
 
 [ OOXMLExport ]
 oox-pptx-export-update-to-ooo320.diff, rodo
+docx-fixes02.diff, n#581604, cbosdo
 
 [ OOXMLExport321 and not OOXMLExportDevel ]
 oox-chart-export-part1.diff, Fong
-docx-fixes02.diff, n#581604, cbosdo
 
 [ kFreeBSD < ooo320-m16 ]
 cws-kfreebsdport01v2-m15.diff, rengelha
diff --git a/patches/dev300/docx-fixes02.diff b/patches/dev300/docx-fixes02.diff
index 2142632..271606d 100644
--- a/patches/dev300/docx-fixes02.diff
+++ b/patches/dev300/docx-fixes02.diff
@@ -1,24 +1,3 @@
-Misc docx fixes
-
-From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
-
-
----
-
- sax/source/tools/fastserializer.cxx          |   45 +++
- sax/source/tools/fastserializer.hxx          |    7 
- sw/source/filter/ww8/attributeoutputbase.hxx |    5 
- sw/source/filter/ww8/docxattributeoutput.cxx |  404 +++++++++++++++++++++++---
- sw/source/filter/ww8/docxattributeoutput.hxx |    8 -
- sw/source/filter/ww8/makefile.mk             |    1 
- sw/source/filter/ww8/wrtw8nds.cxx            |   88 +-----
- sw/source/filter/ww8/wrtw8sty.cxx            |   15 +
- sw/source/filter/ww8/wrtww8.hxx              |   69 ++++
- sw/source/filter/ww8/ww8atr.cxx              |   25 --
- sw/source/filter/ww8/ww8attributeoutput.hxx  |    5 
- 11 files changed, 525 insertions(+), 147 deletions(-)
-
-
 diff --git sax/source/tools/fastserializer.cxx sax/source/tools/fastserializer.cxx
 index b270d15..95c1621 100644
 --- sax/source/tools/fastserializer.cxx
@@ -138,7 +117,7 @@ index c005746..1ec45f6 100644
      /// End of a style in the styles table.
      virtual void EndStyle() = 0;
 diff --git sw/source/filter/ww8/docxattributeoutput.cxx sw/source/filter/ww8/docxattributeoutput.cxx
-index ce74da7..cc4dfca 100644
+index 2e1daeb..db40c20 100644
 --- sw/source/filter/ww8/docxattributeoutput.cxx
 +++ sw/source/filter/ww8/docxattributeoutput.cxx
 @@ -31,6 +31,13 @@
@@ -155,7 +134,7 @@ index ce74da7..cc4dfca 100644
  
  #include <oox/core/tokens.hxx>
  #include <oox/export/drawingml.hxx>
-@@ -213,6 +220,25 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
+@@ -207,6 +214,25 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
      FinishTableRowCell( pTextNodeInfoInner );
  
      m_bParagraphOpened = false;
@@ -181,7 +160,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph )
-@@ -292,6 +318,14 @@ void DocxAttributeOutput::InitCollectedParagraphProperties()
+@@ -286,6 +312,14 @@ void DocxAttributeOutput::InitCollectedParagraphProperties()
  
  void DocxAttributeOutput::WriteCollectedParagraphProperties()
  {
@@ -196,7 +175,7 @@ index ce74da7..cc4dfca 100644
      if ( m_pSpacingAttrList )
      {
          XFastAttributeListRef xAttrList( m_pSpacingAttrList );
-@@ -755,11 +789,69 @@ void DocxAttributeOutput::RawText( const String& /*rText*/, bool /*bForceUnicode
+@@ -749,11 +783,69 @@ void DocxAttributeOutput::RawText( const String& /*rText*/, bool /*bForceUnicode
  #endif
  }
  
@@ -267,7 +246,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::EndRuby()
-@@ -767,6 +859,9 @@ void DocxAttributeOutput::EndRuby()
+@@ -761,6 +853,9 @@ void DocxAttributeOutput::EndRuby()
  #if OSL_DEBUG_LEVEL > 0
      fprintf( stderr, "TODO DocxAttributeOutput::EndRuby()\n" );
  #endif
@@ -277,8 +256,8 @@ index ce74da7..cc4dfca 100644
  }
  
  bool DocxAttributeOutput::AnalyzeURL( const String& rUrl, const String& rTarget, String* pLinkURL, String* pMark )
-@@ -1810,6 +1905,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
-                     WriteOLE2Obj( pSdrObj, rFrame.GetLayoutSize() );
+@@ -1708,6 +1803,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
+                 }
              }
              break;
 +        case sw::Frame::eTxtBox:
@@ -290,7 +269,7 @@ index ce74da7..cc4dfca 100644
          default:
  #if OSL_DEBUG_LEVEL > 0
              fprintf( stderr, "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& rNdTopLeft ) - frame type '%s'\n",
-@@ -1824,7 +1925,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
+@@ -1722,7 +1823,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
  }
  
  void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
@@ -299,7 +278,7 @@ index ce74da7..cc4dfca 100644
  {
      OString aStyle( "style" );
  
-@@ -1847,6 +1948,9 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
+@@ -1745,6 +1846,9 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
      m_pSerializer->singleElementNS( XML_w, XML_next,
              FSNS( XML_w, XML_val ), ( aStyle + OString::valueOf( sal_Int32( nNext ) ) ).getStr(),
              FSEND );
@@ -309,7 +288,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::EndStyle()
-@@ -2364,11 +2468,43 @@ void DocxAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
+@@ -2262,11 +2366,43 @@ void DocxAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
      }
  }
  
@@ -358,7 +337,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::CharFont( const SvxFontItem& rFont)
-@@ -2400,7 +2536,7 @@ void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
+@@ -2298,7 +2434,7 @@ void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
  void DocxAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
  {
      OString aKerning = OString::valueOf( ( sal_Int32 ) rKerning.GetValue() );
@@ -367,7 +346,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
-@@ -2653,11 +2789,12 @@ void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
+@@ -2551,11 +2687,12 @@ void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
      m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
  }
  
@@ -384,7 +363,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::RefField( const SwField&  rFld, const String& rRef )
-@@ -3071,9 +3208,22 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
+@@ -2969,9 +3106,22 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
  {
      if ( m_rExport.bOutFlyFrmAttrs )
      {
@@ -410,7 +389,7 @@ index ce74da7..cc4dfca 100644
      }
      else if ( m_rExport.bOutPageDescs ) 
      {
-@@ -3103,9 +3253,12 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
+@@ -3001,9 +3151,12 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
  {
      if ( m_rExport.bOutFlyFrmAttrs )
      {
@@ -426,7 +405,7 @@ index ce74da7..cc4dfca 100644
      }
      else if ( m_rExport.bOutPageDescs ) 
      {
-@@ -3146,11 +3299,17 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
+@@ -3044,11 +3197,17 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
  
  void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
  {
@@ -445,7 +424,7 @@ index ce74da7..cc4dfca 100644
      } 
      else if (m_rExport.bOutPageDescs )
      {
-@@ -3192,32 +3351,150 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
+@@ -3090,32 +3249,150 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
      }
  }
  
@@ -611,7 +590,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
-@@ -3229,10 +3506,6 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
+@@ -3127,10 +3404,6 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
                  FSNS( XML_w, XML_fill ), sColor.getStr( ),
                  FSEND );
      }
@@ -622,7 +601,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
-@@ -3315,11 +3588,52 @@ void DocxAttributeOutput::FormatKeep( const SvxFmtKeepItem& )
+@@ -3213,11 +3486,52 @@ void DocxAttributeOutput::FormatKeep( const SvxFmtKeepItem& )
      m_pSerializer->singleElementNS( XML_w, XML_keepNext, FSEND );
  }
  
@@ -679,7 +658,7 @@ index ce74da7..cc4dfca 100644
  }
  
  void DocxAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering )
-@@ -3377,6 +3691,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
+@@ -3275,6 +3589,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
        m_pCharLangAttrList( NULL ),
        m_pSpacingAttrList( NULL ),
        m_pHyperlinkAttrList( NULL ),
@@ -687,7 +666,7 @@ index ce74da7..cc4dfca 100644
        m_pFootnotesList( new ::docx::FootnotesList() ),
        m_pEndnotesList( new ::docx::FootnotesList() ),
        m_pSectionInfo( NULL ),
-@@ -3389,7 +3704,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
+@@ -3287,7 +3602,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
        m_bTableCellOpen( false ),
        m_nTableDepth( 0 ),
        m_bParagraphOpened( false ),
@@ -697,7 +676,7 @@ index ce74da7..cc4dfca 100644
  {
  }
  
-@@ -3400,11 +3716,13 @@ DocxAttributeOutput::~DocxAttributeOutput()
+@@ -3298,11 +3614,13 @@ DocxAttributeOutput::~DocxAttributeOutput()
      delete m_pCharLangAttrList, m_pCharLangAttrList = NULL;
      delete m_pSpacingAttrList, m_pSpacingAttrList = NULL;
      delete m_pHyperlinkAttrList, m_pHyperlinkAttrList = NULL;
@@ -712,10 +691,10 @@ index ce74da7..cc4dfca 100644
  
  MSWordExportBase& DocxAttributeOutput::GetExport()
 diff --git sw/source/filter/ww8/docxattributeoutput.hxx sw/source/filter/ww8/docxattributeoutput.hxx
-index 64d8217..3f2b143 100644
+index 446a2fe..52d991a 100644
 --- sw/source/filter/ww8/docxattributeoutput.hxx
 +++ sw/source/filter/ww8/docxattributeoutput.hxx
-@@ -103,7 +103,7 @@ public:
+@@ -102,7 +102,7 @@ public:
      virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );
  
      /// Output ruby start.
@@ -724,7 +703,7 @@ index 64d8217..3f2b143 100644
  
      /// Output ruby end.
      virtual void EndRuby();
-@@ -174,7 +174,8 @@ public:
+@@ -173,7 +173,8 @@ public:
  
      /// Start of a style in the styles table.
      virtual void StartStyle( const String& rName, bool bPapFmt,
@@ -734,7 +713,7 @@ index 64d8217..3f2b143 100644
  
      /// End of a style in the styles table.
      virtual void EndStyle();
-@@ -541,6 +542,7 @@ private:
+@@ -539,6 +540,7 @@ private:
      ::sax_fastparser::FastAttributeList *m_pCharLangAttrList;
      ::sax_fastparser::FastAttributeList *m_pSpacingAttrList;
      ::sax_fastparser::FastAttributeList *m_pHyperlinkAttrList;
@@ -742,7 +721,7 @@ index 64d8217..3f2b143 100644
  
      ::docx::FootnotesList *m_pFootnotesList;
      ::docx::FootnotesList *m_pEndnotesList;
-@@ -583,6 +585,8 @@ private:
+@@ -581,6 +583,8 @@ private:
      // beginning of the next paragraph
      DocxColBreakStatus m_nColBreakStatus;
  
@@ -1015,7 +994,7 @@ index 8e9ba8c..fe2e7f0 100644
  class MSWordStyles
  {
 diff --git sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
-index 6c321e9..58cf073 100644
+index 7159041..70bac42 100644
 --- sw/source/filter/ww8/ww8atr.cxx
 +++ sw/source/filter/ww8/ww8atr.cxx
 @@ -3758,25 +3758,12 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
diff --git a/patches/dev300/oox-chart-export-part1.diff b/patches/dev300/oox-chart-export-part1.diff
index 5bc72b8..7a63e8f 100644
--- a/patches/dev300/oox-chart-export-part1.diff
+++ b/patches/dev300/oox-chart-export-part1.diff
@@ -1,3 +1,39 @@
+Patch for the charts export in docx
+
+From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
+
+
+---
+
+ oox/inc/oox/export/chartexport.hxx           |  216 ++
+ oox/inc/oox/export/drawingml.hxx             |   20 
+ oox/inc/oox/export/shapes.hxx                |    4 
+ oox/source/export/ColorPropertySet.cxx       |  233 ++
+ oox/source/export/ColorPropertySet.hxx       |  129 +
+ oox/source/export/SchXMLSeriesHelper.cxx     |  302 +++
+ oox/source/export/SchXMLSeriesHelper.hxx     |   83 +
+ oox/source/export/chartexport.cxx            | 2849 ++++++++++++++++++++++++++
+ oox/source/export/drawingml.cxx              |   76 +
+ oox/source/export/makefile.mk                |    3 
+ oox/source/export/shapes.cxx                 |   72 -
+ sc/source/filter/xlsx/xcl97rec.hxx           |    2 
+ sc/source/filter/xlsx/xeescher.hxx           |    7 
+ sc/source/filter/xlsx/xlsx-xcl97rec.cxx      |   17 
+ sc/source/filter/xlsx/xlsx-xeescher.cxx      |  125 +
+ sd/source/filter/pptx/pptx-epptooxml.cxx     |    2 
+ sw/source/filter/ww8/docxattributeoutput.cxx |   88 +
+ sw/source/filter/ww8/docxattributeoutput.hxx |    2 
+ sw/source/filter/ww8/docxexport.cxx          |   29 
+ sw/source/filter/ww8/docxexport.hxx          |    7 
+ 20 files changed, 4205 insertions(+), 61 deletions(-)
+ create mode 100644 oox/inc/oox/export/chartexport.hxx
+ create mode 100644 oox/source/export/ColorPropertySet.cxx
+ create mode 100644 oox/source/export/ColorPropertySet.hxx
+ create mode 100644 oox/source/export/SchXMLSeriesHelper.cxx
+ create mode 100644 oox/source/export/SchXMLSeriesHelper.hxx
+ create mode 100644 oox/source/export/chartexport.cxx
+
+
 diff --git oox/inc/oox/export/chartexport.hxx oox/inc/oox/export/chartexport.hxx
 new file mode 100644
 index 0000000..ddf738f
@@ -285,10 +321,10 @@ index 211c90e..ebde89e 100644
  
  }
 diff --git oox/inc/oox/export/shapes.hxx oox/inc/oox/export/shapes.hxx
-index be9676e..9abc1c2 100644
+index 6fcde2c..840437c 100644
 --- oox/inc/oox/export/shapes.hxx
 +++ oox/inc/oox/export/shapes.hxx
-@@ -105,8 +105,6 @@ public:
+@@ -102,8 +102,6 @@ public:
      virtual ShapeExport&
                          WriteEllipseShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
      virtual ShapeExport&
@@ -297,7 +333,7 @@ index be9676e..9abc1c2 100644
                          WriteGraphicObjectShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
      virtual ShapeExport&
                          WriteLineShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
-@@ -162,6 +160,8 @@ public:
+@@ -159,6 +157,8 @@ public:
      virtual ShapeExport&
                          WriteTextShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
      virtual ShapeExport&
@@ -3933,10 +3969,10 @@ index 0000000..dc82c0b
 +}// oox
 +
 diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
-index 77bcdf4..5971665 100644
+index 761040d..60e9685 100644
 --- oox/source/export/drawingml.cxx
 +++ oox/source/export/drawingml.cxx
-@@ -54,6 +54,8 @@
+@@ -51,6 +51,8 @@
  #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
  #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
  #include <com/sun/star/drawing/XShape.hpp>
@@ -3945,7 +3981,7 @@ index 77bcdf4..5971665 100644
  #include <com/sun/star/i18n/ScriptType.hpp>
  #include <com/sun/star/io/XOutputStream.hpp>
  #include <com/sun/star/style/LineSpacing.hpp>
-@@ -651,9 +653,9 @@ void DrawingML::WriteStretch()
+@@ -648,9 +650,9 @@ void DrawingML::WriteStretch()
  }
  
  void DrawingML::WriteTransformation( const Rectangle& rRect,
@@ -3957,7 +3993,7 @@ index 77bcdf4..5971665 100644
                            XML_flipH, bFlipH ? "1" : NULL,
                            XML_flipV, bFlipV ? "1" : NULL,
                            XML_rot, nRotation ? I32S( nRotation ) : NULL,
-@@ -662,20 +664,20 @@ void DrawingML::WriteTransformation( const Rectangle& rRect,
+@@ -659,20 +661,20 @@ void DrawingML::WriteTransformation( const Rectangle& rRect,
      mpFS->singleElementNS( XML_a, XML_off, XML_x, IS( MM100toEMU( rRect.Left() ) ), XML_y, IS( MM100toEMU( rRect.Top() ) ), FSEND );
      mpFS->singleElementNS( XML_a, XML_ext, XML_cx, IS( MM100toEMU( rRect.GetWidth() ) ), XML_cy, IS( MM100toEMU( rRect.GetHeight() ) ), FSEND );
  
@@ -3982,7 +4018,7 @@ index 77bcdf4..5971665 100644
  {
      Reference< XPropertySet > rXPropSet( rRun, UNO_QUERY );
      Reference< XPropertyState > rXPropState( rRun, UNO_QUERY );
-@@ -955,7 +957,8 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
+@@ -952,7 +954,8 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
      } else
          mpFS->startElementNS( XML_a, XML_r, FSEND );
  
@@ -3992,7 +4028,7 @@ index 77bcdf4..5971665 100644
  
      mpFS->startElementNS( XML_a, XML_t, FSEND );
      mpFS->writeEscaped( sText );
-@@ -1535,5 +1538,64 @@ sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star
+@@ -1532,5 +1535,64 @@ sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star
      return sNumStr.GetChar( 0 );
  }
  
@@ -4072,10 +4108,10 @@ index 08fa7a0..97891cf 100644
          $(SLO)$/vmlexport-shape-types.obj
  
 diff --git oox/source/export/shapes.cxx oox/source/export/shapes.cxx
-index 3c3af21..63ba887 100644
+index 765a8d2..fd68615 100644
 --- oox/source/export/shapes.cxx
 +++ oox/source/export/shapes.cxx
-@@ -59,6 +59,8 @@
+@@ -56,6 +56,8 @@
  #include <com/sun/star/text/XTextContent.hpp>
  #include <com/sun/star/text/XTextField.hpp>
  #include <com/sun/star/text/XTextRange.hpp>
@@ -4084,7 +4120,7 @@ index 3c3af21..63ba887 100644
  #include <tools/stream.hxx>
  #include <tools/string.hxx>
  #include <vcl/cvtgrf.hxx>
-@@ -73,6 +75,7 @@
+@@ -70,6 +72,7 @@
  #include <svx/svdoashp.hxx>
  #include <svx/svxenum.hxx>
  #include <svx/unoapi.hxx>
@@ -4092,7 +4128,7 @@ index 3c3af21..63ba887 100644
  
  using namespace ::com::sun::star;
  using namespace ::com::sun::star::uno;
-@@ -92,6 +95,8 @@ using ::com::sun::star::text::XText;
+@@ -89,6 +92,8 @@ using ::com::sun::star::text::XText;
  using ::com::sun::star::text::XTextContent;
  using ::com::sun::star::text::XTextField;
  using ::com::sun::star::text::XTextRange;
@@ -4101,7 +4137,7 @@ index 3c3af21..63ba887 100644
  using ::oox::core::XmlFilterBase;
  using ::rtl::OString;
  using ::rtl::OStringBuffer;
-@@ -427,7 +432,7 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool
+@@ -424,7 +429,7 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool
  
      // visual shape properties
      pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4110,7 +4146,7 @@ index 3c3af21..63ba887 100644
      WritePolyPolygon( aPolyPolygon );
      Reference< XPropertySet > xProps( xShape, UNO_QUERY );
      if( xProps.is() ) {
-@@ -508,7 +513,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
+@@ -505,7 +510,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
  
      // visual shape properties
      pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4119,7 +4155,7 @@ index 3c3af21..63ba887 100644
      if( nAdjustmentValuesIndex != -1 )
          WritePresetShape( sPresetShape, eShapeType, bPredefinedHandlesUsed, nAdjustmentsWhichNeedsToBeConverted, aGeometrySeq[ nAdjustmentValuesIndex ] );
      else
-@@ -551,7 +556,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
+@@ -548,7 +553,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
  
      // visual shape properties
      pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4128,7 +4164,7 @@ index 3c3af21..63ba887 100644
      WritePresetShape( "ellipse" );
      Reference< XPropertySet > xProps( xShape, UNO_QUERY );
      if( xProps.is() )
-@@ -569,39 +574,6 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
+@@ -566,39 +571,6 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
      return *this;
  }
  
@@ -4168,7 +4204,7 @@ index 3c3af21..63ba887 100644
  ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
  {
      DBG(printf("write graphic object shape\n"));
-@@ -664,7 +636,7 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
+@@ -661,7 +633,7 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
  
      // visual shape properties
      pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4177,7 +4213,7 @@ index 3c3af21..63ba887 100644
      WritePresetShape( "rect" );
      pFS->endElementNS( mnXmlNamespace, XML_spPr );
  
-@@ -796,7 +768,7 @@ ShapeExport& ShapeExport::WriteLineShape( Reference< XShape > xShape )
+@@ -793,7 +765,7 @@ ShapeExport& ShapeExport::WriteLineShape( Reference< XShape > xShape )
  
      // visual shape properties
      pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4186,7 +4222,7 @@ index 3c3af21..63ba887 100644
      WritePresetShape( "line" );
      Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY );
      if( xShapeProps.is() )
-@@ -860,7 +832,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
+@@ -857,7 +829,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
  
      // visual shape properties
      pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4195,7 +4231,7 @@ index 3c3af21..63ba887 100644
      WritePresetShape( "rect" );
      Reference< XPropertySet > xProps( xShape, UNO_QUERY );
      if( xProps.is() )
-@@ -898,6 +870,7 @@ static const NameToConvertMapType& lcl_GetConverters()
+@@ -895,6 +867,7 @@ static const NameToConvertMapType& lcl_GetConverters()
      shape_converters[ "com.sun.star.drawing.LineShape" ]                = &ShapeExport::WriteLineShape;
      shape_converters[ "com.sun.star.drawing.OpenBezierShape" ]          = &ShapeExport::WriteOpenBezierShape;
      shape_converters[ "com.sun.star.drawing.RectangleShape" ]           = &ShapeExport::WriteRectangleShape;
@@ -4203,7 +4239,7 @@ index 3c3af21..63ba887 100644
      shape_converters[ "com.sun.star.drawing.TextShape" ]                = &ShapeExport::WriteTextShape;
      shape_converters[ "com.sun.star.presentation.DateTimeShape" ]       = &ShapeExport::WriteTextShape;
      shape_converters[ "com.sun.star.presentation.FooterShape" ]         = &ShapeExport::WriteTextShape;
-@@ -955,7 +928,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
+@@ -952,7 +925,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
  
      // visual shape properties
      pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4212,7 +4248,7 @@ index 3c3af21..63ba887 100644
      WritePresetShape( "rect" );
      WriteBlipFill( Reference< XPropertySet >(xShape, UNO_QUERY ), S( "GraphicURL" ) );
      pFS->endElementNS( mnXmlNamespace, XML_spPr );
-@@ -967,6 +940,25 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
+@@ -964,6 +937,25 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
      return *this;
  }
  
@@ -4517,10 +4553,10 @@ index 456b3f4..164a893 100644
      Reference< XPropertySet > xProps( xShape, UNO_QUERY );
      if( xProps.is() )
 diff --git sw/source/filter/ww8/docxattributeoutput.cxx sw/source/filter/ww8/docxattributeoutput.cxx
-index 44a5c32..13083c7 100644
+index db40c20..53c3368 100644
 --- sw/source/filter/ww8/docxattributeoutput.cxx
 +++ sw/source/filter/ww8/docxattributeoutput.cxx
-@@ -120,6 +120,11 @@
+@@ -124,6 +124,11 @@
  #include <tools/color.hxx>
  
  #include <com/sun/star/i18n/ScriptType.hdl>
@@ -4532,7 +4568,7 @@ index 44a5c32..13083c7 100644
  
  #if OSL_DEBUG_LEVEL > 0
  #include <stdio.h>
-@@ -136,6 +141,7 @@ using namespace sax_fastparser;
+@@ -140,6 +145,7 @@ using namespace sax_fastparser;
  using namespace nsSwDocInfoSubType;
  using namespace nsFieldFlags;
  using namespace sw::util;
@@ -4540,7 +4576,7 @@ index 44a5c32..13083c7 100644
  
  void DocxAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 /*nScript*/ )
  {
-@@ -1667,6 +1673,81 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size
+@@ -1759,6 +1765,81 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size
      m_pSerializer->endElementNS( XML_w, XML_drawing );
  }
  
@@ -4622,8 +4658,8 @@ index 44a5c32..13083c7 100644
  void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Point& /*rNdTopLeft*/ )
  {
      m_pSerializer->mark();
-@@ -1711,6 +1792,13 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
-                 }
+@@ -1809,6 +1890,13 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
+                 m_pParentFrame = &rFrame;
              }
              break;
 +        case sw::Frame::eOle:
@@ -4637,10 +4673,10 @@ index 44a5c32..13083c7 100644
  #if OSL_DEBUG_LEVEL > 0
              fprintf( stderr, "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& rNdTopLeft ) - frame type '%s'\n",
 diff --git sw/source/filter/ww8/docxattributeoutput.hxx sw/source/filter/ww8/docxattributeoutput.hxx
-index d751e6c..ee19058 100644
+index 52d991a..3f2b143 100644
 --- sw/source/filter/ww8/docxattributeoutput.hxx
 +++ sw/source/filter/ww8/docxattributeoutput.hxx
-@@ -45,6 +45,7 @@
+@@ -42,6 +42,7 @@
  class DocxExport;
  
  class SwGrfNode;
@@ -4648,7 +4684,7 @@ index d751e6c..ee19058 100644
  
  namespace docx { class FootnotesList; }
  namespace oox { namespace drawingml { class DrawingML; } }
-@@ -301,6 +302,7 @@ private:
+@@ -299,6 +300,7 @@ private:
  
      /// Output graphic fly frames.
      void FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize );
@@ -4657,10 +4693,10 @@ index d751e6c..ee19058 100644
      void InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
  
 diff --git sw/source/filter/ww8/docxexport.cxx sw/source/filter/ww8/docxexport.cxx
-index b66b059..e2401f4 100644
+index 63ed239..9268128 100644
 --- sw/source/filter/ww8/docxexport.cxx
 +++ sw/source/filter/ww8/docxexport.cxx
-@@ -34,10 +34,12 @@
+@@ -31,10 +31,12 @@
  #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
  #include <com/sun/star/document/XDocumentProperties.hpp>
  #include <com/sun/star/i18n/ScriptType.hdl>
@@ -4673,7 +4709,7 @@ index b66b059..e2401f4 100644
  
  #include <map>
  #include <algorithm>
-@@ -423,6 +425,33 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
+@@ -420,6 +422,33 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
  #endif
  }
  
@@ -4708,10 +4744,10 @@ index b66b059..e2401f4 100644
  {
      InitStyles();
 diff --git sw/source/filter/ww8/docxexport.hxx sw/source/filter/ww8/docxexport.hxx
-index 183b1f3..f732272 100644
+index 687f834..59e46d0 100644
 --- sw/source/filter/ww8/docxexport.hxx
 +++ sw/source/filter/ww8/docxexport.hxx
-@@ -55,6 +55,10 @@ namespace oox {
+@@ -52,6 +52,10 @@ namespace oox {
      namespace vml { class VMLExport; }
  }
  
@@ -4722,7 +4758,7 @@ index 183b1f3..f732272 100644
  /// The class that does all the actual DOCX export-related work.
  class DocxExport : public MSWordExportBase
  {
-@@ -136,6 +140,9 @@ public:
+@@ -133,6 +137,9 @@ public:
      
      virtual ULONG ReplaceCr( BYTE nChar );
  


More information about the ooo-build-commit mailing list