Kaydet (Commit) dc024cdd authored tarafından Tamás Zolnai's avatar Tamás Zolnai

tdf#103792: No placeholder text imported for empty title shape

Change-Id: I95b4358f0d4311e8f427c8de18863049fb718d9b
Reviewed-on: https://gerrit.libreoffice.org/30731Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst ba2137d5
......@@ -1140,7 +1140,7 @@ Reference< XShape > const & Shape::createAndInsert(
}
}
}
xText->setString("");
Reference < XTextCursor > xAt = xText->createTextCursor();
getTextBody()->insertAt( rFilterBase, xText, xAt, aCharStyleProperties, mpMasterTextListStyle );
}
......
......@@ -142,7 +142,6 @@ void PPTShape::addShape(
{
sServiceName = "com.sun.star.presentation.TitleTextShape";
aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle();
bClearText = true;
}
break;
case XML_subTitle :
......
......@@ -127,6 +127,7 @@ public:
void testTdf99030();
void testTdf49561();
void testTdf103473();
void testTdf103792();
CPPUNIT_TEST_SUITE(SdImportTest);
......@@ -179,6 +180,7 @@ public:
CPPUNIT_TEST(testTdf99030);
CPPUNIT_TEST(testTdf49561);
CPPUNIT_TEST(testTdf103473);
CPPUNIT_TEST(testTdf103792);
CPPUNIT_TEST_SUITE_END();
};
......@@ -1504,6 +1506,24 @@ void SdImportTest::testTdf103473()
xDocShRef->DoClose();
}
void SdImportTest::testTdf103792()
{
// Title text shape on the actual slide contained no text neither a placeholder text.
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf103792.pptx"), PPTX);
const SdrPage *pPage = GetPage(1, xDocShRef);
CPPUNIT_ASSERT_MESSAGE("No page found", pPage != nullptr);
SdrObject *pObj = pPage->GetObj(0);
CPPUNIT_ASSERT_MESSAGE("Wrong object", pObj != nullptr);
SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>(pObj);
CPPUNIT_ASSERT_MESSAGE("Not a text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
CPPUNIT_ASSERT_EQUAL(OUString("Click to add Title"), aEdit.GetText(0));
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