Skip to content

C
core
Kaydet (Commit) 687e5229 authored tarafından Luboš Luňák's avatar Luboš Luňák
Dosyalara gözat
Seçenekler

fix incorrect override of TakeTextRect() 

bool and sal_Bool is not the same
üst 6f287465
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
svx/inc/svx/svdoashp.hxx
Dosyayı görüntüle @ 687e5229
...@@ -224,7 +224,7 @@ public: ...@@ -224,7 +224,7 @@ public:
virtual void EndTextEdit( SdrOutliner& rOutl ); virtual void EndTextEdit( SdrOutliner& rOutl );
virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const;
virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const;
virtual void operator=(const SdrObject& rObj); virtual void operator=(const SdrObject& rObj);
virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNameSingul(String& rName) const;
......
svx/inc/svx/svdomeas.hxx
Dosyayı görüntüle @ 687e5229
...@@ -146,7 +146,7 @@ public: ...@@ -146,7 +146,7 @@ public:
virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
virtual const Size& GetTextSize() const; virtual const Size& GetTextSize() const;
virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const;
virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual sal_uInt16 GetOutlinerViewAnchorMode() const; virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
......
svx/inc/svx/svdotext.hxx
Dosyayı görüntüle @ 687e5229
...@@ -389,7 +389,7 @@ public: ...@@ -389,7 +389,7 @@ public:
// Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
// der des EditOutliners) und die PaperSize gesetzt. // der des EditOutliners) und die PaperSize gesetzt.
virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const;
virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const;
const GeoStat& GetGeoStat() const { return aGeo; } const GeoStat& GetGeoStat() const { return aGeo; }
......
svx/source/svdraw/svdoashp.cxx
Dosyayı görüntüle @ 687e5229
...@@ -2968,7 +2968,7 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const ...@@ -2968,7 +2968,7 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const
SdrTextObj::TakeTextAnchorRect( rAnchorRect ); SdrTextObj::TakeTextAnchorRect( rAnchorRect );
} }
void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const Rectangle* pAnchorRect, bool /*bLineWidth*/) const
{ {
Rectangle aAnkRect; // Rect innerhalb dem geankert wird Rectangle aAnkRect; // Rect innerhalb dem geankert wird
TakeTextAnchorRect(aAnkRect); TakeTextAnchorRect(aAnkRect);
......
svx/source/svdraw/svdomeas.cxx
Dosyayı görüntüle @ 687e5229
...@@ -1300,7 +1300,7 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) ...@@ -1300,7 +1300,7 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject)
} }
void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
Rectangle* pAnchorRect, sal_Bool bLineWidth ) const Rectangle* pAnchorRect, bool bLineWidth ) const
{ {
if (bTextDirty) UndirtyText(); if (bTextDirty) UndirtyText();
SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
......
svx/source/svdraw/svdotext.cxx
Dosyayı görüntüle @ 687e5229
...@@ -831,7 +831,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const ...@@ -831,7 +831,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
} }
void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
Rectangle* pAnchorRect, sal_Bool bLineWidth ) const Rectangle* pAnchorRect, bool bLineWidth ) const
{ {
Rectangle aAnkRect; // Rect innerhalb dem geankert wird Rectangle aAnkRect; // Rect innerhalb dem geankert wird
TakeTextAnchorRect(aAnkRect); TakeTextAnchorRect(aAnkRect);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment