summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-04-19 12:57:58 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2014-04-19 05:39:01 +0000
commit52f296ac1a77cded6d4318a5f5d13bbf1c4f6877 (patch)
tree09f82e9e59ce41a6e535ffef6e2fb3ca5752c76d
parent4afb2a6a95fd7ca09542fc128cbb00dd9708b81c (diff)
Remove gcc3 workaround for bug long since fixed in gcc
Change-Id: Ieb1c41481a79ab8713663caee3d5373640ff0ec8 Reviewed-on: https://gerrit.libreoffice.org/9102 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
-rw-r--r--basebmp/source/bitmapdevice.cxx6
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx3
-rw-r--r--reportdesign/source/ui/misc/toolboxcontroller.cxx3
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx3
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx3
-rw-r--r--vcl/source/outdev/outdev.cxx3
6 files changed, 7 insertions, 14 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index e2836dedf260..bf3de07a80eb 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1616,8 +1616,7 @@ void BitmapDevice::drawMaskedColor( Color aSrcColor,
BitmapDeviceSharedPtr pAlphaCopy(
cloneBitmapDevice( aSize,
shared_from_this()) );
- basegfx::B2ITuple aGcc3WorkaroundTemporary;
- const basegfx::B2IBox aAlphaRange( aGcc3WorkaroundTemporary,
+ const basegfx::B2IBox aAlphaRange( basegfx::B2ITuple(),
aSize );
pAlphaCopy->drawBitmap(rAlphaMask,
aSrcRange,
@@ -1669,8 +1668,7 @@ void BitmapDevice::drawMaskedColor( Color aSrcColor,
BitmapDeviceSharedPtr pAlphaCopy(
cloneBitmapDevice( aSize,
shared_from_this()) );
- basegfx::B2ITuple aGcc3WorkaroundTemporary;
- const basegfx::B2IBox aAlphaRange( aGcc3WorkaroundTemporary,
+ const basegfx::B2IBox aAlphaRange( basegfx::B2ITuple(),
aSize );
pAlphaCopy->drawBitmap(rAlphaMask,
aSrcRange,
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index fe06103c68c0..b255925d7f4e 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1580,8 +1580,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause,
// create the dialog
uno::Reference< ui::dialogs::XExecutableDialog > xDialog = sdb::FilterDialog::createWithQuery(m_xContext, xComposer, m_xRowSet, xInspectorWindow);
- const OUString aGcc3WorkaroundTemporary( ModuleRes(RID_STR_FILTER));
- const OUString sPropertyUIName( aGcc3WorkaroundTemporary );
+ const OUString sPropertyUIName(OUString(ModuleRes(RID_STR_FILTER)));
// initialize the dialog
xDialog->setTitle( sPropertyUIName );
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index e01a09264e96..b0e312bd82e0 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -247,8 +247,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event
{
util::Color nColor(COL_TRANSPARENT);
Event.State >>= nColor;
- ::Color aGcc3WorkaroundTemporary( nColor);
- SvxColorItem aColorItem(aGcc3WorkaroundTemporary,1);
+ SvxColorItem aColorItem(::Color(nColor), 1);
if ( SID_ATTR_CHAR_COLOR2 == m_nSlotId )
static_cast<SvxColorExtToolBoxControl*>(m_pToolbarController.get())->StateChanged(m_nSlotId,Event.IsEnabled ? SFX_ITEM_SET : SFX_ITEM_DISABLED,&aColorItem);
else
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index cf258775159f..27dc3e04604c 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -113,8 +113,7 @@ void OStartMarker::Paint( const Rectangle& rRect )
SetClipRegion(Region(PixelToLogic(Rectangle(Point(),Size(nSize,aSize.Height())))));
}
- const Point aGcc3WorkaroundTemporary;
- Rectangle aWholeRect(aGcc3WorkaroundTemporary,aSize);
+ Rectangle aWholeRect(Point(),aSize);
{
const ColorChanger aColors( this, m_nTextBoundaries, m_nColor );
PolyPolygon aPoly;
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index ad8400229aaf..860da4b03c3a 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -91,8 +91,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
aPos.Y() *= 0.5;
Rectangle aOutRect( aPos, aOut );
aOutRect = m_pParent->PixelToLogic( aOutRect );
- Point aGcc3WorkaroundTemporary;
- Rectangle aWorkArea(aGcc3WorkaroundTemporary,pScrollWindow->getTotalSize());
+ Rectangle aWorkArea(Point(), pScrollWindow->getTotalSize());
aWorkArea.Right() -= (long)aStartWidth;
aWorkArea = pScrollWindow->PixelToLogic( aWorkArea );
if( !aOutRect.IsInside( rPos ) && aWorkArea.IsInside( rPos ) )
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index cba75421b4e4..f00f2bfeae27 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -1590,8 +1590,7 @@ void OutputDevice::Erase()
if( aCtrlPart != 0 && ! pWindow->IsControlBackground() )
{
ImplControlValue aControlValue;
- Point aGcc3WorkaroundTemporary;
- Rectangle aCtrlRegion( aGcc3WorkaroundTemporary, GetOutputSizePixel() );
+ Rectangle aCtrlRegion( Point(), GetOutputSizePixel() );
ControlState nState = 0;
if( pWindow->IsEnabled() ) nState |= CTRL_STATE_ENABLED;