dev/null |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 ---------
writerfilter/source/dmapper/GraphicImport.cxx | 7 -------
writerfilter/source/dmapper/PropertyIds.cxx | 1 -
writerfilter/source/dmapper/PropertyIds.hxx | 1 -
5 files changed, 18 deletions(-)
New commits:
commit b3db68f6d26b5eee54c3f636a71ad22ff207965e
Author: Andras Timar <andras.ti...@collabora.com>
Date: Tue Sep 23 23:40:56 2014 +0200
Revert "handle docx's w:anchor layoutInCell attribute (bnc#891663)"
This reverts commit 2a632bb30f78f02042ce333d426468087639305b.
diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
deleted file mode 100644
index d5f057e..0000000
Binary files a/sw/qa/extras/ooxmlimport/data/bnc891663.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 07761dd..305b6ed 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2275,15 +2275,6 @@ DECLARE_OOXMLIMPORT_TEST(testBnc519228OddBreaks,
"bnc519228_odd-breaks.docx")
getParagraphOfText( 1, getProperty< uno::Reference<text::XText>
>(page5Style, "HeaderText"), "This is the header for odd pages");
}
-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 e2d3fa3..6cd88a5 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;
@@ -284,7 +283,6 @@ public:
,nVertOrient( text::VertOrientation::NONE )
,nVertRelation( text::RelOrientation::FRAME )
,nWrap(0)
- ,bLayoutInCell(false)
,bOpaque( true )
,bContour(false)
,bContourOutside(true)
@@ -583,8 +581,6 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
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;
@@ -1234,9 +1230,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 fc81dae..3f5fa05 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -394,7 +394,6 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId )
const
case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName =
"ApplyParagraphMarkFormatToNumbering"; break;
case PROP_CELL_DIRECTION: sName = "CellDirection"; break;
case PROP_CELL_HIDE_MARK: sName = "CellHideMark"; 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 7394a50..3510e62 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -366,7 +366,6 @@ enum PropertyIds
,PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING
,PROP_CELL_DIRECTION
,PROP_CELL_HIDE_MARK
- ,PROP_FOLLOW_TEXT_FLOW
};
struct PropertyNameSupplier_Impl;
class PropertyNameSupplier
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
