summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2011-03-23 18:01:22 +0100
committerLuboš Luňák <l.lunak@suse.cz>2011-03-24 18:20:59 +0100
commit33ec141cbab8a5a314e7bdb7688bb5e8d9a0d84e (patch)
tree3c2c22dd3d2870325275d4a2ccb0a433ca9c2251 /svx
parent1c0075b2aa5f95d0fb6ecbbb9e306e6503dc63c2 (diff)
fix incorrect override of TakeTextRect()
bool and sal_Bool is not the same
Diffstat (limited to 'svx')
-rwxr-xr-xsvx/inc/svx/svdoashp.hxx2
-rwxr-xr-xsvx/inc/svx/svdomeas.hxx2
-rwxr-xr-xsvx/inc/svx/svdotext.hxx2
-rwxr-xr-xsvx/source/svdraw/svdoashp.cxx2
-rwxr-xr-xsvx/source/svdraw/svdomeas.cxx2
-rwxr-xr-xsvx/source/svdraw/svdotext.cxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 1f05850ad2..7727a35e98 100755
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -224,7 +224,7 @@ public:
virtual void EndTextEdit( SdrOutliner& rOutl );
virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const;
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 TakeObjNameSingul(String& rName) const;
diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx
index 129ad66c30..e635256128 100755
--- a/svx/inc/svx/svdomeas.hxx
+++ b/svx/inc/svx/svdomeas.hxx
@@ -146,7 +146,7 @@ public:
virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
virtual const Size& GetTextSize() const;
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 TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index 23ac8c5eaa..7148b74ed9 100755
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -389,7 +389,7 @@ public:
// Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
// der des EditOutliners) und die PaperSize gesetzt.
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;
const GeoStat& GetGeoStat() const { return aGeo; }
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 76f43df2b7..cf7dfd82dc 100755
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2968,7 +2968,7 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const
SdrTextObj::TakeTextAnchorRect( rAnchorRect );
}
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
TakeTextAnchorRect(aAnkRect);
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index f27f6db300..09a0d6a4fb 100755
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -1300,7 +1300,7 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject)
}
void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
- Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
+ Rectangle* pAnchorRect, bool bLineWidth ) const
{
if (bTextDirty) UndirtyText();
SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 304c713d69..28d0461d47 100755
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -831,7 +831,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
}
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
TakeTextAnchorRect(aAnkRect);