diff options
| -rw-r--r-- | include/svx/svdotable.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svdotext.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 3 | ||||
| -rw-r--r-- | svx/source/table/svdotable.cxx | 14 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 2 |
5 files changed, 6 insertions, 17 deletions
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 2594a3544e3d..df738c29a44d 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -178,7 +178,7 @@ public: bool IsTextEditActive( const sdr::table::CellPos& rPos ); /** returns true only if we are in edit mode and the user actually changed anything */ - virtual bool IsRealyEdited() const SAL_OVERRIDE; + virtual bool IsReallyEdited() const SAL_OVERRIDE; // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index c7a585088285..ef8e0f1be513 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -363,7 +363,7 @@ public: virtual sal_Int32 getTextCount() const SAL_OVERRIDE; /** returns true only if we are in edit mode and the user actually changed anything */ - virtual bool IsRealyEdited() const; + virtual bool IsReallyEdited() const; /** changes the current active text */ virtual void setActiveText( sal_Int32 nIndex ); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 4ef80f611d27..d15e64201867 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1759,12 +1759,11 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b } } -bool SdrTextObj::IsRealyEdited() const +bool SdrTextObj::IsReallyEdited() const { return pEdtOutl && pEdtOutl->IsModified(); } - // moved inlines here form hxx long SdrTextObj::GetEckenradius() const diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 961790459695..ce05325b05bf 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -693,7 +693,7 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe // Optimization: SdrTableObj::SetChanged() can call this very often, repeatedly // with the same settings, noticeably increasing load time. Skip if already done. bool bInteractiveMightGrowBecauseTextChanged = - mpTableObj->IsRealyEdited() && (mpTableObj->IsAutoGrowHeight() || mpTableObj->IsAutoGrowHeight()); + mpTableObj->IsReallyEdited() && (mpTableObj->IsAutoGrowHeight() || mpTableObj->IsAutoGrowHeight()); WritingMode writingMode = mpTableObj->GetWritingMode(); if( bInteractiveMightGrowBecauseTextChanged || lastLayoutTable != this || lastLayoutInputRectangle != rArea @@ -2097,8 +2097,6 @@ bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2D return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon ); } - - // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has // to use (0,0) as upper left and will be scaled to the given size in the matrix. @@ -2107,22 +2105,16 @@ void SdrTableObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const SdrTextObj::TRSetBaseGeometry( rMatrix, rPolyPolygon ); } - - -bool SdrTableObj::IsRealyEdited() const +bool SdrTableObj::IsReallyEdited() const { return pEdtOutl && pEdtOutl->IsModified(); } - - bool SdrTableObj::IsFontwork() const { return false; } - - sal_uInt32 SdrTableObj::GetHdlCount() const { sal_uInt32 nCount = SdrTextObj::GetHdlCount(); @@ -2135,8 +2127,6 @@ sal_uInt32 SdrTableObj::GetHdlCount() const return nCount; } - - void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const { const sal_Int32 nRowCount = mpImpl->getRowCount(); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 0c164abe9eba..07e516832a7a 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -643,7 +643,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() mpOutliner->SetText( *pOutlinerParaObject ); // #91254# put text to object and set EmptyPresObj to FALSE - if( mpText && bOwnParaObj && pOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() ) + if( mpText && bOwnParaObj && pOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsReallyEdited() ) { mpObject->SetEmptyPresObj( false ); static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText ); |