summaryrefslogtreecommitdiff
path: root/editeng/source/uno
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source/uno')
-rw-r--r--editeng/source/uno/unoedhlp.cxx4
-rw-r--r--editeng/source/uno/unoedprx.cxx14
-rw-r--r--editeng/source/uno/unofored.cxx10
-rw-r--r--editeng/source/uno/unoforou.cxx10
-rw-r--r--editeng/source/uno/unotext.cxx8
-rw-r--r--editeng/source/uno/unoviwou.cxx8
6 files changed, 27 insertions, 27 deletions
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 54839155d4c4..00f27fddea8e 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -255,9 +255,9 @@ Point SvxEditSourceHelper::UserSpaceToEE( const Point& rPoint, const Size& rEESi
return bIsVertical ? Point( rPoint.Y(), -rPoint.X() + rEESize.Height() ) : rPoint;
}
-Rectangle SvxEditSourceHelper::EEToUserSpace( const Rectangle& rRect, const Size& rEESize, bool bIsVertical )
+tools::Rectangle SvxEditSourceHelper::EEToUserSpace( const tools::Rectangle& rRect, const Size& rEESize, bool bIsVertical )
{
- return bIsVertical ? Rectangle( EEToUserSpace(rRect.BottomLeft(), rEESize, bIsVertical),
+ return bIsVertical ? tools::Rectangle( EEToUserSpace(rRect.BottomLeft(), rEESize, bIsVertical),
EEToUserSpace(rRect.TopRight(), rEESize, bIsVertical) ) : rRect;
}
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 363ed425f6c9..7ddbb28a4d3a 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -693,7 +693,7 @@ bool SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
return mpTextForwarder->GetUpdateModeForAcc();
}
-Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const
+tools::Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const
{
assert(mpTextForwarder && "SvxAccessibleTextAdapter: no forwarder");
@@ -702,7 +702,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
// preset if anything goes wrong below
// n-th char in GetParagraphIndex's paragraph
- Rectangle aRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
+ tools::Rectangle aRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
if( aIndex.InBullet() )
{
@@ -740,7 +740,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
aFont,
mpTextForwarder->GetText( aSel ) );
- Rectangle aStartRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
+ tools::Rectangle aStartRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
aStringWrap.GetCharacterBounds( aIndex.GetFieldOffset(), aRect );
aRect.Move( aStartRect.Left(), aStartRect.Top() );
@@ -751,7 +751,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
return aRect;
}
-Rectangle SvxAccessibleTextAdapter::GetParaBounds( sal_Int32 nPara ) const
+tools::Rectangle SvxAccessibleTextAdapter::GetParaBounds( sal_Int32 nPara ) const
{
assert(mpTextForwarder && "SvxAccessibleTextAdapter: no forwarder");
@@ -762,7 +762,7 @@ Rectangle SvxAccessibleTextAdapter::GetParaBounds( sal_Int32 nPara ) const
aBulletInfo.nType != SVX_NUM_BITMAP )
{
// include bullet in para bounding box
- Rectangle aRect( mpTextForwarder->GetParaBounds( nPara ) );
+ tools::Rectangle aRect( mpTextForwarder->GetParaBounds( nPara ) );
aRect.Union( aBulletInfo.aBounds );
@@ -846,7 +846,7 @@ bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32&
aFont,
mpTextForwarder->GetText( aSelection ) );
- Rectangle aRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
+ tools::Rectangle aRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
Point aPoint = rPoint;
aPoint.Move( -aRect.Left(), -aRect.Top() );
@@ -1140,7 +1140,7 @@ bool SvxAccessibleTextEditViewAdapter::IsValid() const
return false;
}
-Rectangle SvxAccessibleTextEditViewAdapter::GetVisArea() const
+tools::Rectangle SvxAccessibleTextEditViewAdapter::GetVisArea() const
{
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index f2063e4d515a..2d18e32c3a33 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -285,7 +285,7 @@ EBulletInfo SvxEditEngineForwarder::GetBulletInfo( sal_Int32 ) const
return EBulletInfo();
}
-Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const
+tools::Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const
{
// EditEngine's 'internal' methods like GetCharacterBounds()
// don't rotate for vertical text.
@@ -296,7 +296,7 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nInd
// #108900# Handle virtual position one-past-the end of the string
if( nIndex >= rEditEngine.GetTextLen(nPara) )
{
- Rectangle aLast;
+ tools::Rectangle aLast;
if( nIndex )
{
@@ -332,7 +332,7 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nInd
}
}
-Rectangle SvxEditEngineForwarder::GetParaBounds( sal_Int32 nPara ) const
+tools::Rectangle SvxEditEngineForwarder::GetParaBounds( sal_Int32 nPara ) const
{
const Point aPnt = rEditEngine.GetDocPosTopLeft( nPara );
sal_uLong nWidth;
@@ -348,14 +348,14 @@ Rectangle SvxEditEngineForwarder::GetParaBounds( sal_Int32 nPara ) const
nHeight = rEditEngine.GetTextHeight();
nTextWidth = rEditEngine.GetTextHeight();
- return Rectangle( nTextWidth - aPnt.Y() - nWidth, 0, nTextWidth - aPnt.Y(), nHeight );
+ return tools::Rectangle( nTextWidth - aPnt.Y() - nWidth, 0, nTextWidth - aPnt.Y(), nHeight );
}
else
{
nWidth = rEditEngine.CalcTextWidth();
nHeight = rEditEngine.GetTextHeight( nPara );
- return Rectangle( 0, aPnt.Y(), nWidth, aPnt.Y() + nHeight );
+ return tools::Rectangle( 0, aPnt.Y(), nWidth, aPnt.Y() + nHeight );
}
}
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 6e75f2ae44f8..f1d16b76fda1 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -287,7 +287,7 @@ EBulletInfo SvxOutlinerForwarder::GetBulletInfo( sal_Int32 nPara ) const
return rOutliner.GetBulletInfo( nPara );
}
-Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const
+tools::Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const
{
// EditEngine's 'internal' methods like GetCharacterBounds()
// don't rotate for vertical text.
@@ -298,7 +298,7 @@ Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex
// #108900# Handle virtual position one-past-the end of the string
if( nIndex >= GetTextLen(nPara) )
{
- Rectangle aLast;
+ tools::Rectangle aLast;
if( nIndex )
{
@@ -334,7 +334,7 @@ Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex
}
}
-Rectangle SvxOutlinerForwarder::GetParaBounds( sal_Int32 nPara ) const
+tools::Rectangle SvxOutlinerForwarder::GetParaBounds( sal_Int32 nPara ) const
{
Point aPnt = rOutliner.GetDocPosTopLeft( nPara );
Size aSize = rOutliner.CalcTextSize();
@@ -346,13 +346,13 @@ Rectangle SvxOutlinerForwarder::GetParaBounds( sal_Int32 nPara ) const
// don't rotate.
sal_uLong nWidth = rOutliner.GetTextHeight( nPara );
- return Rectangle( aSize.Width() - aPnt.Y() - nWidth, 0, aSize.Width() - aPnt.Y(), aSize.Height() );
+ return tools::Rectangle( aSize.Width() - aPnt.Y() - nWidth, 0, aSize.Width() - aPnt.Y(), aSize.Height() );
}
else
{
sal_uLong nHeight = rOutliner.GetTextHeight( nPara );
- return Rectangle( 0, aPnt.Y(), aSize.Width(), aPnt.Y() + nHeight );
+ return tools::Rectangle( 0, aPnt.Y(), aSize.Width(), aPnt.Y() + nHeight );
}
}
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 0263f955b9f4..e18a660e5df3 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2439,14 +2439,14 @@ EBulletInfo SvxDummyTextSource::GetBulletInfo( sal_Int32 ) const
return EBulletInfo();
}
-Rectangle SvxDummyTextSource::GetCharBounds( sal_Int32, sal_Int32 ) const
+tools::Rectangle SvxDummyTextSource::GetCharBounds( sal_Int32, sal_Int32 ) const
{
- return Rectangle();
+ return tools::Rectangle();
}
-Rectangle SvxDummyTextSource::GetParaBounds( sal_Int32 ) const
+tools::Rectangle SvxDummyTextSource::GetParaBounds( sal_Int32 ) const
{
- return Rectangle();
+ return tools::Rectangle();
}
MapMode SvxDummyTextSource::GetMapMode() const
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 106002919d30..96f445e7cb02 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -41,7 +41,7 @@ SvxDrawOutlinerViewForwarder::~SvxDrawOutlinerViewForwarder()
Point SvxDrawOutlinerViewForwarder::GetTextOffset() const
{
// calc text offset from shape anchor
- Rectangle aOutputRect( mrOutlinerView.GetOutputArea() );
+ tools::Rectangle aOutputRect( mrOutlinerView.GetOutputArea() );
return aOutputRect.TopLeft() - maTextShapeTopLeft;
}
@@ -51,13 +51,13 @@ bool SvxDrawOutlinerViewForwarder::IsValid() const
return true;
}
-Rectangle SvxDrawOutlinerViewForwarder::GetVisArea() const
+tools::Rectangle SvxDrawOutlinerViewForwarder::GetVisArea() const
{
OutputDevice* pOutDev = mrOutlinerView.GetWindow();
if( pOutDev )
{
- Rectangle aVisArea = mrOutlinerView.GetVisArea();
+ tools::Rectangle aVisArea = mrOutlinerView.GetVisArea();
Point aTextOffset( GetTextOffset() );
aVisArea.Move( aTextOffset.X(), aTextOffset.Y() );
@@ -76,7 +76,7 @@ Rectangle SvxDrawOutlinerViewForwarder::GetVisArea() const
}
}
- return Rectangle();
+ return tools::Rectangle();
}
Point SvxDrawOutlinerViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const