diff options
Diffstat (limited to 'svx/source/sidebar')
| -rw-r--r-- | svx/source/sidebar/PanelLayout.cxx | 4 | ||||
| -rw-r--r-- | svx/source/sidebar/line/LineWidthValueSet.cxx | 12 | ||||
| -rw-r--r-- | svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 18 |
3 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 14c58c3a2698..c685ffde4832 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -49,8 +49,8 @@ Size PanelLayout::GetOptimalSize() const if (isLayoutEnabled(this)) { Size aSize = VclContainer::getLayoutRequisition(*GetWindow(GetWindowType::FirstChild)); - aSize.Width() = std::min<long>(aSize.Width(), - (SidebarController::gnMaximumSidebarWidth - TabBar::GetDefaultWidth()) * GetDPIScaleFactor()); + aSize.setWidth( std::min<long>(aSize.Width(), + (SidebarController::gnMaximumSidebarWidth - TabBar::GetDefaultWidth()) * GetDPIScaleFactor()) ); return aSize; } diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index 6ed3d9edf2d1..8aaeb8005cfb 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -103,7 +103,7 @@ void LineWidthValueSet::UserDraw( const UserDrawEvent& rUDEvt ) vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), GetDefaultFontFlags::OnlyOne)); Size aSize = aFont.GetFontSize(); - aSize.Height() = nRectHeight*3/5; + aSize.setHeight( nRectHeight*3/5 ); aFont.SetFontSize( aSize ); Point aLineStart(aBLPos.X() + 5, aBLPos.Y() + ( nRectHeight - nItemId )/2); @@ -114,9 +114,9 @@ void LineWidthValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->DrawImage(aImgStart, imgCus); // Point aStart(aImgStart.X() + 14 + 20 , aBLPos.Y() + nRectHeight/6); tools::Rectangle aStrRect = aRect; - aStrRect.Top() += nRectHeight/6; - aStrRect.Bottom() -= nRectHeight/6; - aStrRect.Left() += imgCus.GetSizePixel().Width() + 20; + aStrRect.AdjustTop(nRectHeight/6 ); + aStrRect.AdjustBottom( -(nRectHeight/6) ); + aStrRect.AdjustLeft(imgCus.GetSizePixel().Width() + 20 ); if(bCusEnable) aFont.SetColor(GetSettings().GetStyleSettings().GetFieldTextColor()); else @@ -131,8 +131,8 @@ void LineWidthValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { Color aBackColor(50,107,197); tools::Rectangle aBackRect = aRect; - aBackRect.Top() += 3; - aBackRect.Bottom() -= 2; + aBackRect.AdjustTop(3 ); + aBackRect.AdjustBottom( -2 ); pDev->SetFillColor(aBackColor); pDev->DrawRect(aBackRect); } diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index da7800057b48..64bf618597a4 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -63,7 +63,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), GetDefaultFontFlags::OnlyOne)); { Size aSize = aFont.GetFontSize(); - aSize.Height() = (nRectHeight*4)/9; + aSize.setHeight( (nRectHeight*4)/9 ); aFont.SetFontSize( aSize ); } @@ -72,8 +72,8 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) if ( GetSelectItemId() == nItemId ) { tools::Rectangle aBackRect = aRect; - aBackRect.Top() += 3; - aBackRect.Bottom() -= 2; + aBackRect.AdjustTop(3 ); + aBackRect.AdjustBottom( -2 ); pDev->SetFillColor( sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Color_Highlight ) ); pDev->DrawRect(aBackRect); } @@ -93,16 +93,16 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) } tools::Rectangle aStrRect = aRect; - aStrRect.Top() += nRectHeight/4; - aStrRect.Bottom() -= nRectHeight/4; + aStrRect.AdjustTop(nRectHeight/4 ); + aStrRect.AdjustBottom( -(nRectHeight/4) ); const long nRectWidth = aRect.GetWidth(); - aStrRect.Left() += 8; - aStrRect.Right() -= (nRectWidth*2)/3; + aStrRect.AdjustLeft(8 ); + aStrRect.AdjustRight( -((nRectWidth*2)/3) ); pDev->SetFont(aFont); pDev->DrawText(aStrRect, maItems[nItemId-1].maItemText, DrawTextFlags::EndEllipsis); - aStrRect.Left() += nRectWidth/3; - aStrRect.Right() += (nRectWidth*2)/3; + aStrRect.AdjustLeft(nRectWidth/3 ); + aStrRect.AdjustRight((nRectWidth*2)/3 ); pDev->DrawText(aStrRect, maItems[nItemId-1].maItemText2, DrawTextFlags::EndEllipsis); } |