diff options
| -rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/textattr.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/transfrm.cxx | 4 | ||||
| -rw-r--r-- | include/svx/svdobj.hxx | 3 | ||||
| -rw-r--r-- | include/svx/svdotable.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svdotext.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 5 |
7 files changed, 15 insertions, 9 deletions
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 1da5012bcce3..c5b6686da099 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1832,9 +1832,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); if( ( pObj->GetObjInventor() == SdrInventor ) && ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && - // #i121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer - 0 != dynamic_cast< const SdrTextObj* >(pObj) && - static_cast< const SdrTextObj* >(pObj)->HasText() ) + pObj->HasText() ) { OSL_FAIL("AutoWidth/AutoHeight should be enabled"); } diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index aaf5e0a5412a..08ab94b35b5e 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -494,9 +494,7 @@ void SvxTextAttrPage::Construct() case OBJ_OUTLINETEXT : case OBJ_CAPTION : { - if( // #i121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer - 0 != dynamic_cast< const SdrTextObj* >(pObj) && - static_cast< const SdrTextObj* >(pObj)->HasText() ) + if(pObj->HasText()) { // contour NOT possible for pure text objects bContourEnabled = sal_False; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index b79795dffe70..c2487fdfaee5 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -788,9 +788,7 @@ void SvxPositionSizeTabPage::Construct() if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && - // #i121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer - 0 != dynamic_cast< const SdrTextObj* >(pObj) && - static_cast< const SdrTextObj* >(pObj)->HasText()) + pObj->HasText()) { mbAdjustDisabled = false; maFlAdjust.Enable(); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index ae32d08dd22f..7885c8a273b8 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -1050,6 +1050,9 @@ public: /// @see mbDoNotInsertIntoPageAutomatically bool IsDoNotInsertIntoPageAutomatically() const; + // #i121917# + virtual bool HasText() const; + protected: /** Sets a new UNO shape * diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 6ec0334c2d21..f14b72502d18 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -172,7 +172,9 @@ public: /** returns the index of the text that contains the given point or -1 */ virtual sal_Int32 CheckTextHit(const Point& rPnt) const; + // #i121917# virtual bool HasText() const; + sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } bool IsTextEditActive( const sdr::table::CellPos& rPos ); diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index c6f0eed25cdf..36bf4a4819e9 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -336,7 +336,9 @@ public: bool IsFitToSize() const; SdrObjKind GetTextKind() const { return eTextKind; } + // #i121917# virtual bool HasText() const; + bool HasEditText() const; sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 571b7296bb4a..b6e760f07060 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3270,6 +3270,11 @@ bool SdrObject::IsDoNotInsertIntoPageAutomatically() const return mbDoNotInsertIntoPageAutomatically; } +// #i121917# +bool SdrObject::HasText() const +{ + return false; +} SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel) { |