diff options
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 20 | ||||
-rw-r--r-- | sfx2/source/dialog/infobar.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 12 |
9 files changed, 35 insertions, 35 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 82dc215b778b..966bab0ef268 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -380,25 +380,25 @@ void BackingWindow::checkInstalledModules() mpDBAllButton->Enable(aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE )); } -void BackingWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void BackingWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { Resize(); Wallpaper aBack(svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor); - vcl::Region aClip(Rectangle(Point(0, 0), GetOutputSizePixel())); + vcl::Region aClip(tools::Rectangle(Point(0, 0), GetOutputSizePixel())); aClip.Exclude(maStartCentButtons); rRenderContext.Push(PushFlags::CLIPREGION); rRenderContext.IntersectClipRegion(aClip); - rRenderContext.DrawWallpaper(Rectangle(Point(0, 0), GetOutputSizePixel()), aBack); + rRenderContext.DrawWallpaper(tools::Rectangle(Point(0, 0), GetOutputSizePixel()), aBack); rRenderContext.Pop(); ScopedVclPtrInstance<VirtualDevice> pVDev(rRenderContext); pVDev->EnableRTL(rRenderContext.IsRTLEnabled()); pVDev->SetOutputSizePixel(maStartCentButtons.GetSize()); Point aOffset(Point(0, 0) - maStartCentButtons.TopLeft()); - pVDev->DrawWallpaper(Rectangle(aOffset, GetOutputSizePixel()), aBack); + pVDev->DrawWallpaper(tools::Rectangle(aOffset, GetOutputSizePixel()), aBack); rRenderContext.DrawOutDev(maStartCentButtons.TopLeft(), maStartCentButtons.GetSize(), Point(0, 0), maStartCentButtons.GetSize(), @@ -512,7 +512,7 @@ void BackingWindow::setOwningFrame( const css::uno::Reference< css::frame::XFram void BackingWindow::Resize() { - maStartCentButtons = Rectangle( Point(0, 0), GetOutputSizePixel() ); + maStartCentButtons = tools::Rectangle( Point(0, 0), GetOutputSizePixel() ); if (isLayoutEnabled(this)) VclContainer::setLayoutAllocation(*GetWindow(GetWindowType::FirstChild), diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 5d3259b6f367..31388537f55c 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -86,7 +86,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer std::vector< VclPtr<vcl::Window> > maDndWindows; Color maButtonsTextColor; - Rectangle maStartCentButtons; + tools::Rectangle maStartCentButtons; bool mbInitControls; sal_Int32 mnHideExternalLinks; @@ -118,7 +118,7 @@ public: virtual ~BackingWindow() override; virtual void dispose() override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Resize() override; virtual bool PreNotify(NotifyEvent& rNEvt) override; virtual void GetFocus() override; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index b58181c9b0e6..7e6c4692553d 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -199,7 +199,7 @@ void SfxModelessDialog::StateChanged( StateChangedType nStateChange ) aPos.Y() += ( aParentSize.Height() - aDlgSize.Height() ) / 2; Point aPoint; - Rectangle aRect = GetDesktopRectPixel(); + tools::Rectangle aRect = GetDesktopRectPixel(); aPoint.X() = aRect.Right() - aDlgSize.Width(); aPoint.Y() = aRect.Bottom() - aDlgSize.Height(); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 4f71efbd3471..68b5eda251a8 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1348,7 +1348,7 @@ void CustomPropertiesDurationField::RequestHelp( const HelpEvent& rHEvt ) if ( rHEvt.GetMode() & HelpEventMode::QUICK ) { Size aSize( GetSizePixel() ); - Rectangle aItemRect( rHEvt.GetMousePosPixel(), aSize ); + tools::Rectangle aItemRect( rHEvt.GetMousePosPixel(), aSize ); if (Help::IsBalloonHelpEnabled()) Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aItemRect, GetText() ); else @@ -1719,7 +1719,7 @@ bool CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa sal_uInt16 nPos = 0; while ( *pCurrent ) { - Rectangle aRect = pHeaderBar->GetItemRect( pHeaderBar->GetItemId( nPos++ ) ); + tools::Rectangle aRect = pHeaderBar->GetItemRect( pHeaderBar->GetItemId( nPos++ ) ); Size aOrigSize = (*pCurrent)->GetSizePixel(); Point aOrigPos = (*pCurrent)->GetPosPixel(); Size aSize(aOrigSize); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 284111783c2c..ec7d0a085fa1 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -652,7 +652,7 @@ void SfxDockingWindow::StartDocking() is used, the behavior can be influenced by the derived classes (see below). This method should if possible not be overwritten. */ -bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) +bool SfxDockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect ) { if ( Application::IsInModalMode() ) return true; @@ -749,7 +749,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) the parent window. If this method is overridden by a derived class, then SfxDockingWindow::EndDocking() must be called first. */ -void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode ) +void SfxDockingWindow::EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) { if ( !pImpl || !pImpl->bConstructed || IsDockingCanceled() || !pMgr ) return; @@ -1152,7 +1152,7 @@ void SfxDockingWindow::ReleaseChildWindow_Impl() is overridden (see below). */ -SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& rRect) +SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rectangle& rRect) { // calculate hypothetical sizes for different modes Size aFloatingSize(CalcDockingSize(SfxChildAlignment::NOALIGNMENT)); @@ -1194,7 +1194,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& nTBBorder = MAX_TOGGLEAREA_WIDTH; // shrink area for floating mode if possible - Rectangle aInRect = GetInnerRect(); + tools::Rectangle aInRect = GetInnerRect(); if ( aInRect.GetWidth() > nLRBorder ) aInRect.Left() += nLRBorder/2; if ( aInRect.GetWidth() > nLRBorder ) @@ -1207,7 +1207,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& // calculate alignment resulting from docking rectangle bool bBecomesFloating = false; SfxChildAlignment eDockAlign = pImpl->GetDockAlignment(); - Rectangle aDockingRect( rRect ); + tools::Rectangle aDockingRect( rRect ); if ( !IsFloatingMode() ) { // don't use tracking rectangle for alignment check, because it will be too large @@ -1221,7 +1221,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& } Point aPos = aDockingRect.TopLeft(); - Rectangle aIntersect = GetOuterRect().GetIntersection( aDockingRect ); + tools::Rectangle aIntersect = GetOuterRect().GetIntersection( aDockingRect ); if ( aIntersect.IsEmpty() ) // docking rectangle completely outside docking area -> floating mode bBecomesFloating = true; @@ -1229,13 +1229,13 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& { // create a small test rect around the mouse position and use this one // instead of the passed rRect to not dock too easily or by accident - Rectangle aSmallDockingRect; + tools::Rectangle aSmallDockingRect; aSmallDockingRect.SetSize( Size( MAX_TOGGLEAREA_WIDTH, MAX_TOGGLEAREA_HEIGHT ) ); Point aNewPos(rPos); aNewPos.X() -= aSmallDockingRect.GetWidth()/2; aNewPos.Y() -= aSmallDockingRect.GetHeight()/2; aSmallDockingRect.SetPos(rPos); - Rectangle aIntersectRect = aInRect.GetIntersection( aSmallDockingRect ); + tools::Rectangle aIntersectRect = aInRect.GetIntersection( aSmallDockingRect ); if ( aIntersectRect == aSmallDockingRect ) // docking rectangle completely inside (shrunk) inner area -> floating mode bBecomesFloating = true; @@ -1568,12 +1568,12 @@ bool SfxDockingWindow::Close() /** Returns a boundary line to the docked edge and a frame when the Window is in a docked state. In this way SVLOOK is considered. */ -void SfxDockingWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) +void SfxDockingWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { if (pImpl->bSplitable || IsFloatingMode()) return; - Rectangle aRect(Point(0, 0), GetOutputSizePixel()); + tools::Rectangle aRect(Point(0, 0), GetOutputSizePixel()); switch (GetAlignment()) { case SfxChildAlignment::TOP: diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 190759b09305..087913f38cf7 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -105,19 +105,19 @@ public: GetInfoBarColors(InfoBarType::Warning,m_aBackgroundColor,m_aForegroundColor,m_aMessageColor); } - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override; void setBackgroundColor(const basegfx::BColor& rColor); void setForegroundColor(const basegfx::BColor& rColor); }; -void SfxCloseButton::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void SfxCloseButton::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) { const ViewInformation2D aNewViewInfos; const unique_ptr<BaseProcessor2D> pProcessor( createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos)); - const Rectangle aRect(Point(0, 0), PixelToLogic(GetSizePixel())); + const ::tools::Rectangle aRect(Point(0, 0), PixelToLogic(GetSizePixel())); drawinglayer::primitive2d::Primitive2DContainer aSeq(2); @@ -230,13 +230,13 @@ void SfxInfoBarWindow::dispose() vcl::Window::dispose(); } -void SfxInfoBarWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect) +void SfxInfoBarWindow::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rPaintRect) { const ViewInformation2D aNewViewInfos; const unique_ptr<BaseProcessor2D> pProcessor( createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos)); - const Rectangle aRect(Point(0, 0), PixelToLogic(GetSizePixel())); + const ::tools::Rectangle aRect(Point(0, 0), PixelToLogic(GetSizePixel())); drawinglayer::primitive2d::Primitive2DContainer aSeq(2); diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index c84314773fd7..a10861ddefaf 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -347,7 +347,7 @@ void SfxSplitWindow::StartSplit() pEmptyWin->bSplit = true; } - Rectangle aRect = pWorkWin->GetFreeArea( !bPinned ); + tools::Rectangle aRect = pWorkWin->GetFreeArea( !bPinned ); switch ( GetAlign() ) { case WindowAlign::Left: @@ -987,7 +987,7 @@ bool SfxSplitWindow::CursorIsOverRect() const Point aPos = pEmptyWin->GetParent()->OutputToScreenPixel( pEmptyWin->GetPosPixel() ); Size aSize = pEmptyWin->GetSizePixel(); - Rectangle aRect( aPos, aSize ); + tools::Rectangle aRect( aPos, aSize ); if ( bVisible ) { @@ -1000,7 +1000,7 @@ bool SfxSplitWindow::CursorIsOverRect() const aVisSize.Width() += 2 * nPixel; aVisSize.Height() += 2 * nPixel; - Rectangle aVisRect( aVisPos, aVisSize ); + tools::Rectangle aVisRect( aVisPos, aVisSize ); aRect = aRect.GetUnion( aVisRect ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 5133d805ec30..49b17f515691 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -145,7 +145,7 @@ void StyleLBoxString::Paint( SvLBoxString::InitViewData( &rDevice, const_cast<SvTreeListEntry*>(&rEntry), mpViewData); } - Rectangle aPaintRectangle = pView->GetPaintRectangle(); + tools::Rectangle aPaintRectangle = pView->GetPaintRectangle(); bPainted = pStylePreviewRenderer->render(aPaintRectangle); } } diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 5299973e9705..e917c24a4b98 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -143,7 +143,7 @@ namespace sfx2 rRenderContext.SetTextFillColor(); } - void TitledDockingWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& i_rArea) + void TitledDockingWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& i_rArea) { const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); @@ -173,15 +173,15 @@ namespace sfx2 int nInnerBottom = nOuterBottom - m_aBorder.Bottom() + 1; // Paint title bar background. - Rectangle aTitleBarBox(Rectangle(nOuterLeft, 0, nOuterRight, nInnerTop - 1)); + tools::Rectangle aTitleBarBox(tools::Rectangle(nOuterLeft, 0, nOuterRight, nInnerTop - 1)); rRenderContext.DrawRect(aTitleBarBox); if (nInnerLeft > nOuterLeft) - rRenderContext.DrawRect(Rectangle(nOuterLeft, nInnerTop, nInnerLeft, nInnerBottom)); + rRenderContext.DrawRect(tools::Rectangle(nOuterLeft, nInnerTop, nInnerLeft, nInnerBottom)); if (nOuterRight > nInnerRight) - rRenderContext.DrawRect(Rectangle(nInnerRight, nInnerTop, nOuterRight, nInnerBottom)); + rRenderContext.DrawRect(tools::Rectangle(nInnerRight, nInnerTop, nOuterRight, nInnerBottom)); if (nInnerBottom < nOuterBottom) - rRenderContext.DrawRect(Rectangle(nOuterLeft, nInnerBottom, nOuterRight, nOuterBottom)); + rRenderContext.DrawRect(tools::Rectangle(nOuterLeft, nInnerBottom, nOuterRight, nOuterBottom)); // Paint bevel border. rRenderContext.SetFillColor(); @@ -251,7 +251,7 @@ namespace sfx2 SfxDockingWindow::StateChanged( i_nType ); } - void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, bool i_bFloatMode ) + void TitledDockingWindow::EndDocking( const tools::Rectangle& i_rRect, bool i_bFloatMode ) { SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode ); |