diff options
author | Andras Timar <andras.timar@collabora.com> | 2014-09-23 23:40:13 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-09-23 23:40:13 +0200 |
commit | acf7af3535753f8acb89595acca07db415234d6b (patch) | |
tree | f1d1ef32e67e2267bfde4008915cdd0290149c21 | |
parent | 6645cd6fdf4aceb212db02676069506638e0946e (diff) |
Revert "handle docx's w:anchor layoutInCell attribute (bnc#891663)"
This reverts commit b6dae49f3913464dc76992fbb2d1ee8ca9c98f07.
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/bnc891663.docx | bin | 7911 -> 0 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 7 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyIds.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyIds.hxx | 1 |
5 files changed, 0 insertions, 18 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx b/sw/qa/extras/ooxmlimport/data/bnc891663.docx Binary files differdeleted file mode 100644 index d5f057e66fd6..000000000000 --- a/sw/qa/extras/ooxmlimport/data/bnc891663.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 2a7ab9a43973..0035e7b660f9 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1723,15 +1723,6 @@ DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, "table-btlr-center.docx") CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER, getProperty<sal_Int16>(xTable->getCellByName("A2"), "VertOrient")); } -DECLARE_OOXMLIMPORT_TEST(testBnc891663, "bnc891663.docx") -{ - // The image should be inside a cell, so the text in the following cell should be below it. - int imageTop = parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds", "top").toInt32(); - int imageHeight = parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds", "height").toInt32(); - int textNextRowTop = parseDump("/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds", "top").toInt32(); - CPPUNIT_ASSERT( textNextRowTop >= imageTop + imageHeight ); -} - #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 2c5733720e70..607d92b7c535 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -210,7 +210,6 @@ public: sal_Int16 nVertOrient; sal_Int16 nVertRelation; sal_Int32 nWrap; - bool bLayoutInCell; bool bOpaque; bool bContour; bool bContourOutside; @@ -283,7 +282,6 @@ public: ,nVertOrient( text::VertOrientation::NONE ) ,nVertRelation( text::RelOrientation::FRAME ) ,nWrap(0) - ,bLayoutInCell(false) ,bOpaque( true ) ,bContour(false) ,bContourOutside(true) @@ -858,8 +856,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored - m_pImpl->bLayoutInCell = nIntValue != 0; - break; case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored break; case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993; @@ -1512,9 +1508,6 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b } xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_SURROUND ), uno::makeAny(m_pImpl->nWrap)); - if( m_pImpl->bLayoutInCell && m_pImpl->nWrap != text::WrapTextMode_THROUGHT ) - xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_FOLLOW_TEXT_FLOW ), - uno::makeAny(true)); xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_SURROUND_CONTOUR ), uno::makeAny(m_pImpl->bContour)); diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index 14dbc25f44ab..d693ddbe475d 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -347,7 +347,6 @@ const OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const case PROP_HORIZONTAL_MERGE: sName = "HorizontalMerge"; break; case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = "ApplyParagraphMarkFormatToNumbering"; break; case PROP_CELL_DIRECTION: sName = "CellDirection"; break; - case PROP_FOLLOW_TEXT_FLOW: sName = "IsFollowingTextFlow"; break; } ::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt = m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName )); diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index 3c03ed3fe1b9..1f6317985588 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -318,7 +318,6 @@ enum PropertyIds ,PROP_HORIZONTAL_MERGE ,PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING ,PROP_CELL_DIRECTION - ,PROP_FOLLOW_TEXT_FLOW }; struct PropertyNameSupplier_Impl; class PropertyNameSupplier |