[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Feb 13 06:38:26 UTC 2018
avmedia/source/viewer/mediawindow.cxx | 4 +--
avmedia/source/viewer/mediawindow_impl.cxx | 14 +++++-----
basctl/source/basicide/baside2.cxx | 10 +++----
basctl/source/basicide/baside2b.cxx | 38 ++++++++++++++---------------
basctl/source/basicide/basides1.cxx | 10 +++----
basctl/source/basicide/layout.cxx | 2 -
basctl/source/basicide/objdlg.cxx | 6 ++--
basctl/source/dlged/dlged.cxx | 36 +++++++++++++--------------
basctl/source/dlged/dlgedobj.cxx | 24 +++++++++---------
basctl/source/dlged/propbrw.cxx | 8 +++---
basic/source/runtime/inputbox.cxx | 6 ++--
11 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit 1adb1a320a7e9832a41545bde13fd59d27ce7954
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 12 16:48:57 2018 +0200
loplugin:changetoolsgen in avmedia..basic
Change-Id: I4e355ae27b9fad1cc6e8f8f408dbd9e93d7256d7
Reviewed-on: https://gerrit.libreoffice.org/49603
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index a3a61feaa2c5..df416bb96db7 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -328,8 +328,8 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo
{
const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
- pPreferredSizePixel->Width() = aAwtSize.Width;
- pPreferredSizePixel->Height() = aAwtSize.Height;
+ pPreferredSizePixel->setWidth( aAwtSize.Width );
+ pPreferredSizePixel->setHeight( aAwtSize.Height );
}
}
}
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index c8af35df34bf..1d1f5fe946cb 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -296,8 +296,8 @@ Size MediaWindowImpl::getPreferredSize() const
{
awt::Size aPrefSize( mxPlayer->getPreferredPlayerWindowSize() );
- aRet.Width() = aPrefSize.Width;
- aRet.Height() = aPrefSize.Height;
+ aRet.setWidth( aPrefSize.Width );
+ aRet.setHeight( aPrefSize.Height );
}
return aRet;
@@ -532,7 +532,7 @@ void MediaWindowImpl::Resize()
const sal_Int32 nControlHeight = mpMediaWindowControl->GetSizePixel().Height();
const sal_Int32 nControlY = std::max(aCurSize.Height() - nControlHeight - nOffset, 0L);
- aPlayerWindowSize.Height() = (nControlY - (nOffset << 1));
+ aPlayerWindowSize.setHeight( nControlY - (nOffset << 1) );
mpMediaWindowControl->SetPosSizePixel(Point(nOffset, nControlY ), Size(aCurSize.Width() - (nOffset << 1), nControlHeight));
}
if (mpChildWindow)
@@ -613,13 +613,13 @@ void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const tools::Rec
if (fLogoWH < (double(aVideoRect.GetWidth()) / aVideoRect.GetHeight()))
{
- aLogoSize.Width() = long(aVideoRect.GetHeight() * fLogoWH);
- aLogoSize.Height() = aVideoRect.GetHeight();
+ aLogoSize.setWidth( long(aVideoRect.GetHeight() * fLogoWH) );
+ aLogoSize.setHeight( aVideoRect.GetHeight() );
}
else
{
- aLogoSize.Width() = aVideoRect.GetWidth();
- aLogoSize.Height()= long(aVideoRect.GetWidth() / fLogoWH);
+ aLogoSize.setWidth( aVideoRect.GetWidth() );
+ aLogoSize.setHeight( long(aVideoRect.GetWidth() / fLogoWH) );
}
}
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index a2415818def2..43d7d0fd9f19 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -131,7 +131,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
{
aFont.SetWeight( WEIGHT_NORMAL );
pPrinter->SetFont( aFont );
- aPos.X() += pPrinter->GetTextWidth( rTitle );
+ aPos.setX( aPos.X() + pPrinter->GetTextWidth( rTitle ) );
if( bOutput )
{
@@ -810,8 +810,8 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
}
Size aPaperSz = pPrinter->GetOutputSize();
- aPaperSz.Width() -= (Print::nLeftMargin + Print::nRightMargin);
- aPaperSz.Height() -= (Print::nTopMargin + Print::nBottomMargin);
+ aPaperSz.setWidth( aPaperSz.Width() - (Print::nLeftMargin + Print::nRightMargin) );
+ aPaperSz.setHeight( aPaperSz.Height() - (Print::nTopMargin + Print::nBottomMargin) );
// nLinepPage is not correct if there's a line break
sal_Int32 nLinespPage = aPaperSz.Height()/nLineHeight;
@@ -835,7 +835,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
sal_Int32 nBeginIndex = nLine*nCharspLine;
sal_Int32 nCopyCount = std::min<sal_Int32>(nCharspLine, aLine.getLength()-nBeginIndex);
OUString aTmpLine = aLine.copy(nBeginIndex, nCopyCount);
- aPos.Y() += nLineHeight;
+ aPos.setY( aPos.Y() + nLineHeight );
if ( aPos.Y() > ( aPaperSz.Height() + Print::nTopMargin ) )
{
nCurPage++;
@@ -845,7 +845,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
if( nCurPage-1 == nPrintPage )
pPrinter->DrawText( aPos, aTmpLine );
}
- aPos.Y() += 10; // nParaSpace
+ aPos.setY( aPos.Y() + 10 ); // nParaSpace
}
pPrinter->SetFont( aOldFont );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 2b44c67dead8..2e5ec45676bd 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -372,8 +372,8 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
{
aTopLeft = GetEditView()->GetTextEngine()->PaMtoEditCursor( aStartOfWord ).BottomLeft();
aTopLeft = GetEditView()->GetWindowPos( aTopLeft );
- aTopLeft.X() += 5;
- aTopLeft.Y() += 5;
+ aTopLeft.setX( aTopLeft.X() + 5 );
+ aTopLeft.setY( aTopLeft.Y() + 5 );
aTopLeft = OutputToScreenPixel( aTopLeft );
}
}
@@ -403,7 +403,7 @@ void EditorWindow::Resize()
if ( pEditView->GetStartDocPos().Y() > nMaxVisAreaStart )
{
Point aStartDocPos( pEditView->GetStartDocPos() );
- aStartDocPos.Y() = nMaxVisAreaStart;
+ aStartDocPos.setY( nMaxVisAreaStart );
pEditView->SetStartDocPos( aStartDocPos );
pEditView->ShowCursor();
rModulWindow.GetBreakPointWindow().GetCurYOffset() = aStartDocPos.Y();
@@ -1297,7 +1297,7 @@ void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted )
Size aSz = rModulWindow.GetBreakPointWindow().GetOutputSize();
tools::Rectangle aInvRect( Point( 0, 0 ), aSz );
long nY = nPara*nLineHeight - rModulWindow.GetBreakPointWindow().GetCurYOffset();
- aInvRect.Top() = nY;
+ aInvRect.SetTop( nY );
rModulWindow.GetBreakPointWindow().Invalidate( aInvRect );
Size aLnSz(rModulWindow.GetLineNumberWindow().GetWidth(),
@@ -1383,8 +1383,8 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext)
Size aMarkerSz(aMarker.GetSizePixel());
aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz);
Point aMarkerOff(0, 0);
- aMarkerOff.X() = (aOutSz.Width() - aMarkerSz.Width()) / 2;
- aMarkerOff.Y() = (nLineHeight - aMarkerSz.Height()) / 2;
+ aMarkerOff.setX( (aOutSz.Width() - aMarkerSz.Width()) / 2 );
+ aMarkerOff.setY( (nLineHeight - aMarkerSz.Height()) / 2 );
sal_uLong nY = nMarkerPos * nLineHeight - nCurYOffset;
Point aPos(0, nY);
@@ -1571,8 +1571,8 @@ WatchWindow::WatchWindow (Layout* pParent)
aRemoveWatchButton->SetModeImage(Image(BitmapEx(RID_BMP_REMOVEWATCH)));
aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP));
Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() );
- aSz.Width() += 6;
- aSz.Height() += 6;
+ aSz.setWidth( aSz.Width() + 6 );
+ aSz.setHeight( aSz.Height() + 6 );
aRemoveWatchButton->SetSizePixel( aSz );
aRemoveWatchButton->Show();
@@ -1652,15 +1652,15 @@ void WatchWindow::Resize()
Size aBoxSz( aSz.Width() - 2*DWBORDER, aSz.Height() - nVirtToolBoxHeight - DWBORDER );
if ( aBoxSz.Width() < 4 )
- aBoxSz.Width() = 0;
+ aBoxSz.setWidth( 0 );
if ( aBoxSz.Height() < 4 )
- aBoxSz.Height() = 0;
+ aBoxSz.setHeight( 0 );
- aBoxSz.Height() -= nHeaderBarHeight;
+ aBoxSz.setHeight( aBoxSz.Height() - nHeaderBarHeight );
aTreeListBox->SetSizePixel( aBoxSz );
aTreeListBox->GetHScroll()->SetPageSize( aTreeListBox->GetHScroll()->GetVisibleSize() );
- aBoxSz.Height() = nHeaderBarHeight;
+ aBoxSz.setHeight( nHeaderBarHeight );
aHeaderBar->SetSizePixel( aBoxSz );
Invalidate();
@@ -1873,9 +1873,9 @@ void StackWindow::Resize()
Size aBoxSz(aSz.Width() - 2*DWBORDER, aSz.Height() - nVirtToolBoxHeight - DWBORDER);
if ( aBoxSz.Width() < 4 )
- aBoxSz.Width() = 0;
+ aBoxSz.setWidth( 0 );
if ( aBoxSz.Height() < 4 )
- aBoxSz.Height() = 0;
+ aBoxSz.setHeight( 0 );
aTreeListBox->SetSizePixel( aBoxSz );
@@ -1991,8 +1991,8 @@ void ComplexEditorWindow::Resize()
{
Size aOutSz = GetOutputSizePixel();
Size aSz(aOutSz);
- aSz.Width() -= 2*DWBORDER;
- aSz.Height() -= 2*DWBORDER;
+ aSz.setWidth( aSz.Width() - 2*DWBORDER );
+ aSz.setHeight( aSz.Height() - 2*DWBORDER );
long nBrkWidth = 20;
long nSBWidth = aEWVScrollBar->GetSizePixel().Width();
@@ -2817,7 +2817,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox()
tools::Rectangle aRect = static_cast<TextEngine*>(pParent->GetEditEngine())->PaMtoEditCursor( pParent->GetEditView()->GetSelection().GetEnd() );
long nViewYOffset = pParent->GetEditView()->GetStartDocPos().Y();
Point aPos = aRect.BottomRight();// this variable will be used later (if needed)
- aPos.Y() = (aPos.Y() - nViewYOffset) + nBasePad;
+ aPos.setY( (aPos.Y() - nViewYOffset) + nBasePad );
OUString aLongestEntry = pListBox->GetEntry( 0 );// grab the longest one: max search
for( sal_Int32 i=1; i< pListBox->GetEntryCount(); ++i )
@@ -2844,12 +2844,12 @@ void CodeCompleteWindow::ResizeAndPositionListBox()
if( aVisArea.TopRight().getY() + aPos.getY() + aSize.getHeight() > aBottomPoint.getY() )
{//clipped at the bottom: move it up
const long& nParentFontHeight = pParent->GetEditEngine()->GetFont().GetFontHeight(); //parent's font (in the IDE): needed for height
- aPos.Y() -= aSize.getHeight() + nParentFontHeight + nCursorPad;
+ aPos.setY( aPos.Y() - aSize.getHeight() + nParentFontHeight + nCursorPad );
}
if( aVisArea.TopLeft().getX() + aPos.getX() + aSize.getWidth() > aBottomPoint.getX() )
{//clipped at the right side, move it a bit left
- aPos.X() -= aSize.getWidth() + aVisArea.TopLeft().getX();
+ aPos.setX( aPos.X() - aSize.getWidth() + aVisArea.TopLeft().getX() );
}
//set the position
SetPosPixel( aPos );
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index f1d41d3ce9f8..4c3f3dabffe5 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1242,16 +1242,16 @@ void Shell::AdjustPosSizePixel( const Point &rPos, const Size &rSize )
return;
Size aTabBarSize;
- aTabBarSize.Height() = GetViewFrame()->GetWindow().GetFont().GetFontHeight() + 4;
- aTabBarSize.Width() = rSize.Width();
+ aTabBarSize.setHeight( GetViewFrame()->GetWindow().GetFont().GetFontHeight() + 4 );
+ aTabBarSize.setWidth( rSize.Width() );
Size aSz( rSize );
Size aScrollBarBoxSz( aScrollBarBox->GetSizePixel() );
- aSz.Height() -= aScrollBarBoxSz.Height();
- aSz.Height() -= aTabBarSize.Height();
+ aSz.setHeight( aSz.Height() - aScrollBarBoxSz.Height() );
+ aSz.setHeight( aSz.Height() - aTabBarSize.Height() );
Size aOutSz( aSz );
- aSz.Width() -= aScrollBarBoxSz.Width();
+ aSz.setWidth( aSz.Width() - aScrollBarBoxSz.Width() );
aScrollBarBox->SetPosPixel( Point( rSize.Width() - aScrollBarBoxSz.Width(), rSize.Height() - aScrollBarBoxSz.Height() ) );
aVScrollBar->SetPosSizePixel( Point( rPos.X()+aSz.Width(), rPos.Y() ), Size( aScrollBarBoxSz.Width(), aSz.Height() ) );
aHScrollBar->SetPosSizePixel( Point( rPos.X(), rPos.Y()+aSz.Height() ), Size( aSz.Width(), aScrollBarBoxSz.Height() ) );
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index b0e46e800e50..ae19f7695d4d 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -44,7 +44,7 @@ Layout::Layout (vcl::Window* pParent) :
vcl::Font aFont = GetFont();
Size aSz = aFont.GetFontSize();
- aSz.Height() *= 1.5;
+ aSz.setHeight( aSz.Height() * 1.5 );
aFont.SetFontSize(aSz);
aFont.SetWeight(WEIGHT_BOLD);
aFont.SetColor(GetSettings().GetStyleSettings().GetWindowTextColor());
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 16389cadc51f..d5775b6278c0 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -58,8 +58,8 @@ ObjectCatalog::ObjectCatalog (vcl::Window* pParent)
Point aPos = rParent.OutputToScreenPixel(Point(0, 0));
Size const aParentSize = rParent.GetSizePixel();
Size const aSize = GetSizePixel();
- aPos.X() += (aParentSize.Width() - aSize.Width()) / 2;
- aPos.Y() += (aParentSize.Height() - aSize.Height()) / 2;
+ aPos.setX( aPos.X() + (aParentSize.Width() - aSize.Width()) / 2 );
+ aPos.setY( aPos.Y() + (aParentSize.Height() - aSize.Height()) / 2 );
SetPosPixel(aPos);
}
@@ -113,7 +113,7 @@ void ObjectCatalog::ArrangeWindows()
else
{
Size aTitleSize = LogicToPixel(Size(3, 10), MapMode(MapUnit::MapAppFont));
- aTitleSize.Width() = aSize.Width() - 2*aTitleSize.Width();
+ aTitleSize.setWidth( aSize.Width() - 2*aTitleSize.Width() );
aTitle->SetPosPixel(LogicToPixel(Point(3, 3), MapMode(MapUnit::MapAppFont)));
aTitle->SetSizePixel(aTitleSize);
aTitle->Show();
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 4aa1315223df..397a1bc69f75 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -493,25 +493,25 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
// align with grid
Size aGridSize_(long(pDlgEdView->GetSnapGridWidthX()), long(pDlgEdView->GetSnapGridWidthY()));
- aSize.Width() -= aSize.Width() % aGridSize_.Width();
- aSize.Height() -= aSize.Height() % aGridSize_.Height();
+ aSize.setWidth( aSize.Width() - aSize.Width() % aGridSize_.Width() );
+ aSize.setHeight( aSize.Height() - aSize.Height() % aGridSize_.Height() );
Point aPos;
Size aOutSize = rRenderContext.GetOutputSize();
- aPos.X() = (aOutSize.Width()>>1) - (aSize.Width()>>1);
- aPos.Y() = (aOutSize.Height()>>1) - (aSize.Height()>>1);
+ aPos.setX( (aOutSize.Width()>>1) - (aSize.Width()>>1) );
+ aPos.setY( (aOutSize.Height()>>1) - (aSize.Height()>>1) );
// align with grid
- aPos.X() -= aPos.X() % aGridSize_.Width();
- aPos.Y() -= aPos.Y() % aGridSize_.Height();
+ aPos.setX( aPos.X() - aPos.X() % aGridSize_.Width() );
+ aPos.setY( aPos.Y() - aPos.Y() % aGridSize_.Height() );
// don't put in the corner
Point aMinPos = rRenderContext.PixelToLogic( Point( 30, 20 ) );
if( (aPos.X() < aMinPos.X()) || (aPos.Y() < aMinPos.Y()) )
{
aPos = aMinPos;
- aPos.X() -= aPos.X() % aGridSize_.Width();
- aPos.Y() -= aPos.Y() % aGridSize_.Height();
+ aPos.setX( aPos.X() - aPos.X() % aGridSize_.Width() );
+ aPos.setY( aPos.Y() - aPos.Y() % aGridSize_.Height() );
}
// set dialog position and size
@@ -617,8 +617,8 @@ void DlgEditor::CreateDefaultObject()
// set position and size
Size aSize = rWindow.PixelToLogic( Size( 96, 24 ) );
Point aPoint = pDlgEdForm->GetSnapRect().Center();
- aPoint.X() -= aSize.Width() / 2;
- aPoint.Y() -= aSize.Height() / 2;
+ aPoint.setX( aPoint.X() - aSize.Width() / 2 );
+ aPoint.setY( aPoint.Y() - aSize.Height() / 2 );
pDlgEdObj->SetSnapRect( tools::Rectangle( aPoint, aSize ) );
// set default property values
@@ -1156,8 +1156,8 @@ void DlgEditor::Print( Printer* pPrinter, const OUString& rTitle ) // not wor
pPrinter->SetFont( aFont );
Size aPaperSz = pPrinter->GetOutputSize();
- aPaperSz.Width() -= (Print::nLeftMargin + Print::nRightMargin);
- aPaperSz.Height() -= (Print::nTopMargin + Print::nBottomMargin);
+ aPaperSz.setWidth( aPaperSz.Width() - (Print::nLeftMargin + Print::nRightMargin) );
+ aPaperSz.setHeight( aPaperSz.Height() - (Print::nTopMargin + Print::nBottomMargin) );
lcl_PrintHeader( pPrinter, rTitle );
@@ -1173,21 +1173,21 @@ void DlgEditor::Print( Printer* pPrinter, const OUString& rTitle ) // not wor
Size aOutputSz;
if( nBmpSzHeight * nScaleX <= nPaperSzHeight )
{
- aOutputSz.Width() = static_cast<long>(nBmpSzWidth * nScaleX);
- aOutputSz.Height() = static_cast<long>(nBmpSzHeight * nScaleX);
+ aOutputSz.setWidth( static_cast<long>(nBmpSzWidth * nScaleX) );
+ aOutputSz.setHeight( static_cast<long>(nBmpSzHeight * nScaleX) );
}
else
{
- aOutputSz.Width() = static_cast<long>(nBmpSzWidth * nScaleY);
- aOutputSz.Height() = static_cast<long>(nBmpSzHeight * nScaleY);
+ aOutputSz.setWidth( static_cast<long>(nBmpSzWidth * nScaleY) );
+ aOutputSz.setHeight( static_cast<long>(nBmpSzHeight * nScaleY) );
}
Point aPosOffs(
(aPaperSz.Width() / 2) - (aOutputSz.Width() / 2),
(aPaperSz.Height()/ 2) - (aOutputSz.Height() / 2));
- aPosOffs.X() += Print::nLeftMargin;
- aPosOffs.Y() += Print::nTopMargin;
+ aPosOffs.setX( aPosOffs.X() + Print::nLeftMargin );
+ aPosOffs.setY( aPosOffs.Y() + Print::nTopMargin );
pPrinter->DrawBitmap( aPosOffs, aOutputSz, aDlg );
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 1bdd8718d78b..d14f49fcdc9f 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -140,8 +140,8 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
aFormPos = pDevice->LogicToPixel( aFormPos, MapMode( MapUnit::Map100thMM ) );
// subtract form position
- aPos.Width() -= aFormPos.Width();
- aPos.Height() -= aFormPos.Height();
+ aPos.setWidth( aPos.Width() - aFormPos.Width() );
+ aPos.setHeight( aPos.Height() - aFormPos.Height() );
// take window borders into account
Reference< beans::XPropertySet > xPSetForm( pForm->GetUnoControlModel(), UNO_QUERY );
@@ -153,8 +153,8 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
if( bDecoration )
{
awt::DeviceInfo aDeviceInfo = pForm->getDeviceInfo();
- aPos.Width() -= aDeviceInfo.LeftInset;
- aPos.Height() -= aDeviceInfo.TopInset;
+ aPos.setWidth( aPos.Width() - aDeviceInfo.LeftInset );
+ aPos.setHeight( aPos.Height() - aDeviceInfo.TopInset );
}
// convert pixel to logic units
@@ -201,8 +201,8 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
if( bDecoration )
{
awt::DeviceInfo aDeviceInfo = pForm->getDeviceInfo();
- aSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
- aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
+ aSize.setWidth( aSize.Width() - aDeviceInfo.LeftInset + aDeviceInfo.RightInset );
+ aSize.setHeight( aSize.Height() - aDeviceInfo.TopInset + aDeviceInfo.BottomInset );
}
// convert pixel to logic units
aPos = pDevice->PixelToLogic(aPos, MapMode(MapUnit::MapAppFont));
@@ -251,8 +251,8 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
aFormPos = pDevice->LogicToPixel(aFormPos, MapMode(MapUnit::MapAppFont));
// add form position
- aPos.Width() += aFormPos.Width();
- aPos.Height() += aFormPos.Height();
+ aPos.setWidth( aPos.Width() + aFormPos.Width() );
+ aPos.setHeight( aPos.Height() + aFormPos.Height() );
// take window borders into account
bool bDecoration = true;
@@ -260,8 +260,8 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
if( bDecoration )
{
awt::DeviceInfo aDeviceInfo = pForm->getDeviceInfo();
- aPos.Width() += aDeviceInfo.LeftInset;
- aPos.Height() += aDeviceInfo.TopInset;
+ aPos.setWidth( aPos.Width() + aDeviceInfo.LeftInset );
+ aPos.setHeight( aPos.Height() + aDeviceInfo.TopInset );
}
// convert pixel to 100th_mm
@@ -309,8 +309,8 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
if( bDecoration )
{
awt::DeviceInfo aDeviceInfo = pForm->getDeviceInfo();
- aSize.Width() += aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
- aSize.Height() += aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
+ aSize.setWidth( aSize.Width() + aDeviceInfo.LeftInset + aDeviceInfo.RightInset );
+ aSize.setHeight( aSize.Height() + aDeviceInfo.TopInset + aDeviceInfo.BottomInset );
}
// convert pixel to 100th_mm
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 8c42ca2ec0c7..963674da5f7f 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -156,8 +156,8 @@ void PropBrw::ImplReCreateController()
Point aPropWinPos = Point( WIN_BORDER, WIN_BORDER );
Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y);
- aPropWinSize.Width() -= (2*WIN_BORDER);
- aPropWinSize.Height() -= (2*WIN_BORDER);
+ aPropWinSize.setWidth( aPropWinSize.Width() - (2*WIN_BORDER) );
+ aPropWinSize.setHeight( aPropWinSize.Height() - (2*WIN_BORDER) );
if ( m_xBrowserComponentWindow.is() )
{
@@ -426,8 +426,8 @@ void PropBrw::Resize()
// adjust size
Size aSize_ = GetOutputSizePixel();
Size aPropWinSize( aSize_ );
- aPropWinSize.Width() -= (2*WIN_BORDER);
- aPropWinSize.Height() -= (2*WIN_BORDER);
+ aPropWinSize.setWidth( aPropWinSize.Width() - (2*WIN_BORDER) );
+ aPropWinSize.setHeight( aPropWinSize.Height() - (2*WIN_BORDER) );
if (m_xBrowserComponentWindow.is())
{
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 2fdb4e057752..3ff12c04a24c 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -92,7 +92,7 @@ void SvRTLInputBox::InitButtons( const Size& rDlgSize )
aCancel->SetSizePixel( LogicToPixel( Size( 45, 15) ));
Point aPos( rDlgSize.Width()-45-10, 5 );
aOk->SetPosPixel( LogicToPixel( aPos ));
- aPos.Y() += 16;
+ aPos.setY( aPos.Y() + 16 );
aCancel->SetPosPixel( LogicToPixel( aPos ));
aOk->SetClickHdl(LINK(this,SvRTLInputBox, OkHdl));
aCancel->SetClickHdl(LINK(this,SvRTLInputBox,CancelHdl));
@@ -123,8 +123,8 @@ void SvRTLInputBox::PositionPrompt(const OUString& rPrompt,const Size& rDlgSize)
aPromptText->SetPosPixel( LogicToPixel(Point(5,5)));
aPromptText->SetText( aText_ );
Size aSize( rDlgSize );
- aSize.Width() -= 70;
- aSize.Height() -= 50;
+ aSize.setWidth( aSize.Width() - 70 );
+ aSize.setHeight( aSize.Height() - 50 );
aPromptText->SetSizePixel( LogicToPixel(aSize));
}
More information about the Libreoffice-commits
mailing list