[ooo-build-commit] .: patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Wed Jun 30 05:52:19 PDT 2010
patches/dev300/apply | 2
patches/dev300/docx-fixes02.diff | 181 +++++++++++++++------------------------
2 files changed, 75 insertions(+), 108 deletions(-)
New commits:
commit e2e4f3b27eee91882de1973942d1187d4725240e
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Jun 30 14:50:37 2010 +0200
Updated docx-fixes02.diff to m83
* patches/dev300/apply:
* patches/dev300/docx-fixes02.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 09ae162..b30b0e9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3286,7 +3286,7 @@ gnome-screen-saver.diff, i#106372, cmc
[ OOXMLExport ]
oox-pptx-export-update-to-ooo320.diff, rodo
-# FIXME dev300-m83 docx-fixes02.diff, n#581604, cbosdo
+docx-fixes02.diff, n#581604, cbosdo
iso-ooxml-sw.diff, cbosdo
[ OOXMLExport321 and not OOXMLExportDevel ]
diff --git a/patches/dev300/docx-fixes02.diff b/patches/dev300/docx-fixes02.diff
index 9baea0a..407d4ad 100644
--- a/patches/dev300/docx-fixes02.diff
+++ b/patches/dev300/docx-fixes02.diff
@@ -1,16 +1,23 @@
+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 | 408 +++++++++++++++++++++++++-
- sw/source/filter/ww8/docxattributeoutput.hxx | 8 +-
- sw/source/filter/ww8/makefile.mk | 1 +
+ sax/source/tools/fastserializer.hxx | 7
+ sw/source/filter/ww8/attributeoutputbase.hxx | 5
+ sw/source/filter/ww8/docxattributeoutput.cxx | 402 +++++++++++++++++++++++---
+ 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 | 21 +-
- sw/source/filter/ww8/ww8attributeoutput.hxx | 5 +-
- 11 files changed, 560 insertions(+), 112 deletions(-)
+ sw/source/filter/ww8/wrtw8sty.cxx | 15 +
+ sw/source/filter/ww8/wrtww8.hxx | 69 ++++
+ sw/source/filter/ww8/ww8atr.cxx | 21 -
+ sw/source/filter/ww8/ww8attributeoutput.hxx | 5
+ 11 files changed, 523 insertions(+), 143 deletions(-)
+
diff --git sax/source/tools/fastserializer.cxx sax/source/tools/fastserializer.cxx
index 6b0736d..edff7cb 100644
@@ -131,10 +138,10 @@ index e5f40b9..ff8c062 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 291a6a7..430c1e4 100644
+index ff3ff8f..3d64409 100644
--- sw/source/filter/ww8/docxattributeoutput.cxx
+++ sw/source/filter/ww8/docxattributeoutput.cxx
-@@ -31,6 +31,13 @@
+@@ -32,6 +32,13 @@
#include "writerwordglue.hxx"
#include "wrtww8.hxx"
#include "ww8par.hxx"
@@ -148,7 +155,7 @@ index 291a6a7..430c1e4 100644
#include <oox/core/tokens.hxx>
#include <oox/export/drawingml.hxx>
-@@ -207,6 +214,25 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
+@@ -208,6 +215,25 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
FinishTableRowCell( pTextNodeInfoInner );
m_bParagraphOpened = false;
@@ -174,7 +181,7 @@ index 291a6a7..430c1e4 100644
}
void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph )
-@@ -286,6 +312,14 @@ void DocxAttributeOutput::InitCollectedParagraphProperties()
+@@ -287,6 +313,14 @@ void DocxAttributeOutput::InitCollectedParagraphProperties()
void DocxAttributeOutput::WriteCollectedParagraphProperties()
{
@@ -189,7 +196,7 @@ index 291a6a7..430c1e4 100644
if ( m_pSpacingAttrList )
{
XFastAttributeListRef xAttrList( m_pSpacingAttrList );
-@@ -745,14 +779,82 @@ void DocxAttributeOutput::RawText( const String& /*rText*/, bool /*bForceUnicode
+@@ -746,14 +780,75 @@ void DocxAttributeOutput::RawText( const String& /*rText*/, bool /*bForceUnicode
OSL_TRACE("TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )\n" );
}
@@ -255,25 +262,18 @@ index 291a6a7..430c1e4 100644
+
+ m_pSerializer->startElementNS( XML_w, XML_rubyBase, FSEND );
+ StartRun( NULL );
-+>>>>>>> 3caf808... docx-fixes02.diff
}
void DocxAttributeOutput::EndRuby()
{
-+<<<<<<< HEAD
OSL_TRACE( "TODO DocxAttributeOutput::EndRuby()\n" );
-+=======
-+#if OSL_DEBUG_LEVEL > 0
-+ fprintf( stderr, "TODO DocxAttributeOutput::EndRuby()\n" );
-+#endif
+ EndRun( );
+ m_pSerializer->endElementNS( XML_w, XML_rubyBase );
+ m_pSerializer->endElementNS( XML_w, XML_ruby );
-+>>>>>>> 3caf808... docx-fixes02.diff
}
bool DocxAttributeOutput::AnalyzeURL( const String& rUrl, const String& rTarget, String* pLinkURL, String* pMark )
-@@ -1693,6 +1795,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
+@@ -1720,6 +1815,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
}
}
break;
@@ -286,7 +286,7 @@ index 291a6a7..430c1e4 100644
default:
#if OSL_DEBUG_LEVEL > 0
OSL_TRACE( "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& rNdTopLeft ) - frame type '%s'\n",
-@@ -1707,7 +1815,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
+@@ -1734,7 +1835,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
}
void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
@@ -295,7 +295,7 @@ index 291a6a7..430c1e4 100644
{
OString aStyle( "style" );
-@@ -1730,6 +1838,9 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
+@@ -1757,6 +1858,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 );
@@ -305,17 +305,15 @@ index 291a6a7..430c1e4 100644
}
void DocxAttributeOutput::EndStyle()
-@@ -2247,11 +2358,51 @@ void DocxAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
+@@ -2274,11 +2378,43 @@ void DocxAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
}
}
-+<<<<<<< HEAD
- void DocxAttributeOutput::CharEscapement( const SvxEscapementItem& /*rEscapement*/ )
- {
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "TODO DocxAttributeOutput::CharEscapement()\n" );
- #endif
-+=======
+-void DocxAttributeOutput::CharEscapement( const SvxEscapementItem& /*rEscapement*/ )
+-{
+-#if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "TODO DocxAttributeOutput::CharEscapement()\n" );
+-#endif
+void DocxAttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement )
+{
+ OString sIss;
@@ -353,11 +351,10 @@ index 291a6a7..430c1e4 100644
+ FSNS( XML_w, XML_val ), sSize.getStr( ), FSEND );
+ }
+ }
-+>>>>>>> 3caf808... docx-fixes02.diff
}
void DocxAttributeOutput::CharFont( const SvxFontItem& rFont)
-@@ -2283,7 +2434,7 @@ void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
+@@ -2310,7 +2446,7 @@ void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
void DocxAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
{
OString aKerning = OString::valueOf( ( sal_Int32 ) rKerning.GetValue() );
@@ -366,35 +363,30 @@ index 291a6a7..430c1e4 100644
}
void DocxAttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
-@@ -2536,11 +2687,18 @@ void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
+@@ -2563,11 +2699,12 @@ void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
}
-void DocxAttributeOutput::TextCharFormat( const SwFmtCharFmt& )
+void DocxAttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
{
-+<<<<<<< HEAD
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "TODO DocxAttributeOutput::TextCharFormat()\n" );
- #endif
-+=======
+-#if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "TODO DocxAttributeOutput::TextCharFormat()\n" );
+-#endif
+ OString aStyleId( "style" );
+ aStyleId += OString::valueOf( sal_Int32( m_rExport.GetId( *rCharFmt.GetCharFmt() ) ) );
+
+ m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
-+>>>>>>> 3caf808... docx-fixes02.diff
}
void DocxAttributeOutput::RefField( const SwField& rFld, const String& rRef )
-@@ -2954,9 +3112,28 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
+@@ -2981,9 +3118,22 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
{
if ( m_rExport.bOutFlyFrmAttrs )
{
-+<<<<<<< HEAD
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "TODO DocxAttributeOutput::FormatFrameSize() - Fly frames\n" );
- #endif
-+=======
+- #if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "TODO DocxAttributeOutput::FormatFrameSize() - Fly frames\n" );
+- #endif
+ if ( !m_pFlyAttrList )
+ m_pFlyAttrList = m_pSerializer->createAttrList( );
+
@@ -411,30 +403,26 @@ index 291a6a7..430c1e4 100644
+ m_pFlyAttrList->add( FSNS( XML_w, XML_hRule ), sRule );
+ m_pFlyAttrList->add( FSNS( XML_w, XML_h ), OString::valueOf( rSize.GetHeight( ) ) );
+ }
-+>>>>>>> 3caf808... docx-fixes02.diff
}
else if ( m_rExport.bOutPageDescs )
{
-@@ -2986,9 +3163,18 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
+@@ -3013,9 +3163,12 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
{
if ( m_rExport.bOutFlyFrmAttrs )
{
-+<<<<<<< HEAD
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "DocxAttributeOutput::FormatLRSpace() - Fly frames\n" );
- #endif
-+=======
+-#if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "DocxAttributeOutput::FormatLRSpace() - Fly frames\n" );
+-#endif
+ if ( !m_pFlyAttrList )
+ m_pFlyAttrList = m_pSerializer->createAttrList();
+
+ m_pFlyAttrList->add( FSNS( XML_w, XML_hSpace ),
+ OString::valueOf(
+ sal_Int32( ( rLRSpace.GetLeft() + rLRSpace.GetRight() ) / 2 ) ) );
-+>>>>>>> 3caf808... docx-fixes02.diff
}
else if ( m_rExport.bOutPageDescs )
{
-@@ -3029,11 +3215,17 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
+@@ -3056,11 +3209,17 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
{
@@ -453,18 +441,16 @@ index 291a6a7..430c1e4 100644
}
else if (m_rExport.bOutPageDescs )
{
-@@ -3075,32 +3267,174 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
+@@ -3102,32 +3261,150 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
}
}
-void DocxAttributeOutput::FormatSurround( const SwFmtSurround& )
+void DocxAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
{
-+<<<<<<< HEAD
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "TODO DocxAttributeOutput::FormatSurround()\n" );
- #endif
-+=======
+-#if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "TODO DocxAttributeOutput::FormatSurround()\n" );
+-#endif
+ if ( m_rExport.bOutFlyFrmAttrs )
+ {
+ if ( !m_pFlyAttrList )
@@ -489,17 +475,14 @@ index 291a6a7..430c1e4 100644
+
+ m_pFlyAttrList->add( FSNS( XML_w, XML_wrap ), sWrap );
+ }
-+>>>>>>> 3caf808... docx-fixes02.diff
}
-void DocxAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& )
+void DocxAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert )
{
-+<<<<<<< HEAD
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "TODO DocxAttributeOutput::FormatVertOrientation()\n" );
- #endif
-+=======
+-#if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "TODO DocxAttributeOutput::FormatVertOrientation()\n" );
+-#endif
+ if ( m_rExport.bOutFlyFrmAttrs )
+ {
+ if ( !m_pFlyAttrList )
@@ -554,17 +537,14 @@ index 291a6a7..430c1e4 100644
+
+ m_pFlyAttrList->add( FSNS( XML_w, XML_vAnchor ), sVAnchor );
+ }
-+>>>>>>> 3caf808... docx-fixes02.diff
}
-void DocxAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& )
+void DocxAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori )
{
-+<<<<<<< HEAD
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "TODO DocxAttributeOutput::FormatHorizOrientation()\n" );
- #endif
-+=======
+-#if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "TODO DocxAttributeOutput::FormatHorizOrientation()\n" );
+-#endif
+ if ( m_rExport.bOutFlyFrmAttrs )
+ {
+ if ( !m_pFlyAttrList )
@@ -616,45 +596,36 @@ index 291a6a7..430c1e4 100644
+
+ m_pFlyAttrList->add( FSNS( XML_w, XML_hAnchor ), sHAnchor );
+ }
-+>>>>>>> 3caf808... docx-fixes02.diff
}
void DocxAttributeOutput::FormatAnchor( const SwFmtAnchor& )
{
-+<<<<<<< HEAD
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "TODO DocxAttributeOutput::FormatAnchor()\n" );
- #endif
-+=======
+-#if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "TODO DocxAttributeOutput::FormatAnchor()\n" );
+-#endif
+ // Fly frames: anchors here aren't matching the anchors in docx
-+>>>>>>> 3caf808... docx-fixes02.diff
}
void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
-@@ -3112,10 +3446,13 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
+@@ -3139,10 +3416,6 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
FSNS( XML_w, XML_fill ), sColor.getStr( ),
FSEND );
}
-+<<<<<<< HEAD
-
- #if OSL_DEBUG_LEVEL > 0
- OSL_TRACE( "TODO DocxAttributeOutput::FormatBackground()\n" );
- #endif
-+=======
-+>>>>>>> 3caf808... docx-fixes02.diff
+-
+-#if OSL_DEBUG_LEVEL > 0
+- OSL_TRACE( "TODO DocxAttributeOutput::FormatBackground()\n" );
+-#endif
}
void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
-@@ -3198,9 +3535,56 @@ void DocxAttributeOutput::FormatKeep( const SvxFmtKeepItem& )
+@@ -3225,9 +3498,52 @@ void DocxAttributeOutput::FormatKeep( const SvxFmtKeepItem& )
m_pSerializer->singleElementNS( XML_w, XML_keepNext, FSEND );
}
-void DocxAttributeOutput::FormatTextGrid( const SwTextGridItem& )
+void DocxAttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
{
-+<<<<<<< HEAD
- OSL_TRACE( "TODO DocxAttributeOutput::FormatTextGrid()\n" );
-+=======
+- OSL_TRACE( "TODO DocxAttributeOutput::FormatTextGrid()\n" );
+ FastAttributeList *pGridAttrList = m_pSerializer->createAttrList();
+
+ OString sGridType;
@@ -699,11 +670,10 @@ index 291a6a7..430c1e4 100644
+ OString::valueOf( sal_Int32( nCharSpace ) ).getStr( ) );
+
+ m_pSerializer->singleElementNS( XML_w, XML_docGrid, pGridAttrList );
-+>>>>>>> 3caf808... docx-fixes02.diff
}
void DocxAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering )
-@@ -3258,6 +3642,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
+@@ -3285,6 +3601,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
m_pCharLangAttrList( NULL ),
m_pSpacingAttrList( NULL ),
m_pHyperlinkAttrList( NULL ),
@@ -711,7 +681,7 @@ index 291a6a7..430c1e4 100644
m_pFootnotesList( new ::docx::FootnotesList() ),
m_pEndnotesList( new ::docx::FootnotesList() ),
m_pSectionInfo( NULL ),
-@@ -3270,7 +3655,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
+@@ -3297,7 +3614,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
m_bTableCellOpen( false ),
m_nTableDepth( 0 ),
m_bParagraphOpened( false ),
@@ -721,7 +691,7 @@ index 291a6a7..430c1e4 100644
{
}
-@@ -3281,11 +3667,13 @@ DocxAttributeOutput::~DocxAttributeOutput()
+@@ -3308,11 +3626,13 @@ DocxAttributeOutput::~DocxAttributeOutput()
delete m_pCharLangAttrList, m_pCharLangAttrList = NULL;
delete m_pSpacingAttrList, m_pSpacingAttrList = NULL;
delete m_pHyperlinkAttrList, m_pHyperlinkAttrList = NULL;
@@ -736,7 +706,7 @@ index 291a6a7..430c1e4 100644
MSWordExportBase& DocxAttributeOutput::GetExport()
diff --git sw/source/filter/ww8/docxattributeoutput.hxx sw/source/filter/ww8/docxattributeoutput.hxx
-index e1edbd6..e585401 100644
+index 2e94069..2625d6d 100644
--- sw/source/filter/ww8/docxattributeoutput.hxx
+++ sw/source/filter/ww8/docxattributeoutput.hxx
@@ -102,7 +102,7 @@ public:
@@ -748,7 +718,7 @@ index e1edbd6..e585401 100644
/// Output ruby end.
virtual void EndRuby();
-@@ -173,7 +173,8 @@ public:
+@@ -175,7 +175,8 @@ public:
/// Start of a style in the styles table.
virtual void StartStyle( const String& rName, bool bPapFmt,
@@ -758,7 +728,7 @@ index e1edbd6..e585401 100644
/// End of a style in the styles table.
virtual void EndStyle();
-@@ -539,6 +540,7 @@ private:
+@@ -541,6 +542,7 @@ private:
::sax_fastparser::FastAttributeList *m_pCharLangAttrList;
::sax_fastparser::FastAttributeList *m_pSpacingAttrList;
::sax_fastparser::FastAttributeList *m_pHyperlinkAttrList;
@@ -766,7 +736,7 @@ index e1edbd6..e585401 100644
::docx::FootnotesList *m_pFootnotesList;
::docx::FootnotesList *m_pEndnotesList;
-@@ -581,6 +583,8 @@ private:
+@@ -583,6 +585,8 @@ private:
// beginning of the next paragraph
DocxColBreakStatus m_nColBreakStatus;
@@ -776,7 +746,7 @@ index e1edbd6..e585401 100644
DocxAttributeOutput( DocxExport &rExport, ::sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML );
diff --git sw/source/filter/ww8/makefile.mk sw/source/filter/ww8/makefile.mk
-index 653c36f..e5a0998 100644
+index 55d53f5..c4c4528 100644
--- sw/source/filter/ww8/makefile.mk
+++ sw/source/filter/ww8/makefile.mk
@@ -58,6 +58,7 @@ EXCEPTIONSFILES = \
@@ -1039,7 +1009,7 @@ index d73ebae..20db21f 100644
class MSWordStyles
{
diff --git sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
-index 1e5d011..8582df5 100644
+index fdf582b..983ac24 100644
--- sw/source/filter/ww8/ww8atr.cxx
+++ sw/source/filter/ww8/ww8atr.cxx
@@ -3774,25 +3774,12 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
@@ -1095,6 +1065,3 @@ index c064da2..cd0c986 100644
/// End of a style in the styles table.
virtual void EndStyle();
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list