Kaydet (Commit) b7b2887d authored tarafından Miklos Vajna's avatar Miklos Vajna

Revert "tdf#109067 Fix default value of rotWithShape"

This reverts commit 1b08f129. The
change was Jenkins-verified, but just rebasing it on top of latest
master (without getting conflicts) broke the test added in the commit.

So let's revert it for now to have time to find out why does the test
fail on top of latest master.

Change-Id: I3bce24e54fb07df2dd460fb0f01d44516b3fcd0d
üst d8e5a0db
......@@ -362,8 +362,8 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
if ( bFlipV )
nShapeRotation = -nShapeRotation;
// "rotate with shape" set to false -> do not rotate
if ( !maGradientProps.moRotateWithShape.get( true ) )
// "rotate with shape" not set, or set to false -> do not rotate
if ( !maGradientProps.moRotateWithShape.get( false ) )
nShapeRotation = 0;
if( maGradientProps.moGradientPath.has() )
......
......@@ -386,14 +386,14 @@ void DrawingML::WriteGradientFill( const Reference< XPropertySet >& rXPropSet )
// If we have no gradient stops that means original gradient were defined by a theme.
if( aGradientStops.hasElements() )
{
mpFS->startElementNS( XML_a, XML_gradFill, XML_rotWithShape, "0", FSEND );
mpFS->startElementNS( XML_a, XML_gradFill, FSEND );
WriteGrabBagGradientFill(aGradientStops, aGradient);
mpFS->endElementNS( XML_a, XML_gradFill );
}
}
else
{
mpFS->startElementNS( XML_a, XML_gradFill, XML_rotWithShape, "0", FSEND );
mpFS->startElementNS( XML_a, XML_gradFill, FSEND );
WriteGradientFill(aGradient);
mpFS->endElementNS( XML_a, XML_gradFill );
}
......@@ -1053,7 +1053,7 @@ void DrawingML::WriteBlipFill( const Reference< XPropertySet >& rXPropSet, const
{
SAL_INFO("oox.shape", "URL: " << sBitmapURL);
mpFS->startElementNS( nXmlNamespace , XML_blipFill, XML_rotWithShape, "0", FSEND );
mpFS->startElementNS( nXmlNamespace , XML_blipFill, FSEND );
WriteBlip( rXPropSet, sBitmapURL, bRelPathToMedia );
......
......@@ -161,7 +161,6 @@ public:
void testTdf100926();
void testTdf89064();
void testTdf108925();
void testTdf109067();
bool checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber, std::vector<sal_uInt8>& rExpected);
void testPatternImport();
......@@ -231,7 +230,6 @@ public:
CPPUNIT_TEST(testPatternImport);
CPPUNIT_TEST(testTdf89064);
CPPUNIT_TEST(testTdf108925);
CPPUNIT_TEST(testTdf109067);
CPPUNIT_TEST_SUITE_END();
};
......@@ -2208,17 +2206,6 @@ void SdImportTest::testTdf108925()
xDocShRef->DoClose();
}
void SdImportTest::testTdf109067()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf109067.pptx"), PPTX);
uno::Reference< beans::XPropertySet > xShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
awt::Gradient gradient;
CPPUNIT_ASSERT(xShape->getPropertyValue("FillGradient") >>= gradient);
CPPUNIT_ASSERT_EQUAL(sal_Int16(450), gradient.Angle);
xDocShRef->DoClose();
}
CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment