cui/source/tabpages/swpossizetabpage.cxx | 4 +--- cui/source/tabpages/textattr.cxx | 4 +--- cui/source/tabpages/transfrm.cxx | 4 +--- include/svx/svdobj.hxx | 3 +++ include/svx/svdotable.hxx | 2 ++ include/svx/svdotext.hxx | 2 ++ offapi/com/sun/star/awt/grid/XGridColumn.idl | 2 +- svx/source/svdraw/svdobj.cxx | 5 +++++ 8 files changed, 16 insertions(+), 10 deletions(-)
New commits: commit f39e8cadc74573a787641615406777da5a9e5343 Author: Herbert Dürr <[email protected]> Date: Wed Jul 17 12:43:36 2013 +0000 Resolves: #i116828# fix comment in XGridColumn IDL Patch by: Tsutomu Uchino <[email protected]> Found by: [email protected] Review by: Herbert Duerr (cherry picked from commit 17f5e0140232f9483dd461a0ea58d59b11280f71) Conflicts: offapi/com/sun/star/awt/grid/XGridColumn.idl Change-Id: I176dccf7d6e2016dbedea08423e2d08e8ff6f073 diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl index 2e3ca12..74cacb9 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumn.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl @@ -91,7 +91,7 @@ published interface XGridColumn */ [attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign; - /** A title is displayed in the column header row if UnoControlGridModel::ShowRowHeader() is set to `TRUE`**/ + /** A title is displayed in the column header row if UnoControlGridModel::ShowColumnHeader() is set to `TRUE`**/ [attribute] string Title; /** is the help text associated with the column. commit add80418d0cc7cf799a5b8fbb511d290437aaaf0 Author: Armin Le Grand <[email protected]> Date: Wed Jul 17 12:07:18 2013 +0000 Resolves: #i122720# Adapted HasText() to SdrObject (cherry picked from commit 880138a7794e7e641cdcf49277ed01b54ca93c59) Conflicts: cui/source/tabpages/swpossizetabpage.cxx cui/source/tabpages/textattr.cxx cui/source/tabpages/transfrm.cxx svx/inc/svx/svdobj.hxx svx/inc/svx/svdotable.hxx svx/inc/svx/svdotext.hxx svx/source/svdraw/svdobj.cxx Change-Id: Ic2564b845425ba63e6ae2ad6a80f3bfdb8a2f287 diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 1da5012..c5b6686 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 aaf5e0a..08ab94b 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 b79795d..c2487fd 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 ae32d08d..7885c8a 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 6ec0334..f14b725 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 c6f0eed..36bf4a4 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 571b729..b6e760f 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) {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
