Kaydet (Commit) 496f11ad authored tarafından Szymon Kłos's avatar Szymon Kłos Kaydeden (comit) Andras Timar

ODP: export TextPreRotateAngle

Reviewed-on: https://gerrit.libreoffice.org/43910Reviewed-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
Tested-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/44079Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
Tested-by: 's avatarAndras Timar <andras.timar@collabora.com>
(cherry picked from commit e7a0948d)

Change-Id: I13eb005195ebbdee5016bf279cba423e388723a0
üst d5c7c8d8
......@@ -94,6 +94,7 @@ public:
void testTransparentBackground();
void testEmbeddedPdf();
void testTdf100926();
void testTextRotation();
CPPUNIT_TEST_SUITE(SdExportTest);
......@@ -110,6 +111,7 @@ public:
CPPUNIT_TEST(testTransparentBackground);
CPPUNIT_TEST(testEmbeddedPdf);
CPPUNIT_TEST(testTdf100926);
CPPUNIT_TEST(testTextRotation);
CPPUNIT_TEST_SUITE_END();
......@@ -684,6 +686,28 @@ void SdExportTest::testTdf100926()
xDocShRef->DoClose();
}
void SdExportTest::testTextRotation()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-text-rotate.pptx"), PPTX);
utl::TempFile tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
uno::Reference<drawing::XDrawPage> xPage(getPage(0, xDocShRef));
uno::Reference<beans::XPropertySet> xPropSet(getShape(0, xPage));
CPPUNIT_ASSERT(xPropSet.is());
auto aGeomPropSeq = xPropSet->getPropertyValue("CustomShapeGeometry").get<uno::Sequence<beans::PropertyValue>>();
comphelper::SequenceAsHashMap aCustomShapeGeometry(aGeomPropSeq);
auto it = aCustomShapeGeometry.find("TextRotateAngle");
CPPUNIT_ASSERT(it != aCustomShapeGeometry.end());
CPPUNIT_ASSERT_EQUAL((double)(-90), aCustomShapeGeometry["TextRotateAngle"].get<double>());
xDocShRef->DoClose();
}
CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
......
......@@ -93,6 +93,7 @@ namespace xmloff { namespace EnhancedCustomShapeToken {
EAS_MirroredY,
EAS_ViewBox,
EAS_TextRotateAngle,
EAS_TextPreRotateAngle,
EAS_ExtrusionAllowed,
EAS_ConcentricGradientFillAllowed,
EAS_TextPathAllowed,
......
......@@ -108,6 +108,7 @@ static const TokenTable pTokenTableArray[] =
{ "MirroredY", EAS_MirroredY },
{ "ViewBox", EAS_ViewBox },
{ "TextRotateAngle", EAS_TextRotateAngle },
{ "TextPreRotateAngle", EAS_TextPreRotateAngle },
{ "ExtrusionAllowed", EAS_ExtrusionAllowed },
{ "TextPathAllowed", EAS_TextPathAllowed },
{ "ConcentricGradientFillAllowed", EAS_ConcentricGradientFillAllowed },
......
......@@ -4268,10 +4268,11 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
}
}
break;
case EAS_TextPreRotateAngle :
case EAS_TextRotateAngle :
{
double fTextRotateAngle = 0;
if ( rGeoProp.Value >>= fTextRotateAngle )
if ( ( rGeoProp.Value >>= fTextRotateAngle ) && fTextRotateAngle != 0 )
{
::sax::Converter::convertDouble(
aStrBuffer, fTextRotateAngle );
......
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