diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-20 00:58:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-20 11:42:40 +0200 |
| commit | 40bfeb3aef71e61fd620b8c3aa9d04a1b4ae5246 (patch) | |
| tree | cd66238118a5a151a2e1b1ca4b9a31c25bed0705 | |
| parent | 9adb120b31a6b413111231f962006964c9b2abc3 (diff) | |
sw: WW8 export: remove WW6 export, partC: SwWW8Writer::bWrtWW8
... and disable WW6 export in fltini.cxx
Change-Id: I6f649e03f39dcb8f185b6cb5074ef9037e6d0562
| -rw-r--r-- | sw/source/filter/basflt/fltini.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 0144e2c4fb3d..f7d9f7d31b2b 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -72,7 +72,7 @@ SwReaderWriterEntry aReaderWriter[] = { SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter, true ), SwReaderWriterEntry( 0, &::GetASCWriter, false ), - SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer, true ), + SwReaderWriterEntry( &::GetWW8Reader, nullptr, true ), SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer, true ), SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter, true ), SwReaderWriterEntry( 0, &::GetHTMLWriter, true ), diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index cca6c5bfb68a..358e98543edc 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3453,10 +3453,10 @@ MSWordSections& WW8Export::Sections() const SwWW8Writer::SwWW8Writer(const OUString& rFltName, const OUString& rBaseURL) : StgWriter(), - m_bWrtWW8( rFltName == FILTER_WW8 ), m_pExport( NULL ), mpMedium( 0 ) { + assert(rFltName == FILTER_WW8); // WW6/7 export was removed SetBaseURL( rBaseURL ); } diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 13dbab2ec45c..30f43bed9770 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -879,7 +879,6 @@ class SwWW8Writer: public StgWriter // (if yes, remove the friends, and provide here a GetExport() method) friend void WW8_WrtRedlineAuthor::Write(Writer &rWrt); - bool m_bWrtWW8; WW8Export *m_pExport; SfxMedium *mpMedium; |