diff options
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 29 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxexport.hxx | 5 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxexportfilter.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxexportfilter.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/makefile.mk | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 4 |
7 files changed, 22 insertions, 30 deletions
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 0e40f9336d03..6ad8d6fb6306 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -315,7 +315,7 @@ bool DocxExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt ) } void DocxExport::WriteHeadersFooters( BYTE nHeadFootFlags, - const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, BYTE /*nBreakCode*/ ) + const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt ) { // headers if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN ) @@ -336,10 +336,6 @@ void DocxExport::WriteHeadersFooters( BYTE nHeadFootFlags, if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_FIRST ) WriteHeaderFooter( rFirstPageFmt, false, "first" ); - -#if OSL_DEBUG_LEVEL > 0 - fprintf( stderr, "DocxExport::WriteHeadersFooters() - nBreakCode introduced, but ignored\n" ); -#endif } void DocxExport::OutputField( const SwField* pFld, ww::eField eFldType, const String& rFldCmd, BYTE nMode ) @@ -354,13 +350,6 @@ void DocxExport::WriteFormData( const ::sw::mark::IFieldmark& /*rFieldmark*/ ) #endif } -void DocxExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark*/ ) -{ -#if OSL_DEBUG_LEVEL > 0 - fprintf( stderr, "TODO DocxExport::WriteHyperlinkData()\n" ); -#endif -} - void DocxExport::DoComboBox(const rtl::OUString& rName, const rtl::OUString& rHelp, const rtl::OUString& rToolTip, @@ -554,7 +543,7 @@ void DocxExport::InitStyles() S( "styles.xml" ) ); ::sax_fastparser::FSHelperPtr pStylesFS = - m_pFilter->openFragmentStreamWithSerializer( S( "word/styles.xml" ), + m_pFilter->openOutputStreamWithSerializer( S( "word/styles.xml" ), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml" ) ); // switch the serializer to redirect the output to word/styles.xml @@ -577,7 +566,7 @@ void DocxExport::WriteFootnotesEndnotes() S( "footnotes.xml" ) ); ::sax_fastparser::FSHelperPtr pFootnotesFS = - m_pFilter->openFragmentStreamWithSerializer( S( "word/footnotes.xml" ), + m_pFilter->openOutputStreamWithSerializer( S( "word/footnotes.xml" ), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml" ) ); // switch the serializer to redirect the output to word/footnotes.xml @@ -598,7 +587,7 @@ void DocxExport::WriteFootnotesEndnotes() S( "endnotes.xml" ) ); ::sax_fastparser::FSHelperPtr pEndnotesFS = - m_pFilter->openFragmentStreamWithSerializer( S( "word/endnotes.xml" ), + m_pFilter->openOutputStreamWithSerializer( S( "word/endnotes.xml" ), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml" ) ); // switch the serializer to redirect the output to word/endnotes.xml @@ -621,7 +610,7 @@ void DocxExport::WriteNumbering() S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering" ), S( "numbering.xml" ) ); - ::sax_fastparser::FSHelperPtr pNumberingFS = m_pFilter->openFragmentStreamWithSerializer( S( "word/numbering.xml" ), + ::sax_fastparser::FSHelperPtr pNumberingFS = m_pFilter->openOutputStreamWithSerializer( S( "word/numbering.xml" ), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml" ) ); // switch the serializer to redirect the output to word/nubering.xml @@ -654,7 +643,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header" ), aName ); - pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), + pFS = m_pFilter->openOutputStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" ) ); pFS->startElementNS( XML_w, XML_hdr, @@ -669,7 +658,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer" ), aName ); - pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), + pFS = m_pFilter->openOutputStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" ) ); pFS->startElementNS( XML_w, XML_ftr, @@ -712,7 +701,7 @@ void DocxExport::WriteFonts() S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable" ), S( "fontTable.xml" ) ); - ::sax_fastparser::FSHelperPtr pFS = m_pFilter->openFragmentStreamWithSerializer( + ::sax_fastparser::FSHelperPtr pFS = m_pFilter->openOutputStreamWithSerializer( S( "word/fontTable.xml" ), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml" ) ); @@ -800,7 +789,7 @@ DocxExport::DocxExport( DocxExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCur S( "word/document.xml" ) ); // the actual document - m_pDocumentFS = m_pFilter->openFragmentStreamWithSerializer( S( "word/document.xml" ), + m_pDocumentFS = m_pFilter->openOutputStreamWithSerializer( S( "word/document.xml" ), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" ) ); // the DrawingML access diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index d5f1b5e9af25..d27eaa4bb2ce 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -116,7 +116,7 @@ public: /// Output the actual headers and footers. virtual void WriteHeadersFooters( BYTE nHeadFootFlags, - const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, BYTE nBreakCode ); + const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt ); /// Write the field virtual void OutputField( const SwField* pFld, ww::eField eFldType, @@ -124,7 +124,6 @@ public: /// Write the data of the form field virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ); - virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ); virtual void DoComboBox(const rtl::OUString &rName, const rtl::OUString &rHelp, @@ -158,7 +157,7 @@ protected: virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, ULONG nLnNum ); - virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) {} + virtual void SectionBreaksAndFrames( const SwTxtNode& rNode ) {} /// Get ready for a new section. virtual void PrepareNewPageDesc( const SfxItemSet* pSet, diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index f9974cb39ec9..b09cf8a22b3f 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -79,7 +79,7 @@ bool DocxExportFilter::exportDocument() aExport.ExportDocument( true ); // FIXME support exporting selection only } - commitStorage(); + commit(); // delete the pCurPam if ( pCurPam ) diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 0cfcf947a3dc..19d10260787b 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -33,7 +33,7 @@ #include <oox/core/xmlfilterbase.hxx> #include <oox/drawingml/chart/chartconverter.hxx> -#include <oox/vml/vmldrawing.hxx> +#include <oox/vml/drawing.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -48,7 +48,7 @@ public: virtual bool importDocument() { return false; } virtual const ::oox::drawingml::Theme* getCurrentTheme() const { return NULL; } virtual sal_Int32 getSchemeClr( sal_Int32 ) const { return 0; } - virtual ::oox::vml::Drawing* getVmlDrawing() { return NULL; } + virtual const ::oox::vml::DrawingPtr getDrawings() { return ::oox::vml::DrawingPtr(); } virtual ::oox::drawingml::chart::ChartConverter& getChartConverter() { static ::oox::drawingml::chart::ChartConverter aConverter; return aConverter; } virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() { return ::oox::drawingml::table::TableStyleListPtr(); } diff --git a/sw/source/filter/ww8/makefile.mk b/sw/source/filter/ww8/makefile.mk index e7cdba51bf49..164a8fef28d6 100644 --- a/sw/source/filter/ww8/makefile.mk +++ b/sw/source/filter/ww8/makefile.mk @@ -62,7 +62,6 @@ EXCEPTIONSFILES = \ $(SLO)$/wrtw8num.obj \ $(SLO)$/wrtw8sty.obj \ $(SLO)$/wrtww8.obj \ - $(SLO)$/docxexportfilter.obj \ $(SLO)$/ww8atr.obj \ $(SLO)$/ww8par.obj \ $(SLO)$/ww8par6.obj \ @@ -82,9 +81,6 @@ SLOFILES = \ $(SLO)$/wrtw8sty.obj \ $(SLO)$/wrtww8.obj \ $(SLO)$/wrtww8gr.obj \ - $(SLO)$/docxattributeoutput.obj \ - $(SLO)$/docxexportfilter.obj \ - $(SLO)$/docxexport.obj \ $(SLO)$/ww8atr.obj \ $(SLO)$/ww8graf.obj \ $(SLO)$/ww8graf2.obj \ diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index f3a42a9a8cd4..c87cc0bb982a 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -698,6 +698,7 @@ bool wwFont::Write(SvStream *pTableStrm) const return true; } +#ifdef DOCX void wwFont::WriteDocx( const DocxAttributeOutput* rAttrOutput ) const { // no font embedding, panose id, subsetting, ... implemented @@ -712,6 +713,7 @@ void wwFont::WriteDocx( const DocxAttributeOutput* rAttrOutput ) const rAttrOutput->EndFont(); } +#endif bool operator<(const wwFont &r1, const wwFont &r2) { @@ -829,6 +831,7 @@ void wwFontHelper::WriteFontTable(SvStream *pTableStream, WW8Fib& rFib) } } +#ifdef DOCX void wwFontHelper::WriteFontTable( const DocxAttributeOutput& rAttrOutput ) { ::std::vector<const wwFont *> aFontList( AsVector() ); @@ -836,6 +839,7 @@ void wwFontHelper::WriteFontTable( const DocxAttributeOutput& rAttrOutput ) ::std::for_each( aFontList.begin(), aFontList.end(), ::std::bind2nd( ::std::mem_fun( &wwFont::WriteDocx ), &rAttrOutput ) ); } +#endif /* */ diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 93c2cbd76cf8..83b3b7b265ed 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -296,7 +296,9 @@ public: wwFont( const String &rFamilyName, FontPitch ePitch, FontFamily eFamily, rtl_TextEncoding eChrSet, bool bWrtWW8 ); bool Write( SvStream *pTableStram ) const; +#ifdef DOCX void WriteDocx( const DocxAttributeOutput* rAttrOutput ) const; +#endif rtl::OUString GetFamilyName() const { return rtl::OUString( msFamilyNm ); } friend bool operator < (const wwFont &r1, const wwFont &r2); }; @@ -319,7 +321,9 @@ public: USHORT GetId(const SvxFontItem& rFont); USHORT GetId(const wwFont& rFont); void WriteFontTable( SvStream *pTableStream, WW8Fib& pFib ); +#ifdef DOCX void WriteFontTable( const DocxAttributeOutput& rAttrOutput ); +#endif }; class DrawObj |