diff options
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/about.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 18 | ||||
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 32 | ||||
-rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hltpbase.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 2 |
8 files changed, 34 insertions, 34 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 35308f030af9..9384a76743dd 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -242,7 +242,7 @@ void AboutDialog::Resize() } } -void AboutDialog::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void AboutDialog::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) { rRenderContext.SetClipRegion(vcl::Region(rRect)); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 54b1e9d7ee4f..548594aa1f9b 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -153,7 +153,7 @@ class ColorPreviewControl : public Control public: ColorPreviewControl( vcl::Window* pParent, WinBits nStyle ); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override; void SetColor(const Color& rColor); @@ -177,7 +177,7 @@ void ColorPreviewControl::SetColor( const Color& rCol ) } } -void ColorPreviewControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void ColorPreviewControl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) { rRenderContext.SetFillColor(maColor); rRenderContext.SetLineColor(maColor); @@ -199,7 +199,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) 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 Size GetOptimalSize() const override; @@ -434,8 +434,8 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate ) Point aPos = maPosition; maPosition.X() = nX - 5; maPosition.Y() = nY - 5; - Invalidate(Rectangle(aPos, Size(11, 11))); - Invalidate(Rectangle(maPosition, Size(11, 11))); + Invalidate(::tools::Rectangle(aPos, Size(11, 11))); + Invalidate(::tools::Rectangle(maPosition, Size(11, 11))); if (bUpdate) { @@ -525,7 +525,7 @@ void ColorFieldControl::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput(rKEvt); } -void ColorFieldControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void ColorFieldControl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) { if (!mpBitmap) UpdateBitmap(); @@ -548,7 +548,7 @@ void ColorFieldControl::Paint(vcl::RenderContext& rRenderContext, const Rectangl rRenderContext.SetFillColor(); - rRenderContext.DrawEllipse(Rectangle(maPosition, Size(11, 11))); + rRenderContext.DrawEllipse(::tools::Rectangle(maPosition, Size(11, 11))); } void ColorFieldControl::Resize() @@ -598,7 +598,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) 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; void UpdateBitmap(); @@ -794,7 +794,7 @@ void ColorSliderControl::KeyInput(const KeyEvent& rKEvt) Control::KeyInput( rKEvt ); } -void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) +void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& /*rRect*/) { if (!mpBitmap) UpdateBitmap(); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 5ac0bf270535..a92f99b6d00c 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -181,7 +181,7 @@ SvxShowText::SvxShowText(vcl::Window* pParent) VCL_BUILDER_FACTORY(SvxShowText) -void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) { rRenderContext.SetFont(maFont); @@ -201,7 +201,7 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) bool bShrankFont = false; vcl::Font aOrigFont(rRenderContext.GetFont()); Size aFontSize(aOrigFont.GetFontSize()); - Rectangle aBoundRect; + ::tools::Rectangle aBoundRect; for (long nFontHeight = aFontSize.Height(); nFontHeight > 0; nFontHeight -= 5) { diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 60ee026c8fd1..7f499c01a776 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -46,7 +46,7 @@ Size GraphicPreviewWindow::GetOptimalSize() const } -void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) { Control::Paint(rRenderContext, rRect); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 9b4eb01f2b61..fb766aba1653 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -101,8 +101,8 @@ namespace svx const OUString& getSecondaryText() const { return m_sSecondaryText; } public: - void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, DrawTextFlags _nTextStyle, - Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation ); + void Paint( OutputDevice& _rDevice, const ::tools::Rectangle& _rRect, DrawTextFlags _nTextStyle, + ::tools::Rectangle* _pPrimaryLocation, ::tools::Rectangle* _pSecondaryLocation ); }; PseudoRubyText::PseudoRubyText() @@ -118,8 +118,8 @@ namespace svx } - void PseudoRubyText::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect, DrawTextFlags _nTextStyle, - Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation ) + void PseudoRubyText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& _rRect, DrawTextFlags _nTextStyle, + ::tools::Rectangle* _pPrimaryLocation, ::tools::Rectangle* _pSecondaryLocation ) { Size aPlaygroundSize(_rRect.GetSize()); @@ -129,8 +129,8 @@ namespace svx aSmallerFont.SetFontHeight( (long)( 0.8 * aSmallerFont.GetFontHeight() ) ); // let's calculate the size of our two texts - Rectangle aPrimaryRect = rRenderContext.GetTextRect( _rRect, m_sPrimaryText, _nTextStyle ); - Rectangle aSecondaryRect; + ::tools::Rectangle aPrimaryRect = rRenderContext.GetTextRect( _rRect, m_sPrimaryText, _nTextStyle ); + ::tools::Rectangle aSecondaryRect; { FontSwitch aFontRestore(rRenderContext, aSmallerFont); aSecondaryRect = rRenderContext.GetTextRect(_rRect, m_sSecondaryText, _nTextStyle); @@ -212,7 +212,7 @@ namespace svx virtual Size GetOptimalSize() const override; protected: - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) override; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& _rRect ) override; private: PseudoRubyText m_aRubyText; @@ -229,7 +229,7 @@ namespace svx } - void RubyRadioButton::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) + void RubyRadioButton::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) { HideFocus(); @@ -239,10 +239,10 @@ namespace svx aImageSize.Width() = CalcZoom( aImageSize.Width() ) + 2; // + 2 because otherwise the radiobuttons aImageSize.Height() = CalcZoom( aImageSize.Height() ) + 2; // appear a bit cut from right and top. - Rectangle aOverallRect( Point( 0, 0 ), GetOutputSizePixel() ); + ::tools::Rectangle aOverallRect( Point( 0, 0 ), GetOutputSizePixel() ); aOverallRect.Left() += aImageSize.Width() + 4; // 4 is the separator between the image and the text // inflate the rect a little bit (because the VCL radio button does the same) - Rectangle aTextRect( aOverallRect ); + ::tools::Rectangle aTextRect( aOverallRect ); ++aTextRect.Left(); --aTextRect.Right(); ++aTextRect.Top(); --aTextRect.Bottom(); @@ -269,19 +269,19 @@ namespace svx nTextStyle |= DrawTextFlags::Mnemonic; // paint the ruby text - Rectangle aPrimaryTextLocation; - Rectangle aSecondaryTextLocation; + ::tools::Rectangle aPrimaryTextLocation; + ::tools::Rectangle aSecondaryTextLocation; m_aRubyText.Paint(rRenderContext, aTextRect, nTextStyle, &aPrimaryTextLocation, &aSecondaryTextLocation); // the focus rectangle is to be painted around both texts - Rectangle aCombinedRect(aPrimaryTextLocation); + ::tools::Rectangle aCombinedRect(aPrimaryTextLocation); aCombinedRect.Union(aSecondaryTextLocation); SetFocusRect(aCombinedRect); // let the base class paint the radio button // for this, give it the proper location to paint the image (vertically centered, relative to our text) - Rectangle aImageLocation( Point( 0, 0 ), aImageSize ); + ::tools::Rectangle aImageLocation( Point( 0, 0 ), aImageSize ); sal_Int32 nTextHeight = aSecondaryTextLocation.Bottom() - aPrimaryTextLocation.Top(); aImageLocation.Top() = aPrimaryTextLocation.Top() + ( nTextHeight - aImageSize.Height() ) / 2; aImageLocation.Bottom() = aImageLocation.Top() + aImageSize.Height(); @@ -306,7 +306,7 @@ namespace svx { vcl::Font aSmallerFont( GetFont() ); aSmallerFont.SetFontHeight( static_cast<long>( 0.8 * aSmallerFont.GetFontHeight() ) ); - Rectangle rect( Point(), Size( SAL_MAX_INT32, SAL_MAX_INT32 ) ); + ::tools::Rectangle rect( Point(), Size( SAL_MAX_INT32, SAL_MAX_INT32 ) ); Size aPrimarySize = GetTextRect( rect, m_aRubyText.getPrimaryText() ).GetSize(); Size aSecondarySize; @@ -343,7 +343,7 @@ namespace svx void SuggestionSet::UserDraw( const UserDrawEvent& rUDEvt ) { vcl::RenderContext* pDev = rUDEvt.GetRenderContext(); - Rectangle aRect = rUDEvt.GetRect(); + ::tools::Rectangle aRect = rUDEvt.GetRect(); sal_uInt16 nItemId = rUDEvt.GetItemId(); OUString sText = *static_cast< OUString* >( GetItemData( nItemId ) ); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index ce7009ec76b2..ad50188d1db1 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -92,7 +92,7 @@ Size SvxHlmarkTreeLBox::GetOptimalSize() const return LogicToPixel(Size(103, 162), MapUnit::MapAppFont); } -void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) { if (!mpParentWnd || mpParentWnd->mnError == LERR_NOERROR) { @@ -102,7 +102,7 @@ void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const Rectangl { Erase(rRenderContext); - Rectangle aDrawRect(Point( 0, 0 ), GetSizePixel()); + ::tools::Rectangle aDrawRect(Point( 0, 0 ), GetSizePixel()); OUString aStrMessage; diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 7fefb04ddcb3..6d60d1820df5 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -200,12 +200,12 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd () static_cast<vcl::Window*>(mpMarkWnd)->Show(); // Size of dialog-window in screen pixels - Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( nullptr ) ); + ::tools::Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( nullptr ) ); Point aDlgPos ( aDlgRect.TopLeft() ); Size aDlgSize ( mpDialog->GetSizePixel () ); // Absolute size of the screen - Rectangle aScreen( mpDialog->GetDesktopRectPixel() ); + ::tools::Rectangle aScreen( mpDialog->GetDesktopRectPixel() ); // Size of Extrawindow Size aExtraWndSize( mpMarkWnd->GetSizePixel () ); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index b2cb31592be7..3d44a8593994 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -255,7 +255,7 @@ void ThesaurusAlternativesCtrl::KeyInput( const KeyEvent& rKEvt ) SvxCheckListBox::KeyInput( rKEvt ); } -void ThesaurusAlternativesCtrl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void ThesaurusAlternativesCtrl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) { if (!m_pDialog->WordFound()) { |