cui/source/tabpages/swpossizetabpage.cxx | 4 +--- cui/source/tabpages/textattr.cxx | 4 +--- cui/source/tabpages/transfrm.cxx | 4 +--- offapi/com/sun/star/awt/grid/XGridColumn.idl | 2 +- svx/inc/svx/svdobj.hxx | 3 +++ svx/inc/svx/svdotable.hxx | 2 ++ svx/inc/svx/svdotext.hxx | 2 ++ svx/source/svdraw/svdobj.cxx | 6 ++++++ 8 files changed, 17 insertions(+), 10 deletions(-)
New commits: commit 17f5e0140232f9483dd461a0ea58d59b11280f71 Author: Herbert Dürr <[email protected]> Date: Wed Jul 17 12:43:36 2013 +0000 #i116828# fix comment in XGridColumn IDL Patch by: Tsutomu Uchino <[email protected]> Found by: [email protected] Review by: Herbert Duerr diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl index 61fb57d..6508b7f 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumn.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl @@ -96,7 +96,7 @@ published interface XGridColumn */ [attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign; - /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/ + /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowColumnHeader</method> is set to <true/>**/ [attribute] string Title; /** is the help text associated with the column. commit 880138a7794e7e641cdcf49277ed01b54ca93c59 Author: Armin Le Grand <[email protected]> Date: Wed Jul 17 12:07:18 2013 +0000 i122720 Adapted HasText() to SdrObject diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 8573ddc..3ae9de6 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1932,9 +1932,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) && - // #121917# 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() ) { DBG_ERROR("AutoWidth/AutoHeight should be enabled"); } diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 3135c2e..ec367ac 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -547,9 +547,7 @@ void SvxTextAttrPage::Construct() case OBJ_OUTLINETEXT : case OBJ_CAPTION : { - if( // #121917# 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()) { // Konturfluss ist NICHT bei reinen Textobjekten m�glich bContourEnabled = sal_False; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index fa67e05..50be633 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -842,9 +842,7 @@ void SvxPositionSizeTabPage::Construct() if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && - // #121917# 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/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 14a9301..ce0e1ba 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -1125,6 +1125,9 @@ public: Rectangle GetBLIPSizeRectangle() const; void SetBLIPSizeRectangle( const Rectangle& aRect ); + // #121917# + virtual bool HasText() const; + protected: void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape ); diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index 239acf1..7404fac 100644 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -184,7 +184,9 @@ public: /** returns the index of the text that contains the given point or -1 */ virtual sal_Int32 CheckTextHit(const Point& rPnt) const; + // #121917# virtual bool HasText() const; + sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } bool IsTextEditActive( const sdr::table::CellPos& rPos ); diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index dc5e858..0a3c70f 100644 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -338,7 +338,9 @@ public: FASTBOOL IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } SdrObjKind GetTextKind() const { return eTextKind; } + // #121917# virtual bool HasText() const; + FASTBOOL HasEditText() const; sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 2bfa847..499445c 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3179,6 +3179,12 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/ // this base class does not support different writing modes, so ignore the call } +// #121917# +bool SdrObject::HasText() const +{ + return false; +} + //////////////////////////////////////////////////////////////////////////////////////////////////// // // @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@ @@@@@@ @@@@ @@@@@ @@ @@
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
