mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bnc#820504 VML import: don't anchor shapes TO_PAGE

Browse Source 
In theory, this is a problem because Word formats only support AT_CHAR
and AS_CHAR, so importing something as AT_PAGE is buggy.

In practice, this also leads to unvisible shapes, since
f0d001a378.

Change-Id: Ie730d67a789ef12734cede1f9b6c27764a66f237
This commit is contained in:
Miklos Vajna
2013-07-04 10:55:50 +02:00
parent 25bfc4a4e6
commit f5b7acac62
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
oox/source/vml/vmlshape.cxx
View File

@@ -456,18 +456,8 @@ void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel)
if ( rTypeModel.maPosition == "absolute" )
{
if (rTypeModel.moWrapAnchorX.get() == "page" && rTypeModel.moWrapAnchorY.get() == "page")
{
// I'm not sure if AT_PAGE is always correct here (not sure what the parent that
// the spec talks about can be), but with Writer SwXDrawPage::add()
// always in practice uses this because of pDoc->GetCurrentLayout() being NULL at this point.
rPropSet.setProperty(PROP_AnchorType, text::TextContentAnchorType_AT_PAGE);
}
else
{
// Map to as-character by default, that fixes vertical position of some textframes.
rPropSet.setProperty(PROP_AnchorType, text::TextContentAnchorType_AT_CHARACTER);
}
// Word supports as-character (inline) and at-character only, absolute can't be inline.
rPropSet.setProperty(PROP_AnchorType, text::TextContentAnchorType_AT_CHARACTER);
if ( rTypeModel.maPositionVerticalRelative == "page" )
{

BIN
sw/qa/extras/ooxmlimport/data/n820504.docx
View File

Binary file not shown.

8
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
View File

@@ -532,7 +532,7 @@ void Test::testN764005()
CPPUNIT_ASSERT(eValue != text::TextContentAnchorType_AS_CHARACTER);
sal_Bool bValue = sal_True;
xPropertySet->getPropertyValue("Opaque") >>= bValue;
CPPUNIT_ASSERT_EQUAL(sal_False, bValue);
CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
}
void Test::testSmartart()
@@ -1455,6 +1455,12 @@ void Test::testN820504()
uno::Reference<beans::XPropertySet> xStyle(xStylesAccess->getByName("Default Style"), uno::UNO_QUERY);
// The problem was that the CharColor was set to AUTO (-1) even if we have some default char color set
CPPUNIT_ASSERT_EQUAL(sal_Int32(4040635), getProperty<sal_Int32>(xStyle, "CharColor"));
// Also, the groupshape was anchored at-page instead of at-character
// (that's incorrect as Word only supports at-character and as-character).
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, getProperty<text::TextContentAnchorType>(xDraws->getByIndex(0), "AnchorType"));
}
void Test::testFdo43641()

2
writerfilter/source/dmapper/DomainMapper_Impl.cxx
View File

@@ -1749,7 +1749,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
if (nAnchorType == text::TextContentAnchorType_AT_PAGE)
bIsGraphic = false;
if (nAnchorType != text::TextContentAnchorType_AT_PAGE)
if (!m_bInHeaderFooterImport)
xProps->setPropertyValue(
rPropNameSupplier.GetName( PROP_OPAQUE ),
uno::makeAny( true ) );