From a5a571307fb3306b74ab46b085cde6388270a770 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Mar 2017 20:27:55 +0200 Subject: 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 Tested-by: Jenkins --- framework/source/layoutmanager/helpers.cxx | 8 +-- framework/source/layoutmanager/helpers.hxx | 6 +- framework/source/layoutmanager/layoutmanager.cxx | 4 +- .../source/layoutmanager/toolbarlayoutmanager.cxx | 82 +++++++++++----------- .../source/layoutmanager/toolbarlayoutmanager.hxx | 30 ++++---- framework/source/uiconfiguration/ImageList.cxx | 4 +- framework/source/uielement/statusbaritem.cxx | 2 +- 7 files changed, 68 insertions(+), 68 deletions(-) (limited to 'framework/source') diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 1c9ae72bb649..90c7e303ee3c 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -128,7 +128,7 @@ SystemWindow* getTopSystemWindow( const uno::Reference< awt::XWindow >& xWindow return nullptr; } -void setZeroRectangle( ::Rectangle& rRect ) +void setZeroRectangle( ::tools::Rectangle& rRect ) { rRect.setX(0); rRect.setY(0); @@ -224,7 +224,7 @@ void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUS } } -css::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ) +css::awt::Rectangle putRectangleValueToAWT( const ::tools::Rectangle& rRect ) { css::awt::Rectangle aRect; aRect.X = rRect.Left(); @@ -235,9 +235,9 @@ css::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ) return aRect; } -::Rectangle putAWTToRectangle( const css::awt::Rectangle& rRect ) +::tools::Rectangle putAWTToRectangle( const css::awt::Rectangle& rRect ) { - ::Rectangle aRect; + ::tools::Rectangle aRect; aRect.Left() = rRect.X; aRect.Top() = rRect.Y; aRect.Right() = rRect.Width; diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx index 2b0a259adbae..3f5362990f25 100644 --- a/framework/source/layoutmanager/helpers.hxx +++ b/framework/source/layoutmanager/helpers.hxx @@ -55,14 +55,14 @@ ToolBox* getToolboxPtr( vcl::Window* pWindow ); vcl::Window* getWindowFromXUIElement( const css::uno::Reference< css::ui::XUIElement >& xUIElement ); SystemWindow* getTopSystemWindow( const css::uno::Reference< css::awt::XWindow >& xWindow ); bool equalRectangles( const css::awt::Rectangle& rRect1, const css::awt::Rectangle& rRect2 ); -void setZeroRectangle( ::Rectangle& rRect ); +void setZeroRectangle( ::tools::Rectangle& rRect ); bool lcl_checkUIElement(const css::uno::Reference< css::ui::XUIElement >& xUIElement,css::awt::Rectangle& _rPosSize, css::uno::Reference< css::awt::XWindow >& _xWindow); css::uno::Reference< css::awt::XWindowPeer > createToolkitWindow( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::awt::XWindowPeer >& rParent, const char* pService ); WindowAlign ImplConvertAlignment( sal_Int16 aAlignment ); OUString getElementTypeFromResourceURL( const OUString& aResourceURL ); void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUString& aElementName ); -::Rectangle putAWTToRectangle( const css::awt::Rectangle& rRect ); -css::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ); +::tools::Rectangle putAWTToRectangle( const css::awt::Rectangle& rRect ); +css::awt::Rectangle putRectangleValueToAWT( const ::tools::Rectangle& rRect ); css::uno::Reference< css::frame::XModel > impl_getModelFromFrame( const css::uno::Reference< css::frame::XFrame >& rFrame ); bool implts_isPreviewModel( const css::uno::Reference< css::frame::XModel >& xModel ); bool implts_isFrameOrWindowTop( const css::uno::Reference< css::frame::XFrame >& xFrame ); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 1243f2d88205..c426d921121a 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1126,7 +1126,7 @@ bool LayoutManager::implts_hideStatusBar( bool bStoreState ) void LayoutManager::implts_setOffset( const sal_Int32 nBottomOffset ) { - ::Rectangle aOffsetRect; + ::tools::Rectangle aOffsetRect; setZeroRectangle( aOffsetRect ); aOffsetRect.setHeight( nBottomOffset ); @@ -2403,7 +2403,7 @@ bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContainerSiz // calculate the maximum size we have for the container window sal_Int32 nDisplay = xContainerTopWindow->getDisplay(); - Rectangle aWorkArea = Application::GetScreenPosSizePixel( nDisplay ); + tools::Rectangle aWorkArea = Application::GetScreenPosSizePixel( nDisplay ); if (( aWorkArea.GetWidth() > 0 ) && ( aWorkArea.GetHeight() > 0 )) { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index befb53f0f27b..508ecefc0fed 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -117,7 +117,7 @@ void SAL_CALL ToolbarLayoutManager::disposing( const lang::EventObject& aEvent ) awt::Rectangle ToolbarLayoutManager::getDockingArea() { SolarMutexResettableGuard aWriteLock; - Rectangle aNewDockingArea( m_aDockingArea ); + tools::Rectangle aNewDockingArea( m_aDockingArea ); aWriteLock.clear(); if ( isLayoutDirty() ) @@ -140,7 +140,7 @@ void ToolbarLayoutManager::setDockingArea( const awt::Rectangle& rDockingArea ) void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& rBorderSpace ) { SolarMutexClearableGuard aReadLock; - Rectangle aDockOffsets = m_aDockingAreaOffsets; + tools::Rectangle aDockOffsets = m_aDockingAreaOffsets; uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow ); uno::Reference< awt::XWindow > xTopDockAreaWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] ); uno::Reference< awt::XWindow > xBottomDockAreaWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] ); @@ -248,13 +248,13 @@ bool ToolbarLayoutManager::implts_isParentWindowVisible() const return bVisible; } -Rectangle ToolbarLayoutManager::implts_calcDockingArea() +tools::Rectangle ToolbarLayoutManager::implts_calcDockingArea() { SolarMutexClearableGuard aReadLock; UIElementVector aWindowVector( m_aUIElements ); aReadLock.clear(); - Rectangle aBorderSpace; + tools::Rectangle aBorderSpace; sal_Int32 nCurrRowColumn( 0 ); sal_Int32 nCurrPos( 0 ); sal_Int32 nCurrDockingArea( ui::DockingArea_DOCKINGAREA_TOP ); @@ -1057,7 +1057,7 @@ void ToolbarLayoutManager::setParentWindow( } } -void ToolbarLayoutManager::setDockingAreaOffsets( const ::Rectangle& rOffsets ) +void ToolbarLayoutManager::setDockingAreaOffsets( const ::tools::Rectangle& rOffsets ) { SolarMutexGuard g; m_aDockingAreaOffsets = rOffsets; @@ -2140,13 +2140,13 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D } } -::Rectangle ToolbarLayoutManager::implts_getWindowRectFromRowColumn( +::tools::Rectangle ToolbarLayoutManager::implts_getWindowRectFromRowColumn( ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const OUString& rExcludeElementName ) { - ::Rectangle aWinRect; + ::tools::Rectangle aWinRect; if (( DockingArea < ui::DockingArea_DOCKINGAREA_TOP ) || ( DockingArea > ui::DockingArea_DOCKINGAREA_RIGHT )) DockingArea = ui::DockingArea_DOCKINGAREA_TOP; @@ -2170,7 +2170,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D for ( sal_uInt32 i = 0; i < nCount; i++ ) { awt::Rectangle aWindowRect = rRowColumnWindowData.aRowColumnWindows[i]->getPosSize(); - ::Rectangle aRect( aWindowRect.X, aWindowRect.Y, aWindowRect.X+aWindowRect.Width, aWindowRect.Y+aWindowRect.Height ); + ::tools::Rectangle aRect( aWindowRect.X, aWindowRect.Y, aWindowRect.X+aWindowRect.Width, aWindowRect.Y+aWindowRect.Height ); aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() ))); if ( aRect.IsInside( rMousePos )) { @@ -2188,12 +2188,12 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D return aWinRect; } -::Rectangle ToolbarLayoutManager::implts_determineFrontDockingRect( +::tools::Rectangle ToolbarLayoutManager::implts_determineFrontDockingRect( ui::DockingArea eDockingArea, sal_Int32 nRowCol, - const ::Rectangle& rDockedElementRect, + const ::tools::Rectangle& rDockedElementRect, const OUString& rMovedElementName, - const ::Rectangle& rMovedElementRect ) + const ::tools::Rectangle& rMovedElementRect ) { SingleRowColumnWindowData aRowColumnWindowData; @@ -2204,7 +2204,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D else { sal_Int32 nSpace( 0 ); - ::Rectangle aFrontDockingRect( rMovedElementRect ); + ::tools::Rectangle aFrontDockingRect( rMovedElementRect ); const sal_uInt32 nCount = aRowColumnWindowData.aRowColumnWindows.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -2579,9 +2579,9 @@ void ToolbarLayoutManager::implts_setLayoutInProgress( bool bInProgress ) m_bLayoutInProgress = bInProgress; } -::Rectangle ToolbarLayoutManager::implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset ) +::tools::Rectangle ToolbarLayoutManager::implts_calcHotZoneRect( const ::tools::Rectangle& rRect, sal_Int32 nHotZoneOffset ) { - ::Rectangle aRect( rRect ); + ::tools::Rectangle aRect( rRect ); aRect.Left() -= nHotZoneOffset; aRect.Top() -= nHotZoneOffset; @@ -2594,19 +2594,19 @@ void ToolbarLayoutManager::implts_setLayoutInProgress( bool bInProgress ) void ToolbarLayoutManager::implts_calcDockingPosSize( UIElement& rUIElement, DockingOperation& rDockingOperation, - ::Rectangle& rTrackingRect, + ::tools::Rectangle& rTrackingRect, const Point& rMousePos ) { SolarMutexResettableGuard aReadLock; uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow ); ::Size aContainerWinSize; vcl::Window* pContainerWindow( nullptr ); - ::Rectangle aDockingAreaOffsets( m_aDockingAreaOffsets ); + ::tools::Rectangle aDockingAreaOffsets( m_aDockingAreaOffsets ); aReadLock.clear(); if ( !rUIElement.m_xUIElement.is() ) { - rTrackingRect = ::Rectangle(); + rTrackingRect = ::tools::Rectangle(); return; } @@ -2621,7 +2621,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( ToolBox* pToolBox( nullptr ); uno::Reference< awt::XWindow > xWindow( rUIElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY ); uno::Reference< awt::XWindow > xDockingAreaWindow; - ::Rectangle aTrackingRect( rTrackingRect ); + ::tools::Rectangle aTrackingRect( rTrackingRect ); ui::DockingArea eDockedArea( (ui::DockingArea)rUIElement.m_aDockedData.m_nDockedArea ); sal_Int32 nTopDockingAreaSize( implts_getTopBottomDockingAreaSizes().Width() ); sal_Int32 nBottomDockingAreaSize( implts_getTopBottomDockingAreaSizes().Height() ); @@ -2632,7 +2632,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( nBottomDockingAreaSize - aDockingAreaOffsets.Top() - aDockingAreaOffsets.Bottom(); - ::Rectangle aDockingAreaRect; + ::tools::Rectangle aDockingAreaRect; aReadLock.reset(); xDockingAreaWindow = m_xDockAreaWindows[eDockedArea]; @@ -2645,7 +2645,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( if ( pDockWindow && pDockWindow->GetType() == WindowType::TOOLBOX ) pToolBox = static_cast(pDockWindow.get()); - aDockingAreaRect = ::Rectangle( pDockingAreaWindow->GetPosPixel(), pDockingAreaWindow->GetSizePixel() ); + aDockingAreaRect = ::tools::Rectangle( pDockingAreaWindow->GetPosPixel(), pDockingAreaWindow->GetSizePixel() ); if ( pToolBox ) { // docked toolbars always have one line @@ -2679,13 +2679,13 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( // docking inside our docking area sal_Int32 nIndex( -1 ); sal_Int32 nRowCol( -1 ); - ::Rectangle aWindowRect; - ::Rectangle aRowColumnRect; + ::tools::Rectangle aWindowRect; + ::tools::Rectangle aRowColumnRect; const sal_uInt32 nWindowDataCount = aRowColumnsWindowData.size(); for ( sal_uInt32 i = 0; i < nWindowDataCount; i++ ) { - ::Rectangle aRect( aRowColumnsWindowData[i].aRowColumnRect.X, + ::tools::Rectangle aRect( aRowColumnsWindowData[i].aRowColumnRect.X, aRowColumnsWindowData[i].aRowColumnRect.Y, aRowColumnsWindowData[i].aRowColumnRect.X + aRowColumnsWindowData[i].aRowColumnRect.Width, aRowColumnsWindowData[i].aRowColumnRect.Y + aRowColumnsWindowData[i].aRowColumnRect.Height ); @@ -2718,7 +2718,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( // Tracking rect is on a row/column and mouse is over a docked toolbar. // Determine if the tracking rect must be located before/after the docked toolbar. - ::Rectangle aUIElementRect( aWindowRect ); + ::tools::Rectangle aUIElementRect( aWindowRect ); sal_Int32 nMiddle( bHorizontalDockArea ? ( aWindowRect.Left() + aWindowRect.getWidth() / 2 ) : ( aWindowRect.Top() + aWindowRect.getHeight() / 2 )); bool bInsertBefore( bHorizontalDockArea ? ( rMousePos.X() < nMiddle ) : ( rMousePos.Y() < nMiddle )); @@ -2973,7 +2973,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_determineDockingOperation( ui::DockingArea DockingArea, - const ::Rectangle& rRowColRect, + const ::tools::Rectangle& rRowColRect, const Point& rMousePos ) { const sal_Int32 nHorzVerticalRegionSize = 6; @@ -3010,16 +3010,16 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d return DOCKOP_ON_COLROW; } -::Rectangle ToolbarLayoutManager::implts_calcTrackingAndElementRect( +::tools::Rectangle ToolbarLayoutManager::implts_calcTrackingAndElementRect( ui::DockingArea eDockingArea, sal_Int32 nRowCol, UIElement& rUIElement, - const ::Rectangle& rTrackingRect, - const ::Rectangle& rRowColumnRect, + const ::tools::Rectangle& rTrackingRect, + const ::tools::Rectangle& rRowColumnRect, const ::Size& rContainerWinSize ) { SolarMutexResettableGuard aReadGuard; - ::Rectangle aDockingAreaOffsets( m_aDockingAreaOffsets ); + ::tools::Rectangle aDockingAreaOffsets( m_aDockingAreaOffsets ); aReadGuard.clear(); bool bHorizontalDockArea( isHorizontalDockingArea( eDockingArea )); @@ -3033,7 +3033,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d aDockingAreaOffsets.Top() - aDockingAreaOffsets.Bottom(); - ::Rectangle aTrackingRect( rTrackingRect ); + ::tools::Rectangle aTrackingRect( rTrackingRect ); if ( bHorizontalDockArea ) { sal_Int32 nPosX( std::max( sal_Int32( rTrackingRect.Left()), sal_Int32( 0 ))); @@ -3091,7 +3091,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d return aTrackingRect; } -void ToolbarLayoutManager::implts_setTrackingRect( ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect ) +void ToolbarLayoutManager::implts_setTrackingRect( ui::DockingArea eDockingArea, const ::Point& rMousePos, ::tools::Rectangle& rTrackingRect ) { ::Point aPoint( rTrackingRect.TopLeft()); if ( isHorizontalDockingArea( eDockingArea )) @@ -3337,25 +3337,25 @@ awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent sal_Int16 eDockingArea( -1 ); // none sal_Int32 nMagneticZone( aUIDockingElement.m_bFloating ? MAGNETIC_DISTANCE_DOCK : MAGNETIC_DISTANCE_UNDOCK ); awt::Rectangle aNewTrackingRect; - ::Rectangle aTrackingRect( e.TrackingRectangle.X, e.TrackingRectangle.Y, + ::tools::Rectangle aTrackingRect( e.TrackingRectangle.X, e.TrackingRectangle.Y, ( e.TrackingRectangle.X + e.TrackingRectangle.Width ), ( e.TrackingRectangle.Y + e.TrackingRectangle.Height )); awt::Rectangle aTmpRect = xTopDockingWindow->getPosSize(); - ::Rectangle aTopDockRect( aTmpRect.X, aTmpRect.Y, aTmpRect.Width, aTmpRect.Height ); - ::Rectangle aHotZoneTopDockRect( implts_calcHotZoneRect( aTopDockRect, nMagneticZone )); + ::tools::Rectangle aTopDockRect( aTmpRect.X, aTmpRect.Y, aTmpRect.Width, aTmpRect.Height ); + ::tools::Rectangle aHotZoneTopDockRect( implts_calcHotZoneRect( aTopDockRect, nMagneticZone )); aTmpRect = xBottomDockingWindow->getPosSize(); - ::Rectangle aBottomDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width), ( aTmpRect.Y + aTmpRect.Height )); - ::Rectangle aHotZoneBottomDockRect( implts_calcHotZoneRect( aBottomDockRect, nMagneticZone )); + ::tools::Rectangle aBottomDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width), ( aTmpRect.Y + aTmpRect.Height )); + ::tools::Rectangle aHotZoneBottomDockRect( implts_calcHotZoneRect( aBottomDockRect, nMagneticZone )); aTmpRect = xLeftDockingWindow->getPosSize(); - ::Rectangle aLeftDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height )); - ::Rectangle aHotZoneLeftDockRect( implts_calcHotZoneRect( aLeftDockRect, nMagneticZone )); + ::tools::Rectangle aLeftDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height )); + ::tools::Rectangle aHotZoneLeftDockRect( implts_calcHotZoneRect( aLeftDockRect, nMagneticZone )); aTmpRect = xRightDockingWindow->getPosSize(); - ::Rectangle aRightDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height )); - ::Rectangle aHotZoneRightDockRect( implts_calcHotZoneRect( aRightDockRect, nMagneticZone )); + ::tools::Rectangle aRightDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height )); + ::tools::Rectangle aHotZoneRightDockRect( implts_calcHotZoneRect( aRightDockRect, nMagneticZone )); VclPtr pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) ); ::Point aMousePos( pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y ))); @@ -3411,7 +3411,7 @@ awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent ::Point aOutputPos = pContainerWindow->ScreenToOutputPixel( aTrackingRect.TopLeft() ); aTrackingRect.SetPos( aOutputPos ); - ::Rectangle aNewDockingRect( aTrackingRect ); + ::tools::Rectangle aNewDockingRect( aTrackingRect ); implts_calcDockingPosSize( aUIDockingElement, eDockingOperation, aNewDockingRect, aMousePos ); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index ff2eb021eb0a..c82baa37b291 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -83,7 +83,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW const css::uno::Reference< css::container::XNameAccess >& xPersistentWindowState ); void setParentWindow( const css::uno::Reference< css::awt::XWindowPeer >& xParentWindow ); - void setDockingAreaOffsets(const ::Rectangle& rOffsets); + void setDockingAreaOffsets(const ::tools::Rectangle& rOffsets); void resetDockingArea(); @@ -194,7 +194,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW // internal helper methods bool implts_isParentWindowVisible() const; - ::Rectangle implts_calcDockingArea(); + ::tools::Rectangle implts_calcDockingArea(); void implts_sortUIElements(); void implts_reparentToolbars(); OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const; @@ -227,26 +227,26 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW // internal docking methods - ::Rectangle implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset ); - void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos ); - DockingOperation implts_determineDockingOperation( css::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos ); - ::Rectangle implts_getWindowRectFromRowColumn( css::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const OUString& rExcludeElementName ); - ::Rectangle implts_determineFrontDockingRect( css::ui::DockingArea eDockingArea, + ::tools::Rectangle implts_calcHotZoneRect( const ::tools::Rectangle& rRect, sal_Int32 nHotZoneOffset ); + void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::tools::Rectangle& rTrackingRect, const Point& rMousePos ); + DockingOperation implts_determineDockingOperation( css::ui::DockingArea DockingArea, const ::tools::Rectangle& rRowColRect, const Point& rMousePos ); + ::tools::Rectangle implts_getWindowRectFromRowColumn( css::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const OUString& rExcludeElementName ); + ::tools::Rectangle implts_determineFrontDockingRect( css::ui::DockingArea eDockingArea, sal_Int32 nRowCol, - const ::Rectangle& rDockedElementRect, + const ::tools::Rectangle& rDockedElementRect, const OUString& rMovedElementName, - const ::Rectangle& rMovedElementRect ); - ::Rectangle implts_calcTrackingAndElementRect( css::ui::DockingArea eDockingArea, + const ::tools::Rectangle& rMovedElementRect ); + ::tools::Rectangle implts_calcTrackingAndElementRect( css::ui::DockingArea eDockingArea, sal_Int32 nRowCol, UIElement& rUIElement, - const ::Rectangle& rTrackingRect, - const ::Rectangle& rRowColumnRect, + const ::tools::Rectangle& rTrackingRect, + const ::tools::Rectangle& rRowColumnRect, const ::Size& rContainerWinSize ); void implts_getDockingAreaElementInfos( css::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData ); void implts_getDockingAreaElementInfoOnSingleRowCol( css::ui::DockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData ); void implts_findNextDockingPos( css::ui::DockingArea DockingArea, const ::Size& aUIElementSize, css::awt::Point& rVirtualPos, ::Point& rPixelPos ); - void implts_setTrackingRect( css::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect ); + void implts_setTrackingRect( css::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::tools::Rectangle& rTrackingRect ); // creation methods @@ -278,8 +278,8 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW UIElementVector m_aUIElements; UIElement m_aDockUIElement; Point m_aStartDockMousePos; - Rectangle m_aDockingArea; - Rectangle m_aDockingAreaOffsets; + tools::Rectangle m_aDockingArea; + tools::Rectangle m_aDockingAreaOffsets; DockingOperation m_eDockOperation; PreviewFrameDetection m_ePreviewDetection; diff --git a/framework/source/uiconfiguration/ImageList.cxx b/framework/source/uiconfiguration/ImageList.cxx index 8c0fc26bdac0..800330907ebb 100644 --- a/framework/source/uiconfiguration/ImageList.cxx +++ b/framework/source/uiconfiguration/ImageList.cxx @@ -86,10 +86,10 @@ BitmapEx ImageList::GetAsHorizontalStrip() const else aResult = BitmapEx( aPixels ); - Rectangle aSrcRect( Point( 0, 0 ), mpImplData->maImageSize ); + tools::Rectangle aSrcRect( Point( 0, 0 ), mpImplData->maImageSize ); for (sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++) { - Rectangle aDestRect( Point( nIdx * mpImplData->maImageSize.Width(), 0 ), + tools::Rectangle aDestRect( Point( nIdx * mpImplData->maImageSize.Width(), 0 ), mpImplData->maImageSize ); ImageAryData *pData = mpImplData->maImages[ nIdx ]; aResult.CopyPixel( aDestRect, aSrcRect, &pData->maBitmapEx); diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index ddc25d37d0ff..2c47706d0a6e 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -131,7 +131,7 @@ css::awt::Rectangle SAL_CALL StatusbarItem::getItemRect() css::awt::Rectangle aAWTRect; if ( m_pStatusBar ) { - Rectangle aRect = m_pStatusBar->GetItemRect( m_nId ); + tools::Rectangle aRect = m_pStatusBar->GetItemRect( m_nId ); return css::awt::Rectangle( aRect.Left(), aRect.Top(), aRect.GetWidth(), -- cgit