summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrishna keshav <princy.krishnakeshav@gmail.com>2016-07-06 01:36:02 +0530
committerCaolán McNamara <caolanm@redhat.com>2016-07-06 09:54:13 +0000
commit50094d8f8eb7067009c3e9a86053d82e4c0af739 (patch)
treebead090def524029ebfd0045b7f788dc94a7b2d3
parentde4908eb4d2f1f2ce38a37eea18a9efc4a0073b1 (diff)
tdf#77667 Remove gcc3 workaround
where it could handle instantiated objects as parameters Removed objects of 'Point' as 'Point()' can be instantiated as a parameter. Change-Id: Iad2dceed6dfe8bd3cc555758c518620cd975a8fc Reviewed-on: https://gerrit.libreoffice.org/26967 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/source/outdev/transparent.cxx3
-rw-r--r--vcl/source/window/dockmgr.cxx6
-rw-r--r--vcl/source/window/dockwin.cxx5
-rw-r--r--vcl/source/window/tabpage.cxx3
4 files changed, 6 insertions, 11 deletions
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 0f06d065e33c..4376e39d0b4e 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -117,7 +117,6 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel )
{
- Point aPt;
Point aDestPt( LogicToPixel( rDestPt ) );
Size aDestSz( LogicToPixel( rDestSize ) );
Rectangle aSrcRect( rSrcPtPixel, rSrcSizePixel );
@@ -149,7 +148,7 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
}
// source cropped?
- if( aSrcRect != Rectangle( aPt, aPaint.GetSizePixel() ) )
+ if( aSrcRect != Rectangle( Point(), aPaint.GetSizePixel() ) )
{
aPaint.Crop( aSrcRect );
aMask.Crop( aSrcRect );
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index c81c1b019c8b..3dafc7be0532 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -169,8 +169,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockingHdl, void*, void)
vcl::Window *pBorder = GetWindow( GetWindowType::Border );
if( pBorder != this )
{
- Point aPt;
- Rectangle aBorderRect( aPt, pBorder->GetSizePixel() );
+ Rectangle aBorderRect( Point(), pBorder->GetSizePixel() );
sal_Int32 nLeft, nTop, nRight, nBottom;
GetBorder( nLeft, nTop, nRight, nBottom );
// limit borderrect to the caption part only and without the resizing borders
@@ -588,8 +587,7 @@ Point ImplPopupFloatWin::GetTearOffPosition() const
void ImplPopupFloatWin::DrawBorder(vcl::RenderContext& rRenderContext)
{
rRenderContext.SetFillColor();
- Point aPt;
- Rectangle aRect( aPt, GetOutputSizePixel() );
+ Rectangle aRect( Point(), GetOutputSizePixel() );
vcl::Region oldClipRgn( GetClipRegion( ) );
vcl::Region aClipRgn( aRect );
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 3442d32ea421..3ec763444b2c 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -552,11 +552,10 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt )
}
if ( mbDragFull )
{
- Point aPos;
- Point aOldPos = OutputToScreenPixel( aPos );
+ Point aOldPos = OutputToScreenPixel( Point() );
EndDocking( aTrackRect, mbLastFloatMode );
// repaint if state or position has changed
- if ( aOldPos != OutputToScreenPixel( aPos ) )
+ if ( aOldPos != OutputToScreenPixel( Point() ) )
{
ImplUpdateAll();
ImplGetFrameWindow()->ImplUpdateAll();
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 2079ec9bdb50..36c950658c86 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -141,10 +141,9 @@ void TabPage::Paint( vcl::RenderContext& rRenderContext, const Rectangle& )
nState &= ~ControlState::ENABLED;
if ( HasFocus() )
nState |= ControlState::FOCUSED;
- Point aPoint;
// pass the whole window region to NWF as the tab body might be a gradient or bitmap
// that has to be scaled properly, clipping makes sure that we do not paint too much
- Rectangle aCtrlRegion( aPoint, GetOutputSizePixel() );
+ Rectangle aCtrlRegion( Point(), GetOutputSizePixel() );
rRenderContext.DrawNativeControl( ControlType::TabBody, part, aCtrlRegion, nState,
aControlValue, OUString() );
}