dev/null |binary
include/oox/drawingml/shape.hxx | 3 ---
oox/source/drawingml/shape.cxx | 2 --
oox/source/drawingml/shapecontext.cxx | 2 --
oox/source/ppt/pptshape.cxx | 4 ----
sd/qa/unit/import-tests2.cxx | 11 -----------
6 files changed, 22 deletions(-)
New commits:
commit 4e2c70024c2370b2fc3514ee52ec433be998ec57
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Oct 23 15:34:58 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Oct 30 13:59:34 2023 +0100
tdf#157679: Revert "pptx: import shape text from master page"
This reverts commit ae3b97a69688553e6c40ef4b64655db09d5a0f5e.
Change-Id: I39fd84b5efbff0a2cafe090f4f866c801cef19b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158357
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 204e8a890a7c..aa1b1dbf2289 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -236,8 +236,6 @@ public:
void setTxbxHasLinkedTxtBox( const bool rhs){
mbHasLinkedTxbx = rhs; };
const LinkedTxbxAttr& getLinkedTxbxAttributes() const { return
maLinkedTxbxAttr; };
bool isLinkedTxbx() const { return mbHasLinkedTxbx; };
- void setHasCustomPrompt(bool bValue) { mbHasCustomPrompt =
bValue; }
- bool hasCustomPrompt() { return mbHasCustomPrompt; }
void setZOrder(sal_Int32 nZOrder) { mnZOrder = nZOrder; }
@@ -394,7 +392,6 @@ private:
bool mbTextBox; ///< This shape has a textbox.
LinkedTxbxAttr maLinkedTxbxAttr;
bool mbHasLinkedTxbx; // this text box has
linked text box ?
- bool mbHasCustomPrompt; // indicates that it's
not a generic placeholder
css::uno::Sequence<css::beans::PropertyValue> maDiagramDoms;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index c8149a087773..ff3d203f96ea 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -150,7 +150,6 @@ Shape::Shape( const char* pServiceName, bool bDefaultHeight
)
, mbWps( false )
, mbTextBox( false )
, mbHasLinkedTxbx( false )
-, mbHasCustomPrompt( false )
, maDiagramDoms( 0 )
, mpDiagramHelper( nullptr )
{
@@ -195,7 +194,6 @@ Shape::Shape( const ShapePtr& pSourceShape )
, mbWps( pSourceShape->mbWps )
, mbTextBox( pSourceShape->mbTextBox )
, mbHasLinkedTxbx(false)
-, mbHasCustomPrompt( pSourceShape->mbHasCustomPrompt )
, maDiagramDoms( pSourceShape->maDiagramDoms )
, mnZOrder(pSourceShape->mnZOrder)
, mnZOrderOff(pSourceShape->mnZOrderOff)
diff --git a/oox/source/drawingml/shapecontext.cxx
b/oox/source/drawingml/shapecontext.cxx
index 6407fb58a1f3..73fdab79508e 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -89,8 +89,6 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
aElementToken, const
mpShapePtr->setSubType( rAttribs.getToken( XML_type, XML_obj ) );
if( rAttribs.hasAttribute( XML_idx ) )
mpShapePtr->setSubTypeIndex( rAttribs.getInteger( XML_idx, 0 ) );
- if( rAttribs.hasAttribute( XML_hasCustomPrompt ) )
- mpShapePtr->setHasCustomPrompt( rAttribs.getBool(
XML_hasCustomPrompt, false ) );
break;
// nvSpPr CT_ShapeNonVisual end
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index dc8d16ae6d37..733aa2a73aed 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -457,10 +457,6 @@ void PPTShape::addShape(
Reference < XText > xText(mxShape, UNO_QUERY);
if (xText.is())
{
- if (mpPlaceholder && mpPlaceholder->getTextBody() &&
!mpPlaceholder->getTextBody()->isEmpty()
- && mpPlaceholder->hasCustomPrompt())
-
xText->setString(mpPlaceholder->getTextBody()->toString());
-
TextCharacterProperties aCharStyleProperties;
getTextBody()->ApplyStyleEmpty(rFilterBase, xText,
aCharStyleProperties, mpMasterTextListStyle);
}
diff --git a/sd/qa/unit/data/pptx/shape-master-text.pptx
b/sd/qa/unit/data/pptx/shape-master-text.pptx
deleted file mode 100644
index ca056b852d3a..000000000000
Binary files a/sd/qa/unit/data/pptx/shape-master-text.pptx and /dev/null differ
diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx
index 0ca3513ae00c..44eacbf1da05 100644
--- a/sd/qa/unit/import-tests2.cxx
+++ b/sd/qa/unit/import-tests2.cxx
@@ -1904,17 +1904,6 @@ CPPUNIT_TEST_FIXTURE(SdImportTest2,
testOverflowBehaviorClip)
}
}
-CPPUNIT_TEST_FIXTURE(SdImportTest2, testShapeMasterText)
-{
- createSdImpressDoc("pptx/shape-master-text.pptx");
- uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0));
-
- uno::Reference<text::XTextRange> const xParagraph(getParagraphFromShape(0,
xShape));
-
- uno::Reference<text::XTextRange> xRun(getRunFromParagraph(0, xParagraph));
- CPPUNIT_ASSERT_EQUAL(OUString("Custom"), xRun->getString());
-}
-
CPPUNIT_TEST_FIXTURE(SdImportTest2, testIndentDuplication)
{
createSdImpressDoc("pptx/formatting-bullet-indent.pptx");
