summaryrefslogtreecommitdiff
path: root/sfx2/source/view/ipclient.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /sfx2/source/view/ipclient.cxx
parent17d821af6bb9df93569836a92f6bed975587fc6c (diff)
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle" Except some modules have their own foo::tools namespace, so there have to use ::tools::Rectangle. This commit just moves the class from the global namespace, it does not update pre/postwin.h yet. Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2 Reviewed-on: https://gerrit.libreoffice.org/35923 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sfx2/source/view/ipclient.cxx')
-rw-r--r--sfx2/source/view/ipclient.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index f35b41aa379c..9fe365663211 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -100,7 +100,7 @@ class SfxInPlaceClient_Impl : public ::cppu::WeakImplHelper< embed::XEmbeddedCli
{
public:
Timer m_aTimer; // activation timeout, starts after object connection
- Rectangle m_aObjArea; // area of object in coordinate system of the container (without scaling)
+ tools::Rectangle m_aObjArea; // area of object in coordinate system of the container (without scaling)
Fraction m_aScaleWidth; // scaling that was applied to the object when it was not active
Fraction m_aScaleHeight;
SfxInPlaceClient* m_pClient;
@@ -390,7 +390,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement()
throw uno::RuntimeException();
// apply scaling to object area and convert to pixels
- Rectangle aRealObjArea( m_aObjArea );
+ tools::Rectangle aRealObjArea( m_aObjArea );
aRealObjArea.SetSize( Size( Fraction( aRealObjArea.GetWidth() ) * m_aScaleWidth,
Fraction( aRealObjArea.GetHeight() ) * m_aScaleHeight ) );
@@ -405,7 +405,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle()
throw uno::RuntimeException();
// currently(?) same as placement
- Rectangle aRealObjArea( m_aObjArea );
+ tools::Rectangle aRealObjArea( m_aObjArea );
aRealObjArea.SetSize( Size( Fraction( aRealObjArea.GetWidth() ) * m_aScaleWidth,
Fraction( aRealObjArea.GetHeight() ) * m_aScaleHeight ) );
@@ -438,14 +438,14 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo
// check if the change is at least one pixel in size
awt::Rectangle aOldRect = getPlacement();
- Rectangle aNewPixelRect = VCLRectangle( aPosRect );
- Rectangle aOldPixelRect = VCLRectangle( aOldRect );
+ tools::Rectangle aNewPixelRect = VCLRectangle( aPosRect );
+ tools::Rectangle aOldPixelRect = VCLRectangle( aOldRect );
if ( aOldPixelRect == aNewPixelRect )
// nothing has changed
return;
// new scaled object area
- Rectangle aNewLogicRect = m_pClient->GetEditWin()->PixelToLogic( aNewPixelRect );
+ tools::Rectangle aNewLogicRect = m_pClient->GetEditWin()->PixelToLogic( aNewPixelRect );
// all the size changes in this method should happen without scaling
// SfxBooleanFlagGuard aGuard( m_bResizeNoScale, sal_True );
@@ -677,7 +677,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
}
-bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
+bool SfxInPlaceClient::SetObjArea( const tools::Rectangle& rArea )
{
if( rArea != m_xImp->m_aObjArea )
{
@@ -692,14 +692,14 @@ bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
}
-const Rectangle& SfxInPlaceClient::GetObjArea() const
+const tools::Rectangle& SfxInPlaceClient::GetObjArea() const
{
return m_xImp->m_aObjArea;
}
-Rectangle SfxInPlaceClient::GetScaledObjArea() const
+tools::Rectangle SfxInPlaceClient::GetScaledObjArea() const
{
- Rectangle aRealObjArea( m_xImp->m_aObjArea );
+ tools::Rectangle aRealObjArea( m_xImp->m_aObjArea );
aRealObjArea.SetSize( Size( Fraction( aRealObjArea.GetWidth() ) * m_xImp->m_aScaleWidth,
Fraction( aRealObjArea.GetHeight() ) * m_xImp->m_aScaleHeight ) );
return aRealObjArea;
@@ -722,7 +722,7 @@ void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fractio
}
-void SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight )
+void SfxInPlaceClient::SetObjAreaAndScale( const tools::Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight )
{
if( rArea != m_xImp->m_aObjArea || m_xImp->m_aScaleWidth != rScaleWidth || m_xImp->m_aScaleHeight != rScaleHeight )
{
@@ -754,7 +754,7 @@ void SfxInPlaceClient::Invalidate()
// TODO/LATER: do we need both?
// the object area is provided in logical coordinates of the window but without scaling applied
- Rectangle aRealObjArea( m_xImp->m_aObjArea );
+ tools::Rectangle aRealObjArea( m_xImp->m_aObjArea );
aRealObjArea.SetSize( Size( Fraction( aRealObjArea.GetWidth() ) * m_xImp->m_aScaleWidth,
Fraction( aRealObjArea.GetHeight() ) * m_xImp->m_aScaleHeight ) );
m_pEditWin->Invalidate( aRealObjArea );
@@ -903,7 +903,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
MapMode aClientMap( GetEditWin()->GetMapMode().GetMapUnit() );
Size aNewSize = GetEditWin()->LogicToLogic( Size( aSize.Width, aSize.Height ), &aObjectMap, &aClientMap );
- Rectangle aScaledArea = GetScaledObjArea();
+ tools::Rectangle aScaledArea = GetScaledObjArea();
m_xImp->m_aObjArea.SetSize( aNewSize );
m_xImp->m_aScaleWidth = Fraction( aScaledArea.GetWidth(), aNewSize.Width() );
m_xImp->m_aScaleHeight = Fraction( aScaledArea.GetHeight(), aNewSize.Height() );
@@ -957,7 +957,7 @@ void SfxInPlaceClient::ObjectAreaChanged()
// dummy implementation
}
-void SfxInPlaceClient::RequestNewObjectArea( Rectangle& )
+void SfxInPlaceClient::RequestNewObjectArea( tools::Rectangle& )
{
// dummy implementation
}