diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-20 00:01:39 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-20 11:42:37 +0200 |
| commit | 261789b39e3eaeedc852e053748fa7e4ffde9ff0 (patch) | |
| tree | 2e42a3e6093fdff4e8be3c1322ca32ecce189f2e | |
| parent | 4eacfbdc7bd327a9ca99af0f87d618ad2dd9be7a (diff) | |
sw: WW8 export: remove WW6 export, part5: bWrtWW8 in wrtw8esh.cxx
Change-Id: I24f0afd44f2f8c922b628bed2e384f34c88a6ce5
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 10 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 14 |
2 files changed, 4 insertions, 20 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index bf7c27ba1aec..b7c610604d67 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -364,9 +364,6 @@ namespace // get a part fix for this type of element bool WW8Export::MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat) { - OSL_ENSURE(bWrtWW8, "Not allowed"); - if (!bWrtWW8) - return false; const SdrObject *pObject = rFrameFormat.FindRealSdrObject(); if (!pObject || pObject->GetObjInventor() != FmFormInventor) return false; @@ -451,9 +448,6 @@ void WW8Export::DoComboBox(const OUString &rName, const OUString &rSelected, uno::Sequence<OUString> &rListItems) { - OSL_ENSURE(bWrtWW8, "Not allowed"); - if (!bWrtWW8) - return; OutputField(0, ww::eFORMDROPDOWN, FieldString(ww::eFORMDROPDOWN), WRITEFIELD_START | WRITEFIELD_CMD_START); // write the refence to the "picture" structure @@ -1019,7 +1013,6 @@ sal_uInt32 WW8Export::GetSdrOrdNum( const SwFrameFormat& rFormat ) const void WW8Export::AppendFlyInFlys(const sw::Frame& rFrameFormat, const Point& rNdTopLeft) { - OSL_ENSURE(bWrtWW8, "this has gone horribly wrong"); OSL_ENSURE(!m_pEscher, "der EscherStream wurde schon geschrieben!"); if (m_pEscher) return ; @@ -3137,9 +3130,6 @@ bool SwMSConvertControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFormObj) { - if (!rWW8Wrt.bWrtWW8) - return false; - uno::Reference< awt::XControlModel > xControlModel = rFormObj.GetUnoControlModel(); diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 500014e6d234..ddc6bc6a6f2d 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -290,14 +290,9 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/, { sal_uInt16 nFontID = m_rWW8Export.m_aFontHelper.GetId( *pFont ); - if ( m_rWW8Export.bWrtWW8 ) - { - m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc0 ); - m_rWW8Export.InsUInt16( nFontID ); - m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc2 ); - } - else - m_rWW8Export.pO->push_back( 93 ); + m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc0 ); + m_rWW8Export.InsUInt16( nFontID ); + m_rWW8Export.InsUInt16( NS_sprm::LN_CRgFtc2 ); m_rWW8Export.InsUInt16( nFontID ); } @@ -604,8 +599,7 @@ void WW8Export::OutListNamesTab() void WW8Export::OutputOlst( const SwNumRule& rRule ) { - if ( bWrtWW8 ) - return; + assert(false); // TODO static const sal_uInt8 aAnlvBase[] = { // Defaults 1,0,0, // Upper Roman |