diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-04-28 23:09:13 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:27:52 +0300 |
| commit | d883c12556a71c5d3719454b1f95809a505f0ace (patch) | |
| tree | 6f0c1cc518a3727db95b72d609ec9db793041b20 | |
| parent | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff) | |
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.
In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.
Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
154 files changed, 415 insertions, 440 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 811fca30f4b5..92dd30e8faf0 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -460,7 +460,7 @@ throw(RuntimeException, std::exception) sal_Int32 nIndex = -1; if ( m_pIconCtrl ) { - ::vcl::ControlLayoutData aLayoutData; + vcl::ControlLayoutData aLayoutData; Rectangle aItemRect = GetBoundingBox_Impl(); m_pIconCtrl->RecordLayoutData( &aLayoutData, aItemRect ); Point aPnt( VCLPoint( aPoint ) ); diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 7f68e1116ed9..e145b98459f7 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -665,7 +665,7 @@ namespace accessibility SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) { - ::vcl::ControlLayoutData aLayoutData; + vcl::ControlLayoutData aLayoutData; Rectangle aItemRect = GetBoundingBox(); getListBox()->RecordLayoutData( &aLayoutData, aItemRect ); Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex ); @@ -687,7 +687,7 @@ namespace accessibility SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) { - ::vcl::ControlLayoutData aLayoutData; + vcl::ControlLayoutData aLayoutData; Rectangle aItemRect = GetBoundingBox(); getListBox()->RecordLayoutData( &aLayoutData, aItemRect ); Point aPnt( VCLPoint( aPoint ) ); diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index c9c1b16eb6d8..d1ea1cfe5d86 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -575,7 +575,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I if ( xClipboard.is() ) { OUString sText( getTextRange( nStartIndex, nEndIndex ) ); - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText ); SolarMutexReleaser aReleaser; xClipboard->setContents( pDataObj, NULL ); diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 24f8ef546c87..9ee4986ab015 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -403,7 +403,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd { OUString sText( getTextRange( nStartIndex, nEndIndex ) ); - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText ); SolarMutexReleaser aReleaser; xClipboard->setContents( pDataObj, NULL ); diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 2ac6bf1834b0..586a1d7a525f 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -138,7 +138,7 @@ void VCLXAccessibleStatusBarItem::SetItemText( const OUString& sItemText ) OUString VCLXAccessibleStatusBarItem::GetItemText() { OUString sText; - ::vcl::ControlLayoutData aLayoutData; + vcl::ControlLayoutData aLayoutData; if ( m_pStatusBar ) { Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId ); @@ -533,7 +533,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( m_pStatusBar ) { - ::vcl::ControlLayoutData aLayoutData; + vcl::ControlLayoutData aLayoutData; Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId ); m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect ); Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex ); @@ -553,7 +553,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint sal_Int32 nIndex = -1; if ( m_pStatusBar ) { - ::vcl::ControlLayoutData aLayoutData; + vcl::ControlLayoutData aLayoutData; Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId ); m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect ); Point aPnt( VCLPoint( aPoint ) ); @@ -591,7 +591,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 { OUString sText( getTextRange( nStartIndex, nEndIndex ) ); - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText ); SolarMutexReleaser aReleaser; xClipboard->setContents( pDataObj, NULL ); diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 34aac110c86e..f0bf4d36279b 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -664,7 +664,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI { OUString sText( getTextRange( nStartIndex, nEndIndex ) ); - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText ); SolarMutexReleaser aReleaser; xClipboard->setContents( pDataObj, NULL ); diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 7fbe48ab018f..1050cdbc747b 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -383,7 +383,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 { OUString sText( getTextRange( nStartIndex, nEndIndex ) ); - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText ); SolarMutexReleaser aReleaser; xClipboard->setContents( pDataObj, NULL ); diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 3209711c1156..719df9c1730c 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -522,7 +522,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa { OUString sText( getTextRange( nStartIndex, nEndIndex ) ); - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText ); SolarMutexReleaser aReleaser; xClipboard->setContents( pDataObj, NULL ); diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 7a918f4b38be..64686fce6bd0 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -319,7 +319,7 @@ namespace cairocanvas // TODO(F1): Add support for floating point bitmap formats uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, uno::UNO_QUERY_THROW); - ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap(xIntBmp); + ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap(xIntBmp); if( !!aBmpEx ) return aBmpEx; diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 2a98ea7b6e09..92782af3cb49 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -135,7 +135,7 @@ namespace cairocanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); + aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); } // extract alpha, and make color opaque @@ -217,7 +217,7 @@ namespace cairocanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(renderState.DeviceColor ); + aColor = vcl::unotools::stdColorSpaceSequenceToColor(renderState.DeviceColor ); } // setup font color diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 684b61afcf2c..7fd8a4663334 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -113,7 +113,7 @@ namespace cairocanvas const Size aPixelSize( mpRefDevice->LogicToPixel(Size(1,1)) ); mpRefDevice->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aPixelSize ); + return vcl::unotools::size2DFromSize( aPixelSize ); } geometry::RealSize2D DeviceHelper::getPhysicalSize() @@ -127,7 +127,7 @@ namespace cairocanvas const Size aLogSize( mpRefDevice->PixelToLogic(mpRefDevice->GetOutputSizePixel()) ); mpRefDevice->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aLogSize ); + return vcl::unotools::size2DFromSize( aLogSize ); } uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 15883c668f41..e9ae26121a45 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -103,7 +103,7 @@ namespace dxcanvas Color aColor( COL_WHITE ); if( rRenderState.DeviceColor.getLength() > 2 ) - aColor = ::vcl::unotools::doubleSequenceToColor( + aColor = vcl::unotools::doubleSequenceToColor( rRenderState.DeviceColor, mxGraphicDevice->getDeviceColorSpace()); aColor.SetTransparency(0); diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index f65b5fcaa594..727008049e68 100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx @@ -500,7 +500,7 @@ namespace dxcanvas if( !xIntBmp.is() ) return false; - ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap( xIntBmp ); + ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap( xIntBmp ); if( !aBmpEx ) return false; diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index da0c735e0bcc..37122d8740ca 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -163,7 +163,7 @@ namespace oglcanvas const Size aPixelSize( pChildWindow->LogicToPixel(Size(1,1)) ); pChildWindow->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aPixelSize ); + return vcl::unotools::size2DFromSize( aPixelSize ); } geometry::RealSize2D SpriteDeviceHelper::getPhysicalSize() @@ -178,7 +178,7 @@ namespace oglcanvas const Size aLogSize( pChildWindow->PixelToLogic(pChildWindow->GetOutputSizePixel()) ); pChildWindow->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aLogSize ); + return vcl::unotools::size2DFromSize( aLogSize ); } uno::Reference< rendering::XLinePolyPolygon2D > SpriteDeviceHelper::createCompatibleLinePolyPolygon( diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index efbd61e72369..5c0a310d8d8e 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -95,7 +95,7 @@ namespace vclcanvas if( !mpBackBuffer ) return geometry::IntegerSize2D(); - return ::vcl::unotools::integerSize2DFromSize( mpBackBuffer->getBitmapSizePixel() ); + return vcl::unotools::integerSize2DFromSize( mpBackBuffer->getBitmapSizePixel() ); } void CanvasBitmapHelper::clear() @@ -118,7 +118,7 @@ namespace vclcanvas BitmapEx aRes( mpBackBuffer->getBitmapReference() ); - aRes.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize), + aRes.Scale( vcl::unotools::sizeFromRealSize2D(newSize), beFast ? BMP_SCALE_DEFAULT : BMP_SCALE_BESTQUALITY ); return uno::Reference< rendering::XBitmap >( diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 5bf8b372655c..37a51769a888 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -723,7 +723,7 @@ namespace vclcanvas { // optimized case: identity matrix, or only // translational components. - mpOutDev->getOutDev().DrawBitmapEx( ::vcl::unotools::pointFromB2DPoint( aOutputPos ), + mpOutDev->getOutDev().DrawBitmapEx( vcl::unotools::pointFromB2DPoint( aOutputPos ), aBmpEx ); if( mp2ndOutDev ) @@ -743,7 +743,7 @@ namespace vclcanvas aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aBmpEx.GetMask() ); } - mp2ndOutDev->getOutDev().DrawBitmapEx( ::vcl::unotools::pointFromB2DPoint( aOutputPos ), + mp2ndOutDev->getOutDev().DrawBitmapEx( vcl::unotools::pointFromB2DPoint( aOutputPos ), aBmpEx ); } @@ -838,7 +838,7 @@ namespace vclcanvas } // output GraphicObject - const ::Point aPt( ::vcl::unotools::pointFromB2DPoint( aOutputPos ) ); + const ::Point aPt( vcl::unotools::pointFromB2DPoint( aOutputPos ) ); const ::Size aSz( ::basegfx::fround( aScale.getX() * aBmpSize.Width() ), ::basegfx::fround( aScale.getY() * aBmpSize.Height() ) ); @@ -904,7 +904,7 @@ namespace vclcanvas if( !mpOutDev.get() ) return geometry::IntegerSize2D(); // we're disposed - return ::vcl::unotools::integerSize2DFromSize( mpOutDev->getOutDev().GetOutputSizePixel() ); + return vcl::unotools::integerSize2DFromSize( mpOutDev->getOutDev().GetOutputSizePixel() ); } uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize, @@ -925,7 +925,7 @@ namespace vclcanvas Bitmap aBitmap( rOutDev.GetBitmap(aEmptyPoint, aBmpSize) ); - aBitmap.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize), + aBitmap.Scale( vcl::unotools::sizeFromRealSize2D(newSize), beFast ? BMP_SCALE_DEFAULT : BMP_SCALE_BESTQUALITY ); return uno::Reference< rendering::XBitmap >( @@ -941,7 +941,7 @@ namespace vclcanvas rLayout = getMemoryLayout(); // TODO(F2): Support alpha canvas here - const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); + const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); OutputDevice& rOutDev( mpOutDev->getOutDev() ); @@ -1002,7 +1002,7 @@ namespace vclcanvas rOutDev.EnableMapMode( false ); rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW ); - const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); + const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); const sal_uInt16 nBitCount( ::std::min( (sal_uInt16)24U, (sal_uInt16)rOutDev.GetBitCount() ) ); const BitmapPalette* pPalette = NULL; @@ -1144,7 +1144,7 @@ namespace vclcanvas "Mismatching memory layout" ); // TODO(F2): Support alpha canvas here - rOutDev.DrawPixel( ::vcl::unotools::pointFromIntegerPoint2D( pos ), + rOutDev.DrawPixel( vcl::unotools::pointFromIntegerPoint2D( pos ), ::canvas::tools::stdIntSequenceToColor( color )); } @@ -1175,7 +1175,7 @@ namespace vclcanvas // TODO(F2): Support alpha canvas here return ::canvas::tools::colorToStdIntSequence( rOutDev.GetPixel( - ::vcl::unotools::pointFromIntegerPoint2D( pos ))); + vcl::unotools::pointFromIntegerPoint2D( pos ))); } rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout() @@ -1222,7 +1222,7 @@ namespace vclcanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor( + aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); } @@ -1297,7 +1297,7 @@ namespace vclcanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor( + aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); } diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index b46746e2cf8b..77b085319efd 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -133,8 +133,8 @@ namespace vclcanvas // calc length of bound rect diagonal const ::basegfx::B2DVector aBoundRectDiagonal( - ::vcl::unotools::b2DPointFromPoint( rBounds.TopLeft() ) - - ::vcl::unotools::b2DPointFromPoint( rBounds.BottomRight() ) ); + vcl::unotools::b2DPointFromPoint( rBounds.TopLeft() ) - + vcl::unotools::b2DPointFromPoint( rBounds.BottomRight() ) ); const double nDiagonalLength( aBoundRectDiagonal.getLength() ); // create direction of gradient: @@ -153,7 +153,7 @@ namespace vclcanvas aLeftBottom, aRightTop, aRightBottom, - ::vcl::unotools::b2DRectangleFromRectangle( rBounds ) ); + vcl::unotools::b2DRectangleFromRectangle( rBounds ) ); // render gradient @@ -643,11 +643,11 @@ namespace vclcanvas aTextureTransform ); rOutDev.SetLineColor( COL_RED ); rOutDev.SetFillColor(); - rOutDev.DrawRect( ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); + rOutDev.DrawRect( vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); rOutDev.SetLineColor( COL_BLUE ); ::Polygon aPoly1( - ::vcl::unotools::rectangleFromB2DRectangle( aRect )); + vcl::unotools::rectangleFromB2DRectangle( aRect )); ::basegfx::B2DPolygon aPoly2( aPoly1.getB2DPolygon() ); aPoly2.transform( aTextureTransform ); ::Polygon aPoly3( aPoly2 ); @@ -767,7 +767,7 @@ namespace vclcanvas aTotalTransform ); const ::Rectangle aIntegerTextureDeviceRect( - ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); + vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); if( bRectangularPolygon && aIntegerTextureDeviceRect == aPolygonDeviceRect ) @@ -911,7 +911,7 @@ namespace vclcanvas // start point from it. ::basegfx::B2DRectangle aTextureSpacePolygonRect; ::canvas::tools::calcTransformedRectBounds( aTextureSpacePolygonRect, - ::vcl::unotools::b2DRectangleFromRectangle( + vcl::unotools::b2DRectangleFromRectangle( aPolygonDeviceRect ), aInverseTextureTransform ); @@ -939,12 +939,12 @@ namespace vclcanvas aSingleTextureRect, aPureTotalTransform ); - const ::Point aPtRepeat( ::vcl::unotools::pointFromB2DPoint( + const ::Point aPtRepeat( vcl::unotools::pointFromB2DPoint( aSingleDeviceTextureRect.getMinimum() ) ); const ::Size aSz( ::basegfx::fround( aScale.getX() * aBmpSize.Width ), ::basegfx::fround( aScale.getY() * aBmpSize.Height ) ); - const ::Size aIntegerNextTileX( ::vcl::unotools::sizeFromB2DSize(aNextTileX) ); - const ::Size aIntegerNextTileY( ::vcl::unotools::sizeFromB2DSize(aNextTileY) ); + const ::Size aIntegerNextTileX( vcl::unotools::sizeFromB2DSize(aNextTileX) ); + const ::Size aIntegerNextTileY( vcl::unotools::sizeFromB2DSize(aNextTileY) ); const ::Point aPt( textures[0].RepeatModeX == rendering::TexturingMode::NONE ? ::basegfx::fround( aOutputPos.getX() ) : aPtRepeat.X(), diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index dd600fc05f33..63fdc8a2268d 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -57,7 +57,7 @@ namespace vclcanvas const Size aPixelSize( rOutDev.LogicToPixel(Size(1,1)) ); rOutDev.SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aPixelSize ); + return vcl::unotools::size2DFromSize( aPixelSize ); } geometry::RealSize2D DeviceHelper::getPhysicalSize() @@ -72,7 +72,7 @@ namespace vclcanvas const Size aLogSize( rOutDev.PixelToLogic(rOutDev.GetOutputSizePixel()) ); rOutDev.SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aLogSize ); + return vcl::unotools::size2DFromSize( aLogSize ); } uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( @@ -115,7 +115,7 @@ namespace vclcanvas return uno::Reference< rendering::XBitmap >(); // we're disposed return uno::Reference< rendering::XBitmap >( - new CanvasBitmap( ::vcl::unotools::sizeFromIntegerSize2D(size), + new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size), false, *rDevice.get(), mpOutDev ) ); @@ -136,7 +136,7 @@ namespace vclcanvas return uno::Reference< rendering::XBitmap >(); // we're disposed return uno::Reference< rendering::XBitmap >( - new CanvasBitmap( ::vcl::unotools::sizeFromIntegerSize2D(size), + new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size), true, *rDevice.get(), mpOutDev ) ); diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index 4167d1f19eb6..cc25ea084bc9 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -87,7 +87,7 @@ namespace vclcanvas uno::Reference< rendering::XIntegerReadOnlyBitmap > xIntBmp( xBitmap, uno::UNO_QUERY_THROW ); - ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap( xIntBmp ); + ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap( xIntBmp ); if( !!aBmpEx ) return aBmpEx; @@ -181,7 +181,7 @@ namespace vclcanvas rViewState, rRenderState); - return ::vcl::unotools::pointFromB2DPoint( aPoint ); + return vcl::unotools::pointFromB2DPoint( aPoint ); } ::tools::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 51a234feca1c..d003736013ed 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -71,8 +71,8 @@ namespace vclcanvas OutputDevice& rBackBuffer, const ::basegfx::B2DRange& rArea ) { - const ::Point& rPos( ::vcl::unotools::pointFromB2DPoint( rArea.getMinimum()) ); - const ::Size& rSize( ::vcl::unotools::sizeFromB2DSize( rArea.getRange()) ); + const ::Point& rPos( vcl::unotools::pointFromB2DPoint( rArea.getMinimum()) ); + const ::Size& rSize( vcl::unotools::sizeFromB2DSize( rArea.getRange()) ); rOutDev.DrawOutDev( rPos, rSize, rPos, rSize, rBackBuffer ); } @@ -82,7 +82,7 @@ namespace vclcanvas const ::basegfx::B2IRange& rArea ) { const Rectangle& rRequestedArea( - ::vcl::unotools::rectangleFromB2IRectangle( rArea ) ); + vcl::unotools::rectangleFromB2IRectangle( rArea ) ); // clip output to actual update region (otherwise a) // wouldn't save much render time, and b) will clutter @@ -444,8 +444,8 @@ namespace vclcanvas else { // scroll rOutDev content - rOutDev.CopyArea( ::vcl::unotools::pointFromB2IPoint( aDestPos ), - ::vcl::unotools::pointFromB2IPoint( aSourceRect.getMinimum() ), + rOutDev.CopyArea( vcl::unotools::pointFromB2IPoint( aDestPos ), + vcl::unotools::pointFromB2IPoint( aSourceRect.getMinimum() ), // TODO(Q2): use numeric_cast to check range ::Size( static_cast<sal_Int32>(aSourceRect.getRange().getX()), static_cast<sal_Int32>(aSourceRect.getRange().getY()) ) ); @@ -583,7 +583,7 @@ namespace vclcanvas rSortedUpdateSprites.end(), ::boost::bind( &spriteRedrawStub2, ::boost::ref( *maVDev.get() ), - ::vcl::unotools::b2DPointFromPoint( + vcl::unotools::b2DPointFromPoint( aOutputPosition), _1 ) ); diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 675ea920ef6a..e79e012e939b 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -114,8 +114,8 @@ namespace vclcanvas // rounded to integer values. From now on, only those // rounded values are used, to keep clip and content in // sync. - ::Size aOutputSize( ::vcl::unotools::sizeFromB2DSize( rOrigOutputSize ) ); - ::Point aOutPos( ::vcl::unotools::pointFromB2DPoint( rPos ) ); + ::Size aOutputSize( vcl::unotools::sizeFromB2DSize( rOrigOutputSize ) ); + ::Point aOutPos( vcl::unotools::pointFromB2DPoint( rPos ) ); // TODO(F3): Support for alpha-VDev diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index c03c0b16ad92..c2726669d643 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -407,7 +407,7 @@ void AccessibleBase::BroadcastAccEvent( // send event to global message queue if( bSendGlobally ) { - ::vcl::unohelper::NotifyAccessibleStateEventGlobally( aEvent ); + vcl::unohelper::NotifyAccessibleStateEventGlobally( aEvent ); } } diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 7514bc4205b5..e264d7791ca1 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -241,7 +241,7 @@ static float GetSwapFloat( SvStream& rSt ) static ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > createFont( double& o_rFontRotation, - const ::vcl::Font& rFont, + const vcl::Font& rFont, const ActionFactoryParameters& rParms ); bool createActions( GDIMetaFile& rMtf, const ActionFactoryParameters& rParms, diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index 14fea4effaec..fb0eb33ffec9 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -85,7 +85,7 @@ namespace cppcanvas const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : CachedPrimitiveBase( rCanvas, true ), - mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), + mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), rBmpEx ) ), mpCanvas( rCanvas ), maState() @@ -113,7 +113,7 @@ namespace cppcanvas const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : CachedPrimitiveBase( rCanvas, true ), - mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), + mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), rBmpEx ) ), mpCanvas( rCanvas ), maState() diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 5afa0b27d691..de2812487ca7 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1259,7 +1259,7 @@ namespace cppcanvas } #define COLOR(x) \ - ::vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \ + vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \ (x >> 16) & 0xff, \ (x >> 8) & 0xff, \ x & 0xff), \ @@ -1336,7 +1336,7 @@ namespace cppcanvas { fillColor = brush->secondColor; } - rState.fillColor = ::vcl::unotools::colorToDoubleSequence(fillColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()); + rState.fillColor = vcl::unotools::colorToDoubleSequence(fillColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()); pPolyAction = ActionSharedPtr ( internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, rParms.mrCanvas, rState ) ); } else if (brush->type == 3 || brush->type == 4) @@ -1399,10 +1399,10 @@ namespace cppcanvas OUString aGradientService; const uno::Sequence< double > aStartColor( - ::vcl::unotools::colorToDoubleSequence( brush->solidColor, + vcl::unotools::colorToDoubleSequence( brush->solidColor, rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ) ); const uno::Sequence< double > aEndColor( - ::vcl::unotools::colorToDoubleSequence( brush->secondColor, + vcl::unotools::colorToDoubleSequence( brush->secondColor, rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ) ); uno::Sequence< uno::Sequence < double > > aColors (2); uno::Sequence< double > aStops (2); @@ -1435,7 +1435,7 @@ namespace cppcanvas for (int i = 0; i < brush->colorblendPoints; i++) { aStops[i] = brush->colorblendPositions [i]; - aColors[(brush->type == 4) ? i : brush->colorblendPoints - 1 - i] = ::vcl::unotools::colorToDoubleSequence( brush->colorblendColors [i], + aColors[(brush->type == 4) ? i : brush->colorblendPoints - 1 - i] = vcl::unotools::colorToDoubleSequence( brush->colorblendColors [i], rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ); } } else { @@ -1591,7 +1591,7 @@ namespace cppcanvas { rState.isFillColorSet = false; rState.isLineColorSet = true; - rState.lineColor = ::vcl::unotools::colorToDoubleSequence (pen->GetColor (), + rState.lineColor = vcl::unotools::colorToDoubleSequence (pen->GetColor (), rCanvas->getUNOCanvas ()->getDevice()->getDeviceColorSpace()); basegfx::B2DPolyPolygon aPolyPolygon(polygon); @@ -2169,7 +2169,7 @@ namespace cppcanvas TextActionFactory::createTextAction( // position is just rough guess for now // we should calculate it exactly from layoutRect or font - ::vcl::unotools::pointFromB2DPoint ( point ), + vcl::unotools::pointFromB2DPoint ( point ), ::Size(), ::Color(), ::Size(), @@ -2426,7 +2426,7 @@ namespace cppcanvas ActionSharedPtr pTextAction( TextActionFactory::createTextAction( - ::vcl::unotools::pointFromB2DPoint ( point ), + vcl::unotools::pointFromB2DPoint ( point ), ::Size(), ::Color(), ::Size(), diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 9aeabbaefde3..c5febd08e614 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -103,7 +103,7 @@ namespace aColor.SetTransparency(0); //aColor.SetTransparency(128); - rColorSequence = ::vcl::unotools::colorToDoubleSequence( + rColorSequence = vcl::unotools::colorToDoubleSequence( aColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ); } @@ -545,10 +545,10 @@ namespace cppcanvas uno::Reference<rendering::XColorSpace> xColorSpace( rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()); const uno::Sequence< double > aStartColor( - ::vcl::unotools::colorToDoubleSequence( aVCLStartColor, + vcl::unotools::colorToDoubleSequence( aVCLStartColor, xColorSpace )); const uno::Sequence< double > aEndColor( - ::vcl::unotools::colorToDoubleSequence( aVCLEndColor, + vcl::unotools::colorToDoubleSequence( aVCLEndColor, xColorSpace )); uno::Sequence< uno::Sequence < double > > aColors(2); @@ -851,7 +851,7 @@ namespace cppcanvas else aFontMatrix.m11 *= nScaleY / nScaleX; } - aFontRequest.CellSize = (rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize(rFontSizeLog)).getY(); + aFontRequest.CellSize = (rState.mapModeTransform * vcl::unotools::b2DSizeFromSize(rFontSizeLog)).getY(); return rParms.mrCanvas->getUNOCanvas()->createFont( aFontRequest, uno::Sequence< beans::PropertyValue >(), @@ -898,7 +898,7 @@ namespace cppcanvas aShadowOffset.setHeight( nShadowOffset ); // determine shadow color (from outdev3.cxx) - ::Color aTextColor = ::vcl::unotools::doubleSequenceToColor( + ::Color aTextColor = vcl::unotools::doubleSequenceToColor( rState.textColor, xColorSpace ); bool bIsDark = (aTextColor.GetColor() == COL_BLACK) || (aTextColor.GetLuminance() < 8); @@ -922,7 +922,7 @@ namespace cppcanvas aReliefOffset.setHeight( nReliefOffset ); // determine relief color (from outdev3.cxx) - ::Color aTextColor = ::vcl::unotools::doubleSequenceToColor( + ::Color aTextColor = vcl::unotools::doubleSequenceToColor( rState.textColor, xColorSpace ); aReliefColor = ::Color( COL_LIGHTGRAY ); @@ -934,7 +934,7 @@ namespace cppcanvas { aTextColor = ::Color( COL_WHITE ); rParms.mrStates.getState().textColor = - ::vcl::unotools::colorToDoubleSequence( + vcl::unotools::colorToDoubleSequence( aTextColor, xColorSpace ); } @@ -1435,7 +1435,7 @@ namespace cppcanvas aColor.SetTransparency(0); rStates.getState().textColor = - ::vcl::unotools::colorToDoubleSequence( + vcl::unotools::colorToDoubleSequence( aColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ); } @@ -1728,7 +1728,7 @@ namespace cppcanvas aTexture.Alpha = 1.0 - aFill.getTransparency(); aTexture.Bitmap = - ::vcl::unotools::xBitmapFromBitmapEx( + vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), aBmpEx ); if( aFill.isTiling() ) @@ -1817,7 +1817,7 @@ namespace cppcanvas { ActionSharedPtr pPointAction( internal::PointActionFactory::createPointAction( - rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( + rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( static_cast<MetaPointAction*>(pCurrAct)->GetPoint() ), rCanvas, rState ) ); @@ -1842,7 +1842,7 @@ namespace cppcanvas { ActionSharedPtr pPointAction( internal::PointActionFactory::createPointAction( - rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( + rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( static_cast<MetaPixelAction*>(pCurrAct)->GetPoint() ), rCanvas, rState, @@ -1871,9 +1871,9 @@ namespace cppcanvas const LineInfo& rLineInfo( pLineAct->GetLineInfo() ); const ::basegfx::B2DPoint aStartPoint( - rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( pLineAct->GetStartPoint() )); + rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetStartPoint() )); const ::basegfx::B2DPoint aEndPoint( - rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() )); + rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() )); ActionSharedPtr pLineAction; @@ -1944,9 +1944,9 @@ namespace cppcanvas const OutDevState& rState( rStates.getState() ); const ::basegfx::B2DPoint aTopLeftPixel( - rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ) ); + rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ) ); const ::basegfx::B2DPoint aBottomRightPixel( - rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) + + rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) + // #121100# OutputDevice::DrawRect() fills // rectangles Apple-like, i.e. with one // additional pixel to the right and bottom. @@ -1970,8 +1970,8 @@ namespace cppcanvas ::basegfx::B2DPolygon aPoly( ::basegfx::tools::createPolygonFromRect( ::basegfx::B2DRange( - ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ), - ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) + + vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ), + vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) + ::basegfx::B2DPoint(1,1) ), ( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetHorzRound() ) / rRect.GetWidth(), ( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetVertRound() ) / rRect.GetHeight() ) ); @@ -1991,8 +1991,8 @@ namespace cppcanvas break; const ::basegfx::B2DRange aRange( - ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ), - ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) + + vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ), + vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) + ::basegfx::B2DPoint(1,1) ); ::basegfx::B2DPolygon aPoly( @@ -2140,7 +2140,7 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( pAct->GetBitmap(), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), rCanvas, rStates.getState() ) ); @@ -2164,9 +2164,9 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( pAct->GetBitmap(), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), + vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), rCanvas, rStates.getState() ) ); @@ -2197,9 +2197,9 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( aBmp, rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ), + vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ), rCanvas, rStates.getState() ) ); @@ -2223,7 +2223,7 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( pAct->GetBitmapEx(), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), rCanvas, rStates.getState() ) ); @@ -2247,9 +2247,9 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( pAct->GetBitmapEx(), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), + vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), rCanvas, rStates.getState() ) ); @@ -2280,9 +2280,9 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( aBmp, rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ), + vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ), rCanvas, rStates.getState() ) ); @@ -2312,7 +2312,7 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( aBmp, rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), rCanvas, rStates.getState() ) ); @@ -2342,9 +2342,9 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( aBmp, rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), + vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), rCanvas, rStates.getState() ) ); @@ -2380,9 +2380,9 @@ namespace cppcanvas internal::BitmapActionFactory::createBitmapAction( aBmp, rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ), + vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ), rCanvas, rStates.getState() ) ); @@ -2456,9 +2456,9 @@ namespace cppcanvas std::move(pGradient), rParms, rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), + vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), rStates.getState().mapModeTransform * - ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), + vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), rCanvas, rStates.getState() ) ); @@ -2532,8 +2532,8 @@ namespace cppcanvas tools::createTextLinesPolyPolygon( rState.mapModeTransform * ::basegfx::B2DPoint( - ::vcl::unotools::b2DPointFromPoint(pAct->GetStartPoint()) + - ::vcl::unotools::b2DSizeFromSize(aBaselineOffset)), + vcl::unotools::b2DPointFromPoint(pAct->GetStartPoint()) + + vcl::unotools::b2DSizeFromSize(aBaselineOffset)), aSize.getX(), tools::createTextLineInfo( rVDev, rState )), @@ -2985,7 +2985,7 @@ namespace cppcanvas ::cppcanvas::internal::OutDevState& rState = aStateStack.getState(); rState.xFont = createFont( rState.fontRotation, - ::vcl::Font(), // default font + vcl::Font(), // default font aParms ); } diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx index 0467359ded8b..228dd73ad52c 100644 --- a/cppcanvas/source/mtfrenderer/pointaction.cxx +++ b/cppcanvas/source/mtfrenderer/pointaction.cxx @@ -91,7 +91,7 @@ namespace cppcanvas maState() { tools::initRenderState(maState,rState); - maState.DeviceColor = ::vcl::unotools::colorToDoubleSequence( + maState.DeviceColor = vcl::unotools::colorToDoubleSequence( rAltColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ); } diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index fd4660709aee..ec0b131b594d 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -514,7 +514,7 @@ namespace cppcanvas ::canvas::tools::appendToRenderState(aShadowState, aTranslate); aShadowState.DeviceColor = - ::vcl::unotools::colorToDoubleSequence( rShadowColor, + vcl::unotools::colorToDoubleSequence( rShadowColor, xColorSpace ); rRenderer( aShadowState ); @@ -532,7 +532,7 @@ namespace cppcanvas ::canvas::tools::appendToRenderState(aReliefState, aTranslate); aReliefState.DeviceColor = - ::vcl::unotools::colorToDoubleSequence( rReliefColor, + vcl::unotools::colorToDoubleSequence( rReliefColor, xColorSpace ); rRenderer( aReliefState ); @@ -1633,7 +1633,7 @@ namespace cppcanvas maState(), mnOutlineWidth( calcOutlineWidth(rState,rVDev) ), maFillColor( - ::vcl::unotools::colorToDoubleSequence( + vcl::unotools::colorToDoubleSequence( ::Color( COL_WHITE ), rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), @@ -1677,7 +1677,7 @@ namespace cppcanvas maState(), mnOutlineWidth( calcOutlineWidth(rState,rVDev) ), maFillColor( - ::vcl::unotools::colorToDoubleSequence( + vcl::unotools::colorToDoubleSequence( ::Color( COL_WHITE ), rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), @@ -1772,7 +1772,7 @@ namespace cppcanvas const rendering::ViewState& rViewState, double nOutlineWidth ) : maFillColor( - ::vcl::unotools::colorToDoubleSequence( + vcl::unotools::colorToDoubleSequence( ::Color( COL_WHITE ), rCanvas->getDevice()->getDeviceColorSpace() )), mnOutlineWidth( nOutlineWidth ), @@ -2106,9 +2106,9 @@ namespace cppcanvas rStartPoint.Y() + aBaselineOffset.Height()) ); const ::basegfx::B2DSize aReliefOffset( - rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize( rReliefOffset ) ); + rState.mapModeTransform * vcl::unotools::b2DSizeFromSize( rReliefOffset ) ); const ::basegfx::B2DSize aShadowOffset( - rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize( rShadowOffset ) ); + rState.mapModeTransform * vcl::unotools::b2DSizeFromSize( rShadowOffset ) ); if( rState.isTextOutlineModeSet ) { diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index a943e36a198c..412280bf4eba 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -386,7 +386,7 @@ namespace cppcanvas #if OSL_DEBUG_LEVEL > 2 aLocalState.Clip.clear(); aLocalState.DeviceColor = - ::vcl::unotools::colorToDoubleSequence( + vcl::unotools::colorToDoubleSequence( ::Color( 0x80FF0000 ), mpCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ); diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index 669aabfc16e3..338daa4ba731 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.cxx @@ -81,7 +81,7 @@ namespace cppcanvas return BitmapSharedPtr(); return BitmapSharedPtr( new internal::ImplBitmap( rCanvas, - ::vcl::unotools::xBitmapFromBitmapEx( + vcl::unotools::xBitmapFromBitmapEx( xCanvas->getDevice(), rBmpEx) ) ); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index c607375618b7..cf039ed1a678 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -101,7 +101,7 @@ namespace svx public: void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle, Rectangle* _pPrimaryLocation = NULL, Rectangle* _pSecondaryLocation = NULL, - ::vcl::ControlLayoutData* _pLayoutData = NULL ); + vcl::ControlLayoutData* _pLayoutData = NULL ); }; PseudoRubyText::PseudoRubyText() @@ -118,7 +118,7 @@ namespace svx void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle, - Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData ) + Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, vcl::ControlLayoutData* _pLayoutData ) { bool bLayoutOnly = NULL != _pLayoutData; MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL; diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 4c8df82cf393..fb4402b4a7cd 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -728,7 +728,7 @@ namespace drawinglayer Adding support... OOps, the necessary helper stuff is in svx/source/form/formpdxexport.cxx in namespace svxform. Have to talk to FS if this has to be like that. Especially since - ::vcl::PDFWriter::AnyWidget is filled out, which is already part of vcl. + vcl::PDFWriter::AnyWidget is filled out, which is already part of vcl. Wrote an eMail to FS, he is on vacation currently. I see no reason why not to move that stuff to somewhere else, maybe tools or svtools ?!? We will see... Moved to toolkit, so i have to link against it. I tried VCL first, but it did @@ -901,7 +901,7 @@ namespace drawinglayer // PDF export. Emulate data handling from UnoControlPDFExportContact // I have now moved describePDFControl to toolkit, thus i can implement the PDF // form control support now as follows - ::std::unique_ptr< ::vcl::PDFWriter::AnyWidget > pPDFControl( + ::std::unique_ptr< vcl::PDFWriter::AnyWidget > pPDFControl( ::toolkitform::describePDFControl( rXControl, *mpPDFExtOutDevData ) ); if(pPDFControl.get()) diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index 2dd3d9d8d2ee..7f0af9ed3bc3 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -103,7 +103,7 @@ namespace drawinglayer if(bDoSaveForVisualControl) { SvFileStream aNew(OUString("c:\\test_content.png"), StreamMode::WRITE|StreamMode::TRUNC); - ::vcl::PNGWriter aPNGWriter(aContent); + vcl::PNGWriter aPNGWriter(aContent); aPNGWriter.Write(aNew); } #endif @@ -133,7 +133,7 @@ namespace drawinglayer if(bDoSaveForVisualControl) { SvFileStream aNew(OUString("c:\\test_alpha.png"), StreamMode::WRITE|StreamMode::TRUNC); - ::vcl::PNGWriter aPNGWriter(aAlpha); + vcl::PNGWriter aPNGWriter(aAlpha); aPNGWriter.Write(aNew); } #endif @@ -144,7 +144,7 @@ namespace drawinglayer if(bDoSaveForVisualControl) { SvFileStream aNew(OUString("c:\\test_combined.png"), StreamMode::WRITE|StreamMode::TRUNC); - ::vcl::PNGWriter aPNGWriter(aRetval); + vcl::PNGWriter aPNGWriter(aRetval); aPNGWriter.Write(aNew); } #endif diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index 55e5861f3595..c49a788552cb 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -96,7 +96,7 @@ template <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO> -VclPtr<Dialog> OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(::vcl::Window* _pParent) +VclPtr<Dialog> OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(vcl::Window* _pParent) { return VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext); } diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx index baeba80d473c..9c1f5cc53f14 100644 --- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx @@ -72,7 +72,7 @@ OUString CFURLtoOSLURL( CFURLRef i_xURL ); class MacPluginComm : public PluginComm, - public ::vcl::SolarThreadExecutor + public vcl::SolarThreadExecutor { enum CallType { diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index 948fe62c2523..555d4004e3e2 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx @@ -59,7 +59,7 @@ class PluginComm_Impl : public PluginComm, - public ::vcl::SolarThreadExecutor + public vcl::SolarThreadExecutor { enum CallType { diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index dcfac419788c..a9faaa84c8b6 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -using namespace ::vcl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index 02042739e549..415ee43525ba 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -25,7 +25,6 @@ #include <svl/solar.hrc> #include <com/sun/star/view/XRenderable.hpp> -using namespace ::vcl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 4b1b76fa1d2a..7c065a4d6d51 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -76,7 +76,6 @@ #include "com/sun/star/graphic/XGraphicProvider.hpp" #include <boost/scoped_ptr.hpp> -using namespace ::vcl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -379,7 +378,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& INetURLObject aURL( rFile ); bool bRet = false; - std::set< PDFWriter::ErrorCode > aErrors; + std::set< vcl::PDFWriter::ErrorCode > aErrors; if( aURL.GetProtocol() != INetProtocol::File ) { @@ -398,7 +397,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& VCLXDevice* pXDevice = new VCLXDevice; OUString aPageRange; Any aSelection; - PDFWriter::PDFWriterContext aContext; + vcl::PDFWriter::PDFWriterContext aContext; OUString aOpenPassword, aPermissionPassword; Reference< beans::XMaterialHolder > xEnc; Sequence< beans::NamedValue > aPreparedPermissionPassword; @@ -566,10 +565,10 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& { default: case 0: - aContext.Version = PDFWriter::PDF_1_4; + aContext.Version = vcl::PDFWriter::PDF_1_4; break; case 1: - aContext.Version = PDFWriter::PDF_A_1; + aContext.Version = vcl::PDFWriter::PDF_A_1; //force the tagged PDF as well mbUseTaggedPDF = true; //force disabling of form conversion @@ -600,32 +599,32 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& { default: case 0: - aContext.PDFDocumentMode = PDFWriter::ModeDefault; + aContext.PDFDocumentMode = vcl::PDFWriter::ModeDefault; break; case 1: - aContext.PDFDocumentMode = PDFWriter::UseOutlines; + aContext.PDFDocumentMode = vcl::PDFWriter::UseOutlines; break; case 2: - aContext.PDFDocumentMode = PDFWriter::UseThumbs; + aContext.PDFDocumentMode = vcl::PDFWriter::UseThumbs; break; } switch( mnPDFDocumentAction ) { default: case 0: - aContext.PDFDocumentAction = PDFWriter::ActionDefault; + aContext.PDFDocumentAction = vcl::PDFWriter::ActionDefault; break; case 1: - aContext.PDFDocumentAction = PDFWriter::FitInWindow; + aContext.PDFDocumentAction = vcl::PDFWriter::FitInWindow; break; case 2: - aContext.PDFDocumentAction = PDFWriter::FitWidth; + aContext.PDFDocumentAction = vcl::PDFWriter::FitWidth; break; case 3: - aContext.PDFDocumentAction = PDFWriter::FitVisible; + aContext.PDFDocumentAction = vcl::PDFWriter::FitVisible; break; case 4: - aContext.PDFDocumentAction = PDFWriter::ActionZoom; + aContext.PDFDocumentAction = vcl::PDFWriter::ActionZoom; aContext.Zoom = mnZoom; break; } @@ -634,23 +633,23 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& { default: case 0: - aContext.PageLayout = PDFWriter::DefaultLayout; + aContext.PageLayout = vcl::PDFWriter::DefaultLayout; break; case 1: - aContext.PageLayout = PDFWriter::SinglePage; + aContext.PageLayout = vcl::PDFWriter::SinglePage; break; case 2: - aContext.PageLayout = PDFWriter::Continuous; + aContext.PageLayout = vcl::PDFWriter::Continuous; break; case 3: - aContext.PageLayout = PDFWriter::ContinuousFacing; + aContext.PageLayout = vcl::PDFWriter::ContinuousFacing; break; } aContext.FirstPageLeft = mbFirstPageLeft; //check if PDF/A, which does not allow encryption - if( aContext.Version != PDFWriter::PDF_A_1 ) + if( aContext.Version != vcl::PDFWriter::PDF_A_1 ) { //set values needed in encryption //set encryption level, fixed, but here it can set by the UI if needed. @@ -712,7 +711,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& aContext.Encryption.CanCopyOrExtract = mbCanCopyOrExtract; aContext.Encryption.CanExtractForAccessibility = mbCanExtractForAccessibility; if( mbEncrypt && ! xEnc.is() ) - xEnc = PDFWriter::InitEncryption( aPermissionPassword, aOpenPassword, aContext.Encryption.Security128bit ); + xEnc = vcl::PDFWriter::InitEncryption( aPermissionPassword, aOpenPassword, aContext.Encryption.Security128bit ); if( mbEncrypt && !aPermissionPassword.isEmpty() && ! aPreparedPermissionPassword.getLength() ) aPreparedPermissionPassword = comphelper::OStorageHelper::CreatePackageEncryptionData( aPermissionPassword ); } @@ -729,17 +728,17 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& switch( mnFormsFormat ) { case 1: - aContext.SubmitFormat = PDFWriter::PDF; + aContext.SubmitFormat = vcl::PDFWriter::PDF; break; case 2: - aContext.SubmitFormat = PDFWriter::HTML; + aContext.SubmitFormat = vcl::PDFWriter::HTML; break; case 3: - aContext.SubmitFormat = PDFWriter::XML; + aContext.SubmitFormat = vcl::PDFWriter::XML; break; default: case 0: - aContext.SubmitFormat = PDFWriter::FDF; + aContext.SubmitFormat = vcl::PDFWriter::FDF; break; } aContext.AllowDuplicateFieldNames = mbAllowDuplicateFieldNames; @@ -759,25 +758,25 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& default: //default: URI, without fragment conversion (the bookmark in PDF may not work) case 0: - aContext.DefaultLinkAction = PDFWriter::URIAction; + aContext.DefaultLinkAction = vcl::PDFWriter::URIAction; break; //view PDF through the reader application case 1: aContext.ForcePDFAction = true; - aContext.DefaultLinkAction = PDFWriter::LaunchAction; + aContext.DefaultLinkAction = vcl::PDFWriter::LaunchAction; break; //view PDF through an Internet browser case 2: - aContext.DefaultLinkAction = PDFWriter::URIActionDestination; + aContext.DefaultLinkAction = vcl::PDFWriter::URIActionDestination; break; } aContext.ConvertOOoTargetToPDFTarget = mbConvertOOoTargetToPDFTarget; // check for Link Launch action, not allowed on PDF/A-1 // this code chunk checks when the filter is called from scripting - if( aContext.Version == PDFWriter::PDF_A_1 && - aContext.DefaultLinkAction == PDFWriter::LaunchAction ) + if( aContext.Version == vcl::PDFWriter::PDF_A_1 && + aContext.DefaultLinkAction == vcl::PDFWriter::LaunchAction ) { //force the similar allowed URI action - aContext.DefaultLinkAction = PDFWriter::URIActionDestination; + aContext.DefaultLinkAction = vcl::PDFWriter::URIActionDestination; //and remove the remote goto action forced on PDF file aContext.ForcePDFAction = false; } @@ -792,7 +791,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& aContext.SignTSA = msSignTSA; // all context data set, time to create the printing device - boost::scoped_ptr<PDFWriter> pPDFWriter(new PDFWriter( aContext, xEnc )); + boost::scoped_ptr<vcl::PDFWriter> pPDFWriter(new vcl::PDFWriter( aContext, xEnc )); OutputDevice* pOut = pPDFWriter->GetReferenceDevice(); DBG_ASSERT( pOut, "PDFExport::Export: no reference device" ); @@ -980,14 +979,14 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFEr } // namespace -void PDFExport::showErrors( const std::set< PDFWriter::ErrorCode >& rErrors ) +void PDFExport::showErrors( const std::set< vcl::PDFWriter::ErrorCode >& rErrors ) { if( ! rErrors.empty() && mxIH.is() ) { task::PDFExportException aExc; aExc.ErrorCodes.realloc( sal_Int32(rErrors.size()) ); sal_Int32 i = 0; - for( std::set< PDFWriter::ErrorCode >::const_iterator it = rErrors.begin(); + for( std::set< vcl::PDFWriter::ErrorCode >::const_iterator it = rErrors.begin(); it != rErrors.end(); ++it, i++ ) { aExc.ErrorCodes.getArray()[i] = (sal_Int32)*it; @@ -999,7 +998,7 @@ void PDFExport::showErrors( const std::set< PDFWriter::ErrorCode >& rErrors ) -bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf ) +bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf ) { const Size aSizePDF( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_POINT ) ); Point aOrigin; @@ -1041,10 +1040,10 @@ bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFExtOut -void PDFExport::ImplWriteWatermark( PDFWriter& rWriter, const Size& rPageSize ) +void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize ) { OUString aText( "Watermark" ); - Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4 ) ); + vcl::Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4 ) ); aFont.SetItalic( ITALIC_NONE ); aFont.SetWidthType( WIDTH_NORMAL ); aFont.SetWeight( WEIGHT_NORMAL ); diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx index 5123bdc6c897..1015322e51e9 100644 --- a/filter/source/pdf/pdfexport.hxx +++ b/filter/source/pdf/pdfexport.hxx @@ -99,7 +99,7 @@ private: sal_Int32 mnDefaultLinkAction; bool mbConvertOOoTargetToPDFTarget; bool mbExportBmkToDest; - bool ImplExportPage( ::vcl::PDFWriter& rWriter, ::vcl::PDFExtOutDevData& rPDFExtOutDevData, + bool ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf ); bool mbSignPDF; @@ -110,7 +110,7 @@ private: Reference< security::XCertificate > maSignCertificate; OUString msSignTSA; - void ImplWriteWatermark( ::vcl::PDFWriter& rWriter, const Size& rPageSize ); + void ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize ); public: PDFExport( const Reference< XComponent >& rxSrcDoc, diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 764fc89c99bb..c4417f56eea9 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -33,7 +33,6 @@ #define SVG_DIALOG_IMPLEMENTATION_NAME SVG_DIALOG_SERVICE_NAME #define SVG_FILTER_DATA_NAME "FilterData" -using namespace ::vcl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 231639aac3c3..cc2a5563660d 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -139,7 +139,7 @@ void SVGFontExport::implCollectGlyphs() { GlyphSet& rGlyphSet = implGetGlyphSet( pVDev->GetFont() ); ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( - ::vcl::unohelper::CreateBreakIterator() ); + vcl::unohelper::CreateBreakIterator() ); if( xBI.is() ) { diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 59437328cd73..cbcc2992ddb0 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -2496,7 +2496,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, } else { - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( ::vcl::unohelper::CreateBreakIterator() ); + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( vcl::unohelper::CreateBreakIterator() ); const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale(); sal_Int32 nCurPos = 0, nLastPos = 0, nX = aPos.X(); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 0a23fa606e66..93679018cc37 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -387,7 +387,7 @@ private: Timer m_aTimer; /** @short make our dispatch asynchronous ... if required to do so! */ - ::vcl::EventPoster m_aAsyncDispatcher; + vcl::EventPoster m_aAsyncDispatcher; /** @see DispatchParams */ diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index cb47ade1e7ec..f42bc2afd339 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -106,7 +106,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit /** @deprecated replaced by internal class AsyncAccelExec ... remove this resource here if we go forwards to next major */ - ::vcl::EventPoster m_aAsyncCallback; + vcl::EventPoster m_aAsyncCallback; // interface diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 4fbda0bb18b3..63318874f88c 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -238,8 +238,8 @@ class SVT_DLLPUBLIC SvTreeListBox ,public SvListView ,public DropTargetHelper ,public DragSourceHelper - ,public ::vcl::IMnemonicEntryList - ,public ::vcl::ISearchableStringList + ,public vcl::IMnemonicEntryList + ,public vcl::ISearchableStringList { friend class SvImpLBox; friend class TreeControlPeer; @@ -364,9 +364,9 @@ protected: virtual void ExecuteSearchEntry( const void* _pEntry ) const SAL_OVERRIDE; // ISearchableStringList - virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; - virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; - virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; + virtual vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; + virtual vcl::StringEntryIdentifier NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; + virtual void SelectEntry( vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; public: diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index e945f0b2bf26..6310077ac3fc 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -34,18 +34,13 @@ #include <svx/svxdllapi.h> #include <deque> -class VirtualDevice; class OutputDevice; -namespace vcl { class Region; } -namespace vcl { class Window; } class SdrHdlList; class SdrMarkView; class SdrObject; class SdrPageView; class MouseEvent; - - // Every object must be able to create its handles. They will be fetched on // selection, registered at the View and made visible. // Wird ein Handle von der Maus beruehrt (IsHit()), so wird von der View der diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx index 10300d87940e..569372f9e3d7 100644 --- a/include/toolkit/helper/formpdfexport.hxx +++ b/include/toolkit/helper/formpdfexport.hxx @@ -42,7 +42,7 @@ namespace toolkitform */ std::unique_ptr<vcl::PDFWriter::AnyWidget> TOOLKIT_DLLPUBLIC describePDFControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, - ::vcl::PDFExtOutDevData& i_pdfExportData + vcl::PDFExtOutDevData& i_pdfExportData ); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 4d1f9030a074..f3fd7026472b 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -37,7 +37,7 @@ class StyleSettings; class VCL_DLLPUBLIC Control : public vcl::Window { protected: - ::vcl::ImplControlData* mpControlData; + vcl::ImplControlData* mpControlData; private: bool mbHasControlFocus; @@ -61,7 +61,7 @@ protected: /// determines whether we currently have layout data bool HasLayoutData() const; /// returns the current layout data - ::vcl::ControlLayoutData* + vcl::ControlLayoutData* GetLayoutData() const; /** this calls both our event listeners, and a specified handler diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index da9ae54480ea..9c91995b4f5c 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -133,8 +133,8 @@ public: { return !(Font::operator==( rFont )); } bool IsSameInstance( const Font& ) const; - friend VCL_DLLPUBLIC SvStream& ::ReadFont( SvStream& rIStm, ::vcl::Font& ); - friend VCL_DLLPUBLIC SvStream& ::WriteFont( SvStream& rOStm, const ::vcl::Font& ); + friend VCL_DLLPUBLIC SvStream& ::ReadFont( SvStream& rIStm, vcl::Font& ); + friend VCL_DLLPUBLIC SvStream& ::WriteFont( SvStream& rOStm, const vcl::Font& ); static Font identifyFont( const void* pBuffer, sal_uInt32 nLen ); }; diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 08da855ac360..ccefc6285b56 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -269,7 +269,7 @@ namespace vcl \<do something with xFactory> */ template <typename I> - class DeleteUnoReferenceOnDeinit : public ::vcl::DeleteOnDeinitBase + class DeleteUnoReferenceOnDeinit : public vcl::DeleteOnDeinitBase { ::com::sun::star::uno::Reference<I> m_xI; virtual void doCleanup() SAL_OVERRIDE { set(NULL); } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 16f44b8085f5..4259258ad133 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -940,11 +940,11 @@ public: void DrawText( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle = 0, MetricVector* pVector = NULL, OUString* pDisplayText = NULL, - ::vcl::ITextLayout* _pTextLayout = NULL ); + vcl::ITextLayout* _pTextLayout = NULL ); static void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, const OUString& rOrigStr, sal_uInt16 nStyle, - MetricVector* pVector, OUString* pDisplayText, ::vcl::ITextLayout& _rLayout ); + MetricVector* pVector, OUString* pDisplayText, vcl::ITextLayout& _rLayout ); void ImplDrawText( SalLayout& ); @@ -974,7 +974,7 @@ public: Rectangle GetTextRect( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK, TextRectInfo* pInfo = NULL, - const ::vcl::ITextLayout* _pTextLayout = NULL ) const; + const vcl::ITextLayout* _pTextLayout = NULL ) const; /** Return the exact bounding rectangle of rStr. @@ -1157,7 +1157,7 @@ private: SAL_DLLPRIVATE static bool ImplIsUnderlineAbove( const vcl::Font& ); static - SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); + SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ); ///@} @@ -1258,7 +1258,7 @@ private: static SAL_DLLPRIVATE OUString ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rStr, - long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); + long nMaxWidth, sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ); SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& ); diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx index 3c33172a1667..d68b4fa8bbe4 100644 --- a/include/vcl/quickselectionengine.hxx +++ b/include/vcl/quickselectionengine.hxx @@ -36,7 +36,7 @@ namespace vcl //= ISearchableStringList - // TODO: consolidate this with ::vcl::IMnemonicEntryList + // TODO: consolidate this with vcl::IMnemonicEntryList class SAL_NO_VTABLE VCL_DLLPUBLIC ISearchableStringList { public: diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index e45d9daac713..531e16977f90 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -41,7 +41,7 @@ namespace rptui /** This class defines the scrollable area of the report design. It includes the h-ruler and the sections, and end marker. Not the start marker. */ - typedef ::vcl::Window OScrollWindowHelper_BASE; + typedef vcl::Window OScrollWindowHelper_BASE; class OScrollWindowHelper : public ::cppu::BaseMutex , public OScrollWindowHelper_BASE/*TabPage*/ , public ::comphelper::OPropertyChangeListener diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 3fa94d7b06d5..1838d994a128 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -126,7 +126,7 @@ namespace rptui ::comphelper::mem_fun(&TaskPaneList::AddWindow) ::comphelper::mem_fun(&TaskPaneList::RemoveWindow) */ - void notifySystemWindow(::vcl::Window* pWindow, ::vcl::Window* pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList, ::vcl::Window*>& rMemFunc); + void notifySystemWindow(vcl::Window* pWindow, vcl::Window* pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList, vcl::Window*>& rMemFunc); const sal_Int16 ISOVER_IGNORE_CUSTOMSHAPES = 1; @@ -176,7 +176,7 @@ namespace rptui @param _aZoom the zoom scale @param _rWindow where to set the map mode */ - void setZoomFactor(const Fraction& _aZoom, ::vcl::Window& _rWindow); + void setZoomFactor(const Fraction& _aZoom, vcl::Window& _rWindow); } #endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 0e5808787469..e11b9600470c 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -70,7 +70,7 @@ class ScPrintUIOptions; class ScSheetSaveData; class SC_DLLPUBLIC ScModelObj : public SfxBaseModel, - public ::vcl::ITiledRenderable, + public vcl::ITiledRenderable, public com::sun::star::sheet::XSpreadsheetDocument, public com::sun::star::document::XActionLockable, public com::sun::star::sheet::XCalculatable, diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 9eb6355162d1..6a8db74f90e8 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -528,7 +528,7 @@ void ScAccessibleContextBase::CommitFocusGained() const CommitChange(aEvent); - ::vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent); + vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent); } void ScAccessibleContextBase::CommitFocusLost() const diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index c1a2b8286d08..2d5acaf454c5 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -155,7 +155,7 @@ public: /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const ::vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); + const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); /** This is called internally when text conversion is started. The position of current view mode/page/object/caret position diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 394f62f82286..c9acf89c889f 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -446,7 +446,7 @@ public: static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false ); SAL_DLLPRIVATE SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const; - SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::vcl::Window& rCmpWnd ); + SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const vcl::Window& rCmpWnd ); SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass; } diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 354942cee9a4..149378b2ba7b 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -965,7 +965,7 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, const Point& rWinPoint, - const ::vcl::Window& /* rCmpWnd */ ) + const vcl::Window& /* rCmpWnd */ ) { SdIMapInfo* pIMapInfo = GetIMapInfo( pObj ); IMapObject* pIMapObj = NULL; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 431c75b661f5..da9ba62eeb82 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2278,9 +2278,9 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot } } -::vcl::Window * createCustomAnimationPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) +vcl::Window * createCustomAnimationPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { - ::vcl::Window* pWindow = 0; + vcl::Window* pWindow = 0; DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 917a53e03b77..274929e44409 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1093,9 +1093,9 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback) return 0; } -::vcl::Window * createSlideTransitionPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) +vcl::Window * createSlideTransitionPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { - ::vcl::Window* pWindow = 0; + vcl::Window* pWindow = 0; DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index d53c5445f4d7..036e682ff118 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -82,7 +82,7 @@ private: VclPtr<AnnotationWindow> mpAnnotationWindow; Color maColor; int mnIndex; - const ::vcl::Font& mrFont; + const vcl::Font& mrFont; Size maSize; ImplSVEvent * mnClosePopupEvent; VclPtr<vcl::Window> mpListenWindow; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 801f7f2f2861..8d628912c285 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -351,7 +351,7 @@ void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css:: } } -VclPtr< ::vcl::Window> SlideLayoutController::createPopupWindow( ::vcl::Window* pParent ) +VclPtr<vcl::Window> SlideLayoutController::createPopupWindow( vcl::Window* pParent ) { return VclPtr<sd::LayoutToolbarMenu>::Create( *this, m_xFrame, pParent, mbInsertPage ); } diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index 7049c5b10946..2c8a7dc3e549 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -34,7 +34,7 @@ Assistent::Assistent(int nNoOfPages) mpPageStatus[i] = true; } -bool Assistent::InsertControl(int nDestPage, ::vcl::Window* pUsedControl) +bool Assistent::InsertControl(int nDestPage, vcl::Window* pUsedControl) { DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Page not aviable!"); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index ad902b933e38..ead579c831b8 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -279,7 +279,7 @@ bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const return pDlg->IsInsertBefore(); } -::vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() +vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() { return (vcl::Window*)pDlg; } diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 9f70355fb5f0..9692d6b65b1c 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -120,7 +120,7 @@ void SAL_CALL ChildWindowPane::disposing() Pane::disposing(); } -::vcl::Window* ChildWindowPane::GetWindow() +vcl::Window* ChildWindowPane::GetWindow() { do { diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 696724e4d863..3d02f3411df8 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -53,7 +53,7 @@ void Pane::disposing() mpWindow = NULL; } -::vcl::Window* Pane::GetWindow() +vcl::Window* Pane::GetWindow() { if (mxWindow.is()) return mpWindow; diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index ba3361233568..68ebb2a1d536 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -210,7 +210,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( if (mpViewShell.get() != NULL) { - ::vcl::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); if (pWindow != NULL && mpViewShell->RelocateToParentWindow(pWindow)) { bResult = true; diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index a099da6dc8ed..83146e4b1a21 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -71,10 +71,10 @@ using namespace com::sun::star; -namespace sd { - namespace vcl { class Window; } +namespace sd { + // 50 cm 28350 // adapted from writer #define MAXHEIGHT 28350 @@ -164,7 +164,7 @@ void FuPage::Deactivate() { } -const SfxItemSet* FuPage::ExecuteDialog( ::vcl::Window* pParent ) +const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) { if (!mpDrawViewShell) return NULL; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index e3d519a9ccc8..5ae89ae20f51 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -23,10 +23,7 @@ #include "AccessibleDocumentViewBase.hxx" #include <svx/AccessibleTextHelper.hxx> -namespace sd { -class OutlineViewShell; -namespace vcl { class Window; } -} +namespace sd { class OutlineViewShell; } namespace accessibility { diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 055fd8eb6802..5e9c85debf61 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -43,8 +43,8 @@ public: /* if the view should not do a Invalidate() on the windows, you have to override the following two methods and do something different */ - virtual void InvalidateOneWin(::vcl::Window& rWin) SAL_OVERRIDE; - virtual void InvalidateOneWin(::vcl::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; + virtual void InvalidateOneWin(vcl::Window& rWin) SAL_OVERRIDE; + virtual void InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index df7e337c1f1b..3d15c4d5fd85 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -102,7 +102,7 @@ public: virtual Size GetFirstPageSize() SAL_OVERRIDE; virtual void FillClass(SvGlobalName* pClassName, SotClipboardFormatId* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; virtual void SetModified( bool = true ) SAL_OVERRIDE; - virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( ::vcl::Window *pParent, + virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet ) SAL_OVERRIDE; using SfxObjectShell::GetVisArea; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index a54937f2fabf..120fbeb5aa93 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -88,7 +88,7 @@ public: DrawViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); @@ -260,7 +260,7 @@ public: //false. void FreshNavigatrEntry(); void FreshNavigatrTree(); - void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin); + void MakeVisible(const Rectangle& rRect, vcl::Window& rWin); virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; virtual void WriteFrameViewData() SAL_OVERRIDE; @@ -372,7 +372,7 @@ public: /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. */ - virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; OUString GetSidebarContextName() const; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index e5002ec52fe2..779b07669180 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -57,7 +57,7 @@ class OutlineView friend class OutlineViewModelChangeGuard; public: OutlineView (DrawDocShell& rDocSh, - ::vcl::Window* pWindow, + vcl::Window* pWindow, OutlineViewShell& rOutlineViewSh); virtual ~OutlineView(); @@ -80,7 +80,7 @@ public: virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE; virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE; - OutlinerView* GetViewByWindow(::vcl::Window* pWin) const; + OutlinerView* GetViewByWindow(vcl::Window* pWin) const; SdrOutliner& GetOutliner() { return mrOutliner; } Paragraph* GetPrevTitle(const Paragraph* pPara); @@ -206,8 +206,8 @@ private: /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */ std::unique_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard; - ::vcl::Font maPageNumberFont; - ::vcl::Font maBulletFont; + vcl::Font maPageNumberFont; + vcl::Font maBulletFont; SvxLRSpaceItem maLRSpaceItem; Image maSlideImage; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 9bf1d45c1b2a..3a25cc58ff1b 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -56,7 +56,7 @@ public: OutlineViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~OutlineViewShell(); diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 03f4da28376d..3136604cf9c5 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -35,7 +35,7 @@ class Ruler public: Ruler ( DrawViewShell& rViewSh, - ::vcl::Window* pParent, + vcl::Window* pParent, ::sd::Window* pWin, SvxRulerSupportFlags nRulerFlags, SfxBindings& rBindings, diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 940ec902a27d..42dc811b68c4 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -115,7 +115,7 @@ public: static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::vcl::Window& rParentWindow); + vcl::Window& rParentWindow); /** Return the control of the vertical scroll bar. */ @@ -168,7 +168,7 @@ public: const Point& rOffset, const Size& rSize); - bool RelocateToWindow (::vcl::Window* pWindow); + bool RelocateToWindow (vcl::Window* pWindow); /** Set the current function at the view shell or, when it is not present, set it at the content window. This method supports the use @@ -246,7 +246,7 @@ private: SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::vcl::Window& rParentWindow); + vcl::Window& rParentWindow); void Init(); /** Create the controls for the slide sorter. This are the tab bar @@ -255,7 +255,7 @@ private: This method is usually called exactly one time from the constructor. */ - void SetupControls (::vcl::Window* pParentWindow); + void SetupControls (vcl::Window* pParentWindow); /** This method is usually called exactly one time from the constructor. diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 292993522034..dd382c39a414 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -52,7 +52,7 @@ public: static ::boost::shared_ptr<SlideSorterViewShell> Create( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView, const bool bIsCenterPane); @@ -119,7 +119,7 @@ public: void StartDrag ( const Point& rDragPt, - ::vcl::Window* pWindow ); + vcl::Window* pWindow ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, @@ -178,7 +178,7 @@ public: /** Try to relocate all toplevel window elements to the given parent window. */ - virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; protected: diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index f0e3c436df09..79207b406159 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -93,7 +93,7 @@ public: ViewShell* pViewSh=NULL); virtual ~View(); - void CompleteRedraw( OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + void CompleteRedraw( OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); @@ -137,7 +137,7 @@ public: inline SdDrawDocument& GetDoc() const; inline ViewShell* GetViewShell() const { return mpViewSh; } - virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::vcl::Window* pWin = 0L, bool bIsNewObj = false, + virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 8bc7c6b2ea92..5019f3cca85e 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -115,7 +115,7 @@ public: ViewShell ( SfxViewFrame *pFrame, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); virtual ~ViewShell(); @@ -145,7 +145,7 @@ public: /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::vcl::Window* GetParentWindow() const { return mpParentWindow; } + inline vcl::Window* GetParentWindow() const { return mpParentWindow; } inline ::sd::View* GetView() const { return mpView; } inline SdrView* GetDrawView() const; @@ -418,7 +418,7 @@ public: all views, so the return value tells the caller if the relocation was successful. */ - virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow); + virtual bool RelocateToParentWindow (vcl::Window* pParentWindow); /** Depending on the given request create a new page or duplicate an existing one. A new page is created behind the given slide. @@ -568,7 +568,7 @@ protected: void doShow(); private: - VclPtr< ::vcl::Window> mpParentWindow; + VclPtr<vcl::Window> mpParentWindow; /** This window updater is used to keep all relevant windows up to date with reference to the digit language used to display digits in text shapes. diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 14d8aafb5b03..b26917e89d7c 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -40,7 +40,7 @@ class ViewShell; be an integer percent value. */ class Window - : public ::vcl::Window, + : public vcl::Window, public ::DropTargetHelper { public: @@ -172,7 +172,7 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void PrePaint() SAL_OVERRIDE; - virtual void Paint(::vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx index 12c98d7337ca..e397ec6b8d32 100644 --- a/sd/source/ui/inc/createcustomanimationpanel.hxx +++ b/sd/source/ui/inc/createcustomanimationpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::vcl::Window * createCustomAnimationPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); +vcl::Window * createCustomAnimationPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx index 6c159f9a5a38..f6431aeecefd 100644 --- a/sd/source/ui/inc/createslidetransitionpanel.hxx +++ b/sd/source/ui/inc/createslidetransitionpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::vcl::Window* createSlideTransitionPanel (::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); +vcl::Window* createSlideTransitionPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx index 7f5394767b0e..880966846e90 100644 --- a/sd/source/ui/inc/createtabledesignpanel.hxx +++ b/sd/source/ui/inc/createtabledesignpanel.hxx @@ -25,7 +25,7 @@ namespace sd { -VclPtr< ::vcl::Window> createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase); +VclPtr<vcl::Window> createTableDesignPanel (vcl::Window* pParent, ViewShellBase& rBase); } diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index d9fc8b5b7ec1..7f6553f171ad 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -42,7 +42,7 @@ public: virtual ~DrawView(); virtual void MarkListHasChanged() SAL_OVERRIDE; - void CompleteRedraw(OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) SAL_OVERRIDE; @@ -53,10 +53,10 @@ public: bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false) SAL_OVERRIDE; virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const SAL_OVERRIDE; - virtual void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin) SAL_OVERRIDE; + virtual void MakeVisible(const Rectangle& rRect, vcl::Window& rWin) SAL_OVERRIDE; virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV); - void PresPaint(const ::vcl::Region& rRegion); + void PresPaint(const vcl::Region& rRegion); virtual void DeleteMarked() SAL_OVERRIDE; // from SdrView protected: diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 149fef5b48f8..8889f7e5c1ab 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -27,8 +27,6 @@ class SdDrawDocument; namespace sd { -namespace vcl { class Window; } - class FuConstructBezierPolygon : public FuConstruct { diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 3c952c167fc1..8ffbb194632d 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -31,7 +31,6 @@ namespace sd { class View; class ViewShell; -namespace vcl { class Window; } /** * bullet functions in outline mode diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 1f99701901d0..9f8e137fb748 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -25,11 +25,12 @@ class SdDrawDocument; class SfxRequest; +namespace vcl { class Window; } + namespace sd { class View; class ViewShell; -namespace vcl { class Window; } /** * text functions in outline mode diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 7d1339919adb..4fce58046b16 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -31,7 +31,6 @@ class OutlineView; class OutlineViewShell; class View; class ViewShell; -namespace vcl { class Window; } /** * Base class of functions of outline mode diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index a7debedadbb7..25aa75ab3ae6 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -29,7 +29,6 @@ namespace sd { class View; class ViewShell; -namespace vcl { class Window; } class FuPresentationLayout : public FuPoor diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index 905542f8151c..78bc0a069c58 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -29,7 +29,6 @@ namespace sd { class View; class ViewShell; -namespace vcl { class Window; } class FuPresentationObjects : public FuPoor diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index af0b1ef22f9c..b8c1178a7ac2 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -96,7 +96,7 @@ public: static bool StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::vcl::Window* pParent = 0 ); + vcl::Window* pParent = 0 ); static void Stop( ViewShellBase& rBase ); @@ -112,7 +112,7 @@ public: bool startPreview( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::vcl::Window* pParent = 0 ); + vcl::Window* pParent = 0 ); // uno api @@ -198,7 +198,7 @@ private: void ThrowIfDisposed() const throw (css::uno::RuntimeException); - void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::vcl::Window* pParentWindow ); + void CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow ); WorkWindow *GetWorkWindow(); SlideShow(const SlideShow&) SAL_DELETED_FUNCTION; diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index b9c17ac4ba4e..43444b83c1b9 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -81,7 +81,7 @@ class SD_DLLPUBLIC SdXImpressDocument : public SfxBaseModel, // implements SfxLi public ::com::sun::star::ucb::XAnyCompareFactory, public ::com::sun::star::presentation::XHandoutMasterSupplier, public ::com::sun::star::view::XRenderable, - public ::vcl::ITiledRenderable + public vcl::ITiledRenderable { friend class SdDrawPagesAccess; friend class SdMasterPagesAccess; diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index 7f0f2d5c4d69..9b755bd68201 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { CustomAnimationPanel::CustomAnimationPanel ( - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) @@ -43,8 +43,8 @@ CustomAnimationPanel::~CustomAnimationPanel() { } -::vcl::Window* CustomAnimationPanel::CreateWrappedControl ( - ::vcl::Window* pParentWindow, +vcl::Window* CustomAnimationPanel::CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createCustomAnimationPanel(pParentWindow, rViewShellBase, mxFrame); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index f17c15aecaee..4f5f284860c0 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star::text; namespace sd { namespace sidebar { MasterPagesSelector::MasterPagesSelector ( - ::vcl::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index b0f4fb0cfb5e..a9971fc5d9f6 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -59,7 +59,7 @@ public: virtual void SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE; protected: - VclPtr< vcl::Window> mpWrappedControl; + VclPtr<vcl::Window> mpWrappedControl; virtual vcl::Window* CreateWrappedControl ( vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) = 0; diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index 2d58b94ac6dc..afd6ccb8f692 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { SlideTransitionPanel::SlideTransitionPanel ( - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) @@ -41,8 +41,8 @@ SlideTransitionPanel::~SlideTransitionPanel() { } -::vcl::Window* SlideTransitionPanel::CreateWrappedControl ( - ::vcl::Window* pParentWindow, +vcl::Window* SlideTransitionPanel::CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createSlideTransitionPanel(pParentWindow, rViewShellBase, mxFrame); diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index 30d31ebcac5b..d427d5743811 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { TableDesignPanel::TableDesignPanel ( - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) : PanelBase(pParentWindow, rViewShellBase) { @@ -38,8 +38,8 @@ TableDesignPanel::~TableDesignPanel() { } -::vcl::Window* TableDesignPanel::CreateWrappedControl ( - ::vcl::Window* pParentWindow, +vcl::Window* TableDesignPanel::CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createTableDesignPanel(pParentWindow, rViewShellBase); diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index c124dc7923d2..d1e222214d4d 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -163,7 +163,7 @@ public: ::boost::shared_ptr<BitmapReplacement> PngCompression::Compress (const Bitmap& rBitmap) const { - ::vcl::PNGWriter aWriter (rBitmap); + vcl::PNGWriter aWriter (rBitmap); SvMemoryStream aStream (32768, 32768); aWriter.Write(aStream); @@ -184,7 +184,7 @@ Bitmap PngCompression::Decompress ( if (pData != NULL) { SvMemoryStream aStream (pData->mpData, pData->mnDataSize, StreamMode::READ); - ::vcl::PNGReader aReader (aStream); + vcl::PNGReader aReader (aStream); aResult = aReader.Read().GetBitmap(); } diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index fcb7f44ecd7f..d17c08ad80dd 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -123,7 +123,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) if (pWindow) { // The whole background is painted by the view and controls. - ::vcl::Window* pParentWindow = pWindow->GetParent(); + vcl::Window* pParentWindow = pWindow->GetParent(); OSL_ASSERT(pParentWindow!=NULL); pParentWindow->SetBackground (Wallpaper()); @@ -265,7 +265,7 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager() void SlideSorterController::Paint ( const Rectangle& rBBox, - ::vcl::Window* pWindow) + vcl::Window* pWindow) { if (mnPaintEntranceCount == 0) { @@ -273,7 +273,7 @@ void SlideSorterController::Paint ( try { - mrView.CompleteRedraw(pWindow, ::vcl::Region(rBBox), 0); + mrView.CompleteRedraw(pWindow, vcl::Region(rBBox), 0); } catch (const Exception&) { @@ -540,7 +540,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent != NULL) { - ::vcl::Window* pWindow = pEvent->GetWindow(); + vcl::Window* pWindow = pEvent->GetWindow(); sd::Window *pActiveWindow (mrSlideSorter.GetContentWindow()); switch (pEvent->GetId()) { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 9d6bdb8d0feb..7dfc356a77b1 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -217,7 +217,7 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) } } -void Clipboard::DoCut (::vcl::Window* pWindow) +void Clipboard::DoCut (vcl::Window* pWindow) { if (mrSlideSorter.GetModel().GetPageCount() > 1) { @@ -226,7 +226,7 @@ void Clipboard::DoCut (::vcl::Window* pWindow) } } -void Clipboard::DoDelete (::vcl::Window* ) +void Clipboard::DoDelete (vcl::Window* ) { if (mrSlideSorter.GetModel().GetPageCount() > 1) { @@ -234,12 +234,12 @@ void Clipboard::DoDelete (::vcl::Window* ) } } -void Clipboard::DoCopy (::vcl::Window* pWindow ) +void Clipboard::DoCopy (vcl::Window* pWindow ) { CreateSlideTransferable( pWindow, false ); } -void Clipboard::DoPaste (::vcl::Window* pWindow) +void Clipboard::DoPaste (vcl::Window* pWindow) { SdTransferable* pClipTransferable = SD_MOD()->pTransferClip; @@ -259,7 +259,7 @@ void Clipboard::DoPaste (::vcl::Window* pWindow) } } -sal_Int32 Clipboard::GetInsertionPosition (::vcl::Window* pWindow) +sal_Int32 Clipboard::GetInsertionPosition (vcl::Window* pWindow) { sal_Int32 nInsertPosition = -1; @@ -377,7 +377,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) } void Clipboard::CreateSlideTransferable ( - ::vcl::Window* pWindow, + vcl::Window* pWindow, bool bDrag) { std::vector<OUString> aBookmarkList; @@ -442,7 +442,7 @@ void Clipboard::CreateSlideTransferable ( aObjDesc.maDisplayName = pDocument->GetDocSh() ->GetMedium()->GetURLObject().GetURLNoPass(); - ::vcl::Window* pActionWindow = pWindow; + vcl::Window* pActionWindow = pWindow; if (pActionWindow == NULL) { ViewShell* pViewShell = mrSlideSorter.GetViewShell(); @@ -556,7 +556,7 @@ void Clipboard::CreateSlideTransferable ( void Clipboard::StartDrag ( const Point& rPosition, - ::vcl::Window* pWindow) + vcl::Window* pWindow) { maPagesToRemove.clear(); maPagesToSelect.clear(); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 1483befc1217..efadfa322174 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -290,12 +290,12 @@ public: #else SelectionFunction& rSelectionFunction, const Point& rMousePosition, - ::vcl::Window* pWindow); + vcl::Window* pWindow); #endif virtual ~DragAndDropModeHandler(); #ifndef MACOSX - void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow); + void Initialize(const Point& rMousePosition, vcl::Window* pWindow); #endif virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; @@ -389,7 +389,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent) FocusManager& rFocusManager (mrController.GetFocusManager()); bool bResult = false; - const ::vcl::KeyCode& rCode (rEvent.GetKeyCode()); + const vcl::KeyCode& rCode (rEvent.GetKeyCode()); switch (rCode.GetCode()) { case KEY_RETURN: @@ -1507,14 +1507,14 @@ DragAndDropModeHandler::DragAndDropModeHandler ( #else SelectionFunction& rSelectionFunction, const Point& rMousePosition, - ::vcl::Window* pWindow) + vcl::Window* pWindow) #endif : ModeHandler(rSlideSorter, rSelectionFunction, false) { #ifndef MACOSX } -void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Window* pWindow) +void DragAndDropModeHandler::Initialize(const Point& rMousePosition, vcl::Window* pWindow) { #endif SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index e4ffd2ff006d..76bc0ec9ace4 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -70,14 +70,14 @@ public: void HandleSlotCall (SfxRequest& rRequest); - void DoCut (::vcl::Window* pWindow = 0); - void DoCopy (::vcl::Window* pWindow = 0); - void DoPaste (::vcl::Window* pWindow = 0); - void DoDelete (::vcl::Window* pWindow = 0); + void DoCut (vcl::Window* pWindow = 0); + void DoCopy (vcl::Window* pWindow = 0); + void DoPaste (vcl::Window* pWindow = 0); + void DoDelete (vcl::Window* pWindow = 0); void StartDrag ( const Point& rDragPt, - ::vcl::Window* pWindow ); + vcl::Window* pWindow ); void DragFinished ( sal_Int8 nDropAction); @@ -139,7 +139,7 @@ private: ImplSVEvent * mnDragFinishedUserEventId; void CreateSlideTransferable ( - ::vcl::Window* pWindow, + vcl::Window* pWindow, bool bDrag); /** Determine the position of where to insert the pages in the current @@ -151,7 +151,7 @@ private: The index in the range [0,n] (both inclusive) with n the number of pages is returned. */ - sal_Int32 GetInsertionPosition (::vcl::Window* pWindow); + sal_Int32 GetInsertionPosition (vcl::Window* pWindow); /** Paste the pages of the transferable of the sd module at the given position. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index d62acead1377..58899c8627d5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -29,15 +29,8 @@ class ScrollBar; class ScrollBarBox; -namespace vcl { class Window; } -namespace sd { -namespace vcl { class Window; } -} - -namespace sd { namespace slidesorter { - class SlideSorter; -} } +namespace sd { namespace slidesorter { class SlideSorter; } } namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index c963b76a08a0..c2f20cf781a4 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -198,7 +198,7 @@ public: The returned region has to be repainted to reflect the updated selection states. */ - ::vcl::Region RestoreSelection(); + vcl::Region RestoreSelection(); /** Typically called from controller::Listener this method handles the insertion and deletion of single pages. diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 38b5d4ac08c4..3d7a2bd4e60d 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -88,7 +88,7 @@ public: void RequestRepaint(); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); void RequestRepaint (const Rectangle& rRepaintBox); - void RequestRepaint (const ::vcl::Region& rRepaintRegion); + void RequestRepaint (const vcl::Region& rRepaintRegion); Rectangle GetModelArea(); @@ -129,7 +129,7 @@ public: void Resize(); virtual void CompleteRedraw ( OutputDevice* pDevice, - const ::vcl::Region& rPaintArea, + const vcl::Region& rPaintArea, sdr::contact::ViewObjectContactRedirector* pRedirector = NULL) SAL_OVERRIDE; void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea); @@ -255,7 +255,7 @@ private: sal_Int32 mnButtonUnderMouse; ::boost::shared_ptr<PageObjectPainter> mpPageObjectPainter; ::boost::shared_ptr<SelectionPainter> mpSelectionPainter; - ::vcl::Region maRedrawRegion; + vcl::Region maRedrawRegion; SharedILayerPainter mpBackgroundPainter; ::boost::scoped_ptr<ToolTip> mpToolTip; bool mbIsRearrangePending; diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 6f51d058ea84..d4b781736392 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -36,7 +36,7 @@ class FontProvider : public SdGlobalResource { public: - typedef boost::shared_ptr< ::vcl::Font> SharedFontPointer; + typedef boost::shared_ptr<vcl::Font> SharedFontPointer; /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index a6bb3345b532..97a4db1329d5 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -135,7 +135,7 @@ private: Rectangle maCustomAnimationEffectBoundingBox; const Image maTransitionEffectIcon; const Image maCustomAnimationEffectIcon; - const boost::shared_ptr< ::vcl::Font> mpPageNumberFont; + const boost::shared_ptr<vcl::Font> mpPageNumberFont; Size GetPageNumberAreaSize (const int nPageCount); Rectangle CalculatePreviewBoundingBox ( diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index 4058c063dddb..ecda1a7bb951 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -73,7 +73,7 @@ private: ::boost::shared_ptr<cache::PageCache> mpCache; ::boost::shared_ptr<controller::Properties> mpProperties; ::boost::shared_ptr<view::Theme> mpTheme; - ::boost::shared_ptr< ::vcl::Font> mpPageNumberFont; + ::boost::shared_ptr<vcl::Font> mpPageNumberFont; ::boost::scoped_ptr<FramePainter> mpShadowPainter; ::boost::scoped_ptr<FramePainter> mpFocusBorderPainter; Bitmap maNormalBackground; diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 568086a58b88..808b515de22c 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -58,7 +58,7 @@ public: Font_PageNumber, Font_PageCount }; - static boost::shared_ptr< ::vcl::Font> GetFont ( + static boost::shared_ptr<vcl::Font> GetFont ( const FontType eType, const OutputDevice& rDevice); diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 3a5320fd4c54..a97135c718a2 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -50,10 +50,10 @@ namespace { class ContentWindow : public ::sd::Window { public: - ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter); + ContentWindow(vcl::Window& rParent, SlideSorter& rSlideSorter); virtual ~ContentWindow(); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); - virtual void Paint(::vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; virtual void MouseButtonUp (const MouseEvent& rEvent) SAL_OVERRIDE; @@ -90,7 +90,7 @@ private: ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::vcl::Window& rParentWindow) + vcl::Window& rParentWindow) { ::boost::shared_ptr<SlideSorter> pSlideSorter( new SlideSorter( @@ -128,7 +128,7 @@ SlideSorter::SlideSorter ( SlideSorter::SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::vcl::Window& rParentWindow) + vcl::Window& rParentWindow) : mbIsValid(false), mpSlideSorterController(), mpSlideSorterModel(), @@ -173,7 +173,7 @@ void SlideSorter::Init() sd::Window *pContentWindow (GetContentWindow()); if (pContentWindow) { - ::vcl::Window* pParentWindow = pContentWindow->GetParent(); + vcl::Window* pParentWindow = pContentWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->SetBackground(Wallpaper()); pContentWindow->SetBackground(Wallpaper()); @@ -244,7 +244,7 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) GetContentWindow()); } -void SlideSorter::SetupControls (::vcl::Window* ) +void SlideSorter::SetupControls (vcl::Window* ) { GetVerticalScrollBar()->Show(); } @@ -254,7 +254,7 @@ void SlideSorter::SetupListeners() sd::Window *pWindow (GetContentWindow()); if (pWindow) { - ::vcl::Window* pParentWindow = pWindow->GetParent(); + vcl::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->AddEventListener( LINK( @@ -288,7 +288,7 @@ void SlideSorter::ReleaseListeners() controller::SlideSorterController, WindowEventHandler)); - ::vcl::Window* pParentWindow = pWindow->GetParent(); + vcl::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), @@ -371,14 +371,14 @@ void SlideSorter::ArrangeGUIElements ( } } -bool SlideSorter::RelocateToWindow (::vcl::Window* pParentWindow) +bool SlideSorter::RelocateToWindow (vcl::Window* pParentWindow) { // Stop all animations for they have been started for the old window. mpSlideSorterController->GetAnimator()->RemoveAllAnimations(); ReleaseListeners(); - ::vcl::Window *pNewWindow = NULL; + vcl::Window *pNewWindow = NULL; if (mpViewShell) { mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow); @@ -436,7 +436,7 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) namespace { ContentWindow::ContentWindow( - ::vcl::Window& rParent, + vcl::Window& rParent, SlideSorter& rSlideSorter) : ::sd::Window(&rParent), mrSlideSorter(rSlideSorter), @@ -455,7 +455,7 @@ void ContentWindow::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction mpCurrentFunction = rpFunction; } -void ContentWindow::Paint (::vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void ContentWindow::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { mrSlideSorter.Paint(rRect); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 2f2aa0d73505..d58ac87098d6 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -93,7 +93,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); ::boost::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameViewArgument, const bool bIsCenterPane) { @@ -118,7 +118,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); SlideSorterViewShell::SlideSorterViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameViewArgument) : ViewShell (pFrame, pParentWindow, rViewShellBase), mpSlideSorter(), @@ -292,7 +292,7 @@ SlideSorter& SlideSorterViewShell::GetSlideSorter() const return *mpSlideSorter; } -bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) +bool SlideSorterViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) { OSL_ASSERT(mpSlideSorter); if ( ! mpSlideSorter) @@ -638,7 +638,7 @@ void SlideSorterViewShell::UpdateScrollBars() void SlideSorterViewShell::StartDrag ( const Point& rDragPt, - ::vcl::Window* pWindow ) + vcl::Window* pWindow ) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetClipboard().StartDrag ( diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 016c730a898e..6515c6e4b594 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -365,7 +365,7 @@ void TableValueSet::updateSettings() } } -extern "C" SAL_DLLPUBLIC_EXPORT ::vcl::Window* SAL_CALL makeTableValueSet(::vcl::Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTableValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -806,12 +806,12 @@ short TableDesignDialog::Execute() return RET_CANCEL; } -VclPtr< ::vcl::Window> createTableDesignPanel( ::vcl::Window* pParent, ViewShellBase& rBase ) +VclPtr<vcl::Window> createTableDesignPanel( vcl::Window* pParent, ViewShellBase& rBase ) { return VclPtr<TableDesignPane>::Create( pParent, rBase ); } -void showTableDesignDialog( ::vcl::Window* pParent, ViewShellBase& rBase ) +void showTableDesignDialog( vcl::Window* pParent, ViewShellBase& rBase ) { ScopedVclPtrInstance< TableDesignDialog > xDialog( pParent, rBase ); xDialog->Execute(); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 1f1adb72fa89..440030f38a8f 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -956,7 +956,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB mpImpl->mpViewTabBar = rViewTabBar; } -::vcl::Window* ViewShellBase::GetViewWindow() +vcl::Window* ViewShellBase::GetViewWindow() { OSL_ASSERT(mpImpl.get()!=NULL); diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index f6e3b11be435..4b38aa92506f 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -59,7 +59,7 @@ public: ShellDescriptor (const ShellDescriptor& rDescriptor); ShellDescriptor& operator= (const ShellDescriptor& rDescriptor); bool IsMainViewShell() const; - ::vcl::Window* GetWindow() const; + vcl::Window* GetWindow() const; }; /** This functor can be used to search for a shell in an STL container when the @@ -221,7 +221,7 @@ private: ShellDescriptor CreateSubShell ( SfxShell* pShell, ShellId nShellId, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView); void DestroyViewShell (ShellDescriptor& rDescriptor); void DestroySubShell ( @@ -429,7 +429,7 @@ void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) // window can be moved to the top of the shell stack. if (aResult.mpShell != NULL) { - ::vcl::Window* pWindow = aResult.GetWindow(); + vcl::Window* pWindow = aResult.GetWindow(); if (pWindow != NULL) { pWindow->AddEventListener( @@ -988,7 +988,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, { if (pEvent != NULL) { - ::vcl::Window* pEventWindow + vcl::Window* pEventWindow = static_cast<VclWindowEvent*>(pEvent)->GetWindow(); switch (pEvent->GetId()) @@ -999,7 +999,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, aI!=maActiveViewShells.end(); ++aI) { - if (pEventWindow == static_cast< ::vcl::Window*>(aI->GetWindow())) + if (pEventWindow == static_cast< vcl::Window*>(aI->GetWindow())) { MoveToTop(*aI->mpShell); break; @@ -1035,7 +1035,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( SfxShell* pParentShell, ShellId nShellId, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView) { ::osl::MutexGuard aGuard (maMutex); @@ -1072,7 +1072,7 @@ void ViewShellManager::Implementation::DestroyViewShell ( if (rDescriptor.mbIsListenerAddedToWindow) { rDescriptor.mbIsListenerAddedToWindow = false; - ::vcl::Window* pWindow = rDescriptor.GetWindow(); + vcl::Window* pWindow = rDescriptor.GetWindow(); if (pWindow != NULL) { pWindow->RemoveEventListener( diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index ef6b102007d5..5a13836699eb 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -126,7 +126,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView) for(sal_Int32 a(0); a < aInputString.getLength(); a++) { sal_Char aChar = (sal_Char)aInputString[a]; - ::vcl::KeyCode aKeyCode; + vcl::KeyCode aKeyCode; KeyEvent aKeyEvent(aChar, aKeyCode); // add actual character @@ -682,7 +682,7 @@ void DrawViewShell::FuDeleteSelectedObjects() if (!bConsumed) { - ::vcl::KeyCode aKCode(KEY_DELETE); + vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); bConsumed = mpDrawView->getSmartTags().KeyInput( aKEvt ); @@ -937,7 +937,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (pOLV) { - ::vcl::KeyCode aKCode(KEY_DELETE); + vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); pOLV->PostKeyEvent(aKEvt); } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index fe3ff77142c4..f72aa2f3512c 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -189,7 +189,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController() OutlineViewShell::OutlineViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameViewArgument) : ViewShell(pFrame, pParentWindow, rViewShellBase), pOlView(NULL), @@ -525,7 +525,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) { OutlineViewPageChangesGuard aGuard2(pOlView); - ::vcl::KeyCode aKCode(KEY_DELETE); + vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode ); pOutlView->PostKeyEvent(aKEvt); @@ -1424,7 +1424,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) Invalidate(SID_STYLE_FAMILY5); // check and distinguish cursor movements- or input-keys - ::vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); + vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) || (GetActualPage() != pLastPage) ) { diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 656671998950..53e017aae9ed 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -1344,7 +1344,7 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL) { boost::scoped_ptr<SvStream> pStream ( ::utl::UcbStreamHelper::CreateStream (xIStream)); - ::vcl::PNGReader aReader (*pStream); + vcl::PNGReader aReader (*pStream); aThumbnail = aReader.Read (); } diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index c38a45777a47..4a4d994aa22d 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -452,7 +452,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect, { if (pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_SCROLLRECT")) { - o_rScrollRect = ::vcl::unotools::b2DRectangleFromRectangle( + o_rScrollRect = vcl::unotools::b2DRectangleFromRectangle( *reinterpret_cast<Rectangle const *>( pAct->GetData() ) ); @@ -460,7 +460,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect, } else if (pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTRECT") ) { - o_rPaintRect = ::vcl::unotools::b2DRectangleFromRectangle( + o_rPaintRect = vcl::unotools::b2DRectangleFromRectangle( *reinterpret_cast<Rectangle const *>( pAct->GetData() ) ); diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index 1dc8f32aab9e..13eba7fce7bb 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -149,7 +149,7 @@ namespace slideshow const OUString& rMimeType ); ViewLayerSharedPtr mpViewLayer; VclPtr< SystemChildWindow > mpMediaWindow; - VclPtr< ::vcl::Window > mpEventHandlerParent; + VclPtr< vcl::Window > mpEventHandlerParent; mutable ::com::sun::star::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 285ebc19d44b..29d093721d4e 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -203,7 +203,7 @@ class SmCmdBoxWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(SmCmdBoxWrapper); protected: - SmCmdBoxWrapper(::vcl::Window *pParentWindow, + SmCmdBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); @@ -270,7 +270,7 @@ protected: void InsertFrom(SfxMedium &rMedium); virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(::vcl::Window *pParent, + virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions) SAL_OVERRIDE; virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE; diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index f3a9b276acdd..20cfdf5bba11 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -755,7 +755,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText( { OUString sText( getTextRange(nStartIndex, nEndIndex) ); - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText ); SolarMutexReleaser aReleaser; xClipboard->setContents( pDataObj, NULL ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 0e0006e2316e..c5d3b4b2db53 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -452,7 +452,7 @@ public: sal_uInt16 nPaintFlags, OutputDevice* pOut, const OUString* pStr = 0, - ::vcl::ControlLayoutData* _pLayoutData = NULL + vcl::ControlLayoutData* _pLayoutData = NULL ); // recalculates all BoundingRects if bMustRecalcBoundingRects == true diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 078ebc92e67e..a93aa7c39caa 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1626,7 +1626,7 @@ void SvxIconChoiceCtrl_Impl::PaintEmphasis( void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nPaintFlags, - OutputDevice* pOut, const OUString* pStr, ::vcl::ControlLayoutData* _pLayoutData ) + OutputDevice* pOut, const OUString* pStr, vcl::ControlLayoutData* _pLayoutData ) { if( eItem == IcnViewFieldTypeText ) { diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 87f721483a4d..c4839b32437d 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1134,7 +1134,7 @@ void SvTreeListBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const // nothing to do here, we have no "execution" } -::vcl::StringEntryIdentifier SvTreeListBox::CurrentEntry( OUString& _out_entryText ) const +vcl::StringEntryIdentifier SvTreeListBox::CurrentEntry( OUString& _out_entryText ) const { // always accept the current entry if there is one SvTreeListEntry* pCurrentEntry( GetCurEntry() ); @@ -1146,12 +1146,12 @@ void SvTreeListBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const return FirstSearchEntry( _out_entryText ); } -::vcl::StringEntryIdentifier SvTreeListBox::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const +vcl::StringEntryIdentifier SvTreeListBox::NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const { return NextSearchEntry( _currentEntry, _out_entryText ); } -void SvTreeListBox::SelectEntry( ::vcl::StringEntryIdentifier _entry ) +void SvTreeListBox::SelectEntry( vcl::StringEntryIdentifier _entry ) { SelectSearchEntry( _entry ); } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 9e7283ca42b4..9bfe0588770b 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -153,7 +153,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( { OUString sPathName( rResourceURL.copy( nIndex ) ); BitmapEx aBitmap; - if ( ::vcl::ImageRepository::loadImage( sPathName, aBitmap, false ) ) + if ( vcl::ImageRepository::loadImage( sPathName, aBitmap, false ) ) { Image aImage( aBitmap ); xRet = aImage.GetXGraphic(); diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 4cfbfb7b524a..9a5807fc2e10 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -70,7 +70,7 @@ class SVT_DLLPRIVATE AsyncAccelExec DECL_DLLPRIVATE_LINK(impl_ts_asyncCallback, void*); private: - ::vcl::EventPoster m_aAsyncCallback; + vcl::EventPoster m_aAsyncCallback; css::uno::Reference< css::frame::XDispatch > m_xDispatch; css::util::URL m_aURL; }; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 70ec0f63f94e..78f034698063 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -746,7 +746,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo if(rFlavor.MimeType.equalsIgnoreAsciiCase("image/png")) { // write a PNG - ::vcl::PNGWriter aPNGWriter(rBitmapEx); + vcl::PNGWriter aPNGWriter(rBitmapEx); aPNGWriter.Write(aMemStm); } @@ -1686,7 +1686,7 @@ bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& r if(!bSuppressPNG && rFlavor.MimeType.equalsIgnoreAsciiCase("image/png")) { // it's a PNG, import to BitmapEx - ::vcl::PNGReader aPNGReader(*xStm); + vcl::PNGReader aPNGReader(*xStm); rBmpEx = aPNGReader.Read(); } diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index ece4c3480030..8a12ff02ea04 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -128,7 +128,7 @@ SwXTextDocumentBaseClass; class SW_DLLPUBLIC SwXTextDocument : public SwXTextDocumentBaseClass, public SvxFmMSFactory, public SfxBaseModel, - public ::vcl::ITiledRenderable + public vcl::ITiledRenderable { private: class Impl; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 58990911a55d..ae856e8e607a 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -170,7 +170,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell VclPtr<ImageButton> pPageUpBtn, pPageDownBtn; // dummy window for filling the lower right edge when both scrollbars are active - VclPtr< ::vcl::Window> pScrollFill; + VclPtr<vcl::Window> pScrollFill; sal_uInt16 mnPageCount; bool bNormalPrint; diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 7a121d529548..2eafa89c0461 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -201,7 +201,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell bool m_bHScrollbarEnabled; bool m_bVScrollbarEnabled; - VclPtr< ::vcl::Window> m_pScrollFill; // dummy window for filling the lower right edge + VclPtr<vcl::Window> m_pScrollFill; // dummy window for filling the lower right edge // when both scrollbars are active VclPtr<SvxRuler> m_pHRuler, diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index c9f95ab91e25..332d9fd4e0c9 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -80,20 +80,20 @@ namespace toolkitform /** (default-)creates a PDF widget according to a given FormComponentType */ - ::vcl::PDFWriter::AnyWidget* createDefaultWidget( sal_Int16 _nFormComponentType ) + vcl::PDFWriter::AnyWidget* createDefaultWidget( sal_Int16 _nFormComponentType ) { switch ( _nFormComponentType ) { case FormComponentType::COMMANDBUTTON: - return new ::vcl::PDFWriter::PushButtonWidget; + return new vcl::PDFWriter::PushButtonWidget; case FormComponentType::CHECKBOX: - return new ::vcl::PDFWriter::CheckBoxWidget; + return new vcl::PDFWriter::CheckBoxWidget; case FormComponentType::RADIOBUTTON: - return new ::vcl::PDFWriter::RadioButtonWidget; + return new vcl::PDFWriter::RadioButtonWidget; case FormComponentType::LISTBOX: - return new ::vcl::PDFWriter::ListBoxWidget; + return new vcl::PDFWriter::ListBoxWidget; case FormComponentType::COMBOBOX: - return new ::vcl::PDFWriter::ComboBoxWidget; + return new vcl::PDFWriter::ComboBoxWidget; case FormComponentType::TEXTFIELD: case FormComponentType::FILECONTROL: @@ -102,7 +102,7 @@ namespace toolkitform case FormComponentType::NUMERICFIELD: case FormComponentType::CURRENCYFIELD: case FormComponentType::PATTERNFIELD: - return new ::vcl::PDFWriter::EditWidget; + return new vcl::PDFWriter::EditWidget; } return NULL; } @@ -255,7 +255,7 @@ namespace toolkitform /** creates a PDF compatible control descriptor for the given control */ std::unique_ptr<vcl::PDFWriter::AnyWidget> describePDFControl( const Reference< XControl >& _rxControl, - ::vcl::PDFExtOutDevData& i_pdfExportData ) + vcl::PDFExtOutDevData& i_pdfExportData ) { std::unique_ptr<vcl::PDFWriter::AnyWidget> Descriptor; OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL) control!" ); @@ -418,9 +418,9 @@ namespace toolkitform // special widget properties // edits - if ( Descriptor->getType() == ::vcl::PDFWriter::Edit ) + if ( Descriptor->getType() == vcl::PDFWriter::Edit ) { - ::vcl::PDFWriter::EditWidget* pEditWidget = static_cast< ::vcl::PDFWriter::EditWidget* >( Descriptor.get() ); + vcl::PDFWriter::EditWidget* pEditWidget = static_cast< vcl::PDFWriter::EditWidget* >( Descriptor.get() ); // multiline (already flagged in the TextStyle) pEditWidget->MultiLine = ( Descriptor->TextStyle & TEXT_DRAW_MULTILINE ) != 0; @@ -454,9 +454,9 @@ namespace toolkitform // buttons - if ( Descriptor->getType() == ::vcl::PDFWriter::PushButton ) + if ( Descriptor->getType() == vcl::PDFWriter::PushButton ) { - ::vcl::PDFWriter::PushButtonWidget* pButtonWidget = static_cast< ::vcl::PDFWriter::PushButtonWidget* >( Descriptor.get() ); + vcl::PDFWriter::PushButtonWidget* pButtonWidget = static_cast< vcl::PDFWriter::PushButtonWidget* >( Descriptor.get() ); FormButtonType eButtonType = FormButtonType_PUSH; OSL_VERIFY( xModelProps->getPropertyValue("ButtonType") >>= eButtonType ); static const char FM_PROP_TARGET_URL[] = "TargetURL"; @@ -491,8 +491,8 @@ namespace toolkitform pButtonWidget->Dest = i_pdfExportData.RegisterDest(); // and put it into the bookmarks, to ensure the future handling really happens - ::std::vector< ::vcl::PDFExtOutDevBookmarkEntry >& rBookmarks( i_pdfExportData.GetBookmarks() ); - ::vcl::PDFExtOutDevBookmarkEntry aBookmark; + ::std::vector< vcl::PDFExtOutDevBookmarkEntry >& rBookmarks( i_pdfExportData.GetBookmarks() ); + vcl::PDFExtOutDevBookmarkEntry aBookmark; aBookmark.nDestId = pButtonWidget->Dest; aBookmark.aBookmark = sURL; rBookmarks.push_back( aBookmark ); @@ -519,9 +519,9 @@ namespace toolkitform // check boxes static const char FM_PROP_STATE[] = "State"; - if ( Descriptor->getType() == ::vcl::PDFWriter::CheckBox ) + if ( Descriptor->getType() == vcl::PDFWriter::CheckBox ) { - ::vcl::PDFWriter::CheckBoxWidget* pCheckBoxWidget = static_cast< ::vcl::PDFWriter::CheckBoxWidget* >( Descriptor.get() ); + vcl::PDFWriter::CheckBoxWidget* pCheckBoxWidget = static_cast< vcl::PDFWriter::CheckBoxWidget* >( Descriptor.get() ); sal_Int16 nState = 0; OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_STATE ) >>= nState ); pCheckBoxWidget->Checked = ( nState != 0 ); @@ -529,9 +529,9 @@ namespace toolkitform // radio buttons - if ( Descriptor->getType() == ::vcl::PDFWriter::RadioButton ) + if ( Descriptor->getType() == vcl::PDFWriter::RadioButton ) { - ::vcl::PDFWriter::RadioButtonWidget* pRadioWidget = static_cast< ::vcl::PDFWriter::RadioButtonWidget* >( Descriptor.get() ); + vcl::PDFWriter::RadioButtonWidget* pRadioWidget = static_cast< vcl::PDFWriter::RadioButtonWidget* >( Descriptor.get() ); sal_Int16 nState = 0; OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_STATE ) >>= nState ); pRadioWidget->Selected = ( nState != 0 ); @@ -549,9 +549,9 @@ namespace toolkitform // list boxes - if ( Descriptor->getType() == ::vcl::PDFWriter::ListBox ) + if ( Descriptor->getType() == vcl::PDFWriter::ListBox ) { - ::vcl::PDFWriter::ListBoxWidget* pListWidget = static_cast< ::vcl::PDFWriter::ListBoxWidget* >( Descriptor.get() ); + vcl::PDFWriter::ListBoxWidget* pListWidget = static_cast< vcl::PDFWriter::ListBoxWidget* >( Descriptor.get() ); // drop down static const char FM_PROP_DROPDOWN[] = "Dropdown"; @@ -583,9 +583,9 @@ namespace toolkitform // combo boxes - if ( Descriptor->getType() == ::vcl::PDFWriter::ComboBox ) + if ( Descriptor->getType() == vcl::PDFWriter::ComboBox ) { - ::vcl::PDFWriter::ComboBoxWidget* pComboWidget = static_cast< ::vcl::PDFWriter::ComboBoxWidget* >( Descriptor.get() ); + vcl::PDFWriter::ComboBoxWidget* pComboWidget = static_cast< vcl::PDFWriter::ComboBoxWidget* >( Descriptor.get() ); // entries getStringItemVector( xModelProps, pComboWidget->Entries ); diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index c365c3c511d7..b2febeee3337 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -29,7 +29,7 @@ #include <vcl/unohelp2.hxx> -class DNDListenerContainer : public ::vcl::unohelper::MutexHelper, +class DNDListenerContainer : public vcl::unohelper::MutexHelper, public ::cppu::WeakComponentImplHelper4< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer, \ ::com::sun::star::datatransfer::dnd::XDropTargetDragContext, diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 7e2410a04aad..4d653054db98 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -175,7 +175,7 @@ public: sal_Int32 FindFirstSelectable( sal_Int32 nPos, bool bForward = true ); }; -class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList +class ImplListBoxWindow : public Control, public vcl::ISearchableStringList { private: ImplEntryList* mpEntryList; ///< EntryList @@ -237,7 +237,7 @@ private: Link maFocusHdl; Link maListItemSelectHdl; - ::vcl::QuickSelectionEngine maQuickSelectionEngine; + vcl::QuickSelectionEngine maQuickSelectionEngine; protected: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; @@ -373,9 +373,9 @@ public: protected: // ISearchableStringList - virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; - virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; - virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; + virtual vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; + virtual vcl::StringEntryIdentifier NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; + virtual void SelectEntry( vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; }; class ImplListBox : public Control diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 82ae80ebbde6..1b2796ee65a9 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -336,7 +336,7 @@ struct ImplSVData rtl::Reference< vcl::DisplayConnection > mxDisplayConnection; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxAccessBridge; - ::vcl::SettingsConfigItem* mpSettingsConfigItem; + vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; std::unordered_map< int, OUString >* mpPaperNames; diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 4a5166333e67..2867295bbc6f 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -1734,7 +1734,7 @@ private: { if ( !mpReferenceWrapper ) { // some frames never become visible .. - ::vcl::Window *pWindow = mpFrame -> GetWindow(); + vcl::Window *pWindow = mpFrame -> GetWindow(); if ( ! pWindow ) return nil; diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 54faf897b807..a69460ba5a96 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -43,7 +43,7 @@ #include "canvasbitmap.hxx" using namespace ::com::sun::star; -using namespace ::vcl::unotools; +using namespace vcl::unotools; namespace com { namespace sun { namespace star { namespace rendering { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index ca3539306540..07cbab812cc9 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1409,7 +1409,7 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper ) if( !pSVData->mxDisplayConnection.is() ) { - pSVData->mxDisplayConnection.set( new ::vcl::DisplayConnection ); + pSVData->mxDisplayConnection.set( new vcl::DisplayConnection ); pSVData->mxDisplayConnection->start(); } diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 2aaa2f122a3a..79c6933614cf 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -108,7 +108,7 @@ void Control::FillLayoutData() const void Control::CreateLayoutData() const { DBG_ASSERT( !mpControlData->mpLayoutData, "Control::CreateLayoutData: should be called with non-existent layout data only!" ); - mpControlData->mpLayoutData = new ::vcl::ControlLayoutData(); + mpControlData->mpLayoutData = new vcl::ControlLayoutData(); } bool Control::HasLayoutData() const @@ -116,7 +116,7 @@ bool Control::HasLayoutData() const return mpControlData && mpControlData->mpLayoutData != NULL; } -::vcl::ControlLayoutData* Control::GetLayoutData() const +vcl::ControlLayoutData* Control::GetLayoutData() const { return mpControlData->mpLayoutData; } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index ece4f5680af4..6b89146dd231 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1289,7 +1289,7 @@ void Edit::ImplCopyToSelectionClipboard() void Edit::ImplCopy( uno::Reference< datatransfer::clipboard::XClipboard >& rxClipboard ) { - ::vcl::unohelper::TextDataObject::CopyStringTo( GetSelected(), rxClipboard ); + vcl::unohelper::TextDataObject::CopyStringTo( GetSelected(), rxClipboard ); } void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxClipboard ) @@ -2884,7 +2884,7 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra if ( IsTracking() ) EndTracking(); // Vor D&D Tracking ausschalten - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( GetSelected() ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( GetSelected() ); sal_Int8 nActions = datatransfer::dnd::DNDConstants::ACTION_COPY; if ( !IsReadOnly() ) nActions |= datatransfer::dnd::DNDConstants::ACTION_MOVE; diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index c2d53ce022fc..1f6830b72a3f 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -1644,7 +1644,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) namespace { - static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) + static vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) { OSL_PRECOND( ( _nPos != LISTBOX_ENTRY_NOTFOUND ), "lcl_getEntry: invalid position!" ); sal_Int32 nEntryCount( _rList.GetEntryCount() ); @@ -1652,30 +1652,30 @@ namespace _nPos = 0; _out_entryText = _rList.GetEntryText( _nPos ); - // ::vcl::StringEntryIdentifier does not allow for 0 values, but our position is 0-based + // vcl::StringEntryIdentifier does not allow for 0 values, but our position is 0-based // => normalize - return reinterpret_cast< ::vcl::StringEntryIdentifier >( _nPos + 1 ); + return reinterpret_cast< vcl::StringEntryIdentifier >( _nPos + 1 ); } - static sal_Int32 lcl_getEntryPos( ::vcl::StringEntryIdentifier _entry ) + static sal_Int32 lcl_getEntryPos( vcl::StringEntryIdentifier _entry ) { // our pos is 0-based, but StringEntryIdentifier does not allow for a NULL return static_cast< sal_Int32 >( reinterpret_cast< sal_Int64 >( _entry ) ) - 1; } } -::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const +vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const { return lcl_getEntry( *GetEntryList(), ( mnCurrentPos == LISTBOX_ENTRY_NOTFOUND ) ? 0 : mnCurrentPos, _out_entryText ); } -::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const +vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const { sal_Int32 nNextPos = lcl_getEntryPos( _currentEntry ) + 1; return lcl_getEntry( *GetEntryList(), nNextPos, _out_entryText ); } -void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry ) +void ImplListBoxWindow::SelectEntry( vcl::StringEntryIdentifier _entry ) { sal_Int32 nSelect = lcl_getEntryPos( _entry ); if ( mpEntryList->IsEntryPosSelected( nSelect ) ) diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index f1c5c9cc1435..04fc54cad985 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -736,13 +736,13 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font ) return rOStm; } -SvStream& ReadFont( SvStream& rIStm, ::vcl::Font& rFont ) +SvStream& ReadFont( SvStream& rIStm, vcl::Font& rFont ) { rFont.MakeUnique(); return ReadImpl_Font( rIStm, *rFont.mpImplFont ); } -SvStream& WriteFont( SvStream& rOStm, const ::vcl::Font& rFont ) +SvStream& WriteFont( SvStream& rOStm, const vcl::Font& rFont ) { return WriteImpl_Font( rOStm, *rFont.mpImplFont ); } diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 6e335118da62..c57c53bb4f9b 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -549,7 +549,7 @@ Image ImageList::GetImage( sal_uInt16 nId ) const if (!aRet) { BitmapEx rBitmap; - bool res = ::vcl::ImageRepository::loadDefaultImage(rBitmap); + bool res = vcl::ImageRepository::loadDefaultImage(rBitmap); if (res) aRet = Image(rBitmap); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 9ed2d19e1644..4848bf5d99d6 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -9385,7 +9385,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const OUString& rOrigStr, if ( nTextHeight ) { - ::vcl::DefaultTextLayout aLayout( *m_pReferenceDevice ); + vcl::DefaultTextLayout aLayout( *m_pReferenceDevice ); OutputDevice::ImplGetTextLines( aMultiLineInfo, nWidth, aStr, nStyle, aLayout ); nLines = nHeight/nTextHeight; nFormatLines = aMultiLineInfo.Count(); diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index fe275146ee35..d9352a79202c 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -1640,7 +1640,7 @@ sal_uInt32 PNGReaderImpl::ImplReadsal_uInt32() } PNGReader::PNGReader(SvStream& rIStream) : - mpImpl(new ::vcl::PNGReaderImpl(rIStream)) + mpImpl(new vcl::PNGReaderImpl(rIStream)) { } diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index ab3d48a6d9c5..a1ebb5d39732 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -33,7 +33,7 @@ #include <algorithm> -using namespace ::vcl::unotools; +using namespace vcl::unotools; using namespace ::com::sun::star; namespace diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 901527b36a34..f8dbf63ad841 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -67,7 +67,7 @@ namespace vcl uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/, const ::BitmapEx& inputBitmap ) { - SAL_INFO( "vcl.helper", "::vcl::unotools::xBitmapFromBitmapEx()" ); + SAL_INFO( "vcl.helper", "vcl::unotools::xBitmapFromBitmapEx()" ); return new vcl::unotools::VclCanvasBitmap( inputBitmap ); } @@ -183,7 +183,7 @@ namespace vcl ::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XIntegerReadOnlyBitmap >& xInputBitmap ) { - SAL_INFO( "vcl.helper", "::vcl::unotools::bitmapExFromXBitmap()" ); + SAL_INFO( "vcl.helper", "vcl::unotools::bitmapExFromXBitmap()" ); if( !xInputBitmap.is() ) return ::BitmapEx(); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 27810d43ade9..61dadc4e52dc 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -59,7 +59,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; using namespace ::utl; -using namespace ::vcl; vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const { @@ -231,7 +230,7 @@ FontMetric OutputDevice::GetFontMetric() const FontMetric OutputDevice::GetFontMetric( const vcl::Font& rFont ) const { // select font, query metrics, select original font again - Font aOldFont = GetFont(); + vcl::Font aOldFont = GetFont(); const_cast<OutputDevice*>(this)->SetFont( rFont ); FontMetric aMetric( GetFontMetric() ); const_cast<OutputDevice*>(this)->SetFont( aOldFont ); @@ -265,7 +264,7 @@ bool OutputDevice::GetFontCharMap( FontCharMapPtr& rFontCharMap ) const return true; } -bool OutputDevice::GetFontCapabilities( FontCapabilities& rFontCapabilities ) const +bool OutputDevice::GetFontCapabilities( vcl::FontCapabilities& rFontCapabilities ) const { // we need a graphics if( !mpGraphics && !AcquireGraphics() ) @@ -773,8 +772,8 @@ void ImplFontSubstitute( OUString& rFontName ) } //hidpi TODO: This routine has hard-coded font-sizes that break places such as DialControl -Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, - sal_uLong nFlags, const OutputDevice* pOutDev ) +vcl::Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, + sal_uLong nFlags, const OutputDevice* pOutDev ) { if (!pOutDev) // default is NULL pOutDev = Application::GetDefaultDevice(); @@ -793,7 +792,7 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, else aSearch = rDefaults.getUserInterfaceFont( aLanguageTag ); // use the UI font as a fallback - Font aFont; + vcl::Font aFont; aFont.SetPitch( PITCH_VARIABLE ); switch ( nType ) @@ -1656,12 +1655,12 @@ bool OutputDevice::ImplNewFont() const if( (nNewWidth != nOrigWidth) && (nNewWidth != 0) ) { Size aOrigSize = maFont.GetSize(); - const_cast<Font&>(maFont).SetSize( Size( nNewWidth, aSize.Height() ) ); + const_cast<vcl::Font&>(maFont).SetSize( Size( nNewWidth, aSize.Height() ) ); mbMap = false; mbNewFont = true; ImplNewFont(); // recurse once using stretched width mbMap = true; - const_cast<Font&>(maFont).SetSize( aOrigSize ); + const_cast<vcl::Font&>(maFont).SetSize( aOrigSize ); } } diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx index ce7d9b524952..5a963c2a2b00 100644 --- a/vcl/source/outdev/nativecontrols.cxx +++ b/vcl/source/outdev/nativecontrols.cxx @@ -48,8 +48,8 @@ static bool EnableNativeWidget( const OutputDevice& i_rDevice ) case OUTDEV_VIRDEV: { - const ::vcl::ExtOutDevData* pOutDevData( i_rDevice.GetExtOutDevData() ); - const ::vcl::PDFExtOutDevData* pPDFData( dynamic_cast< const ::vcl::PDFExtOutDevData* >( pOutDevData ) ); + const vcl::ExtOutDevData* pOutDevData( i_rDevice.GetExtOutDevData() ); + const vcl::PDFExtOutDevData* pPDFData( dynamic_cast< const vcl::PDFExtOutDevData* >( pOutDevData ) ); if ( pPDFData != NULL ) return false; return true; diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 1cc48a32223b..79588dd1fdd7 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -494,7 +494,7 @@ void OutputDevice::ImplDrawText( SalLayout& rSalLayout ) long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, - sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ) + sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ) { DBG_ASSERTWARNING( nWidth >= 0, "ImplGetTextLines: nWidth <= 0!" ); @@ -1537,7 +1537,7 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, const OUString& rOrigStr, sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText, - ::vcl::ITextLayout& _rLayout ) + vcl::ITextLayout& _rLayout ) { Color aOldTextColor; @@ -1834,7 +1834,7 @@ void OutputDevice::AddTextRectActions( const Rectangle& rRect, void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText, - ::vcl::ITextLayout* _pTextLayout ) + vcl::ITextLayout* _pTextLayout ) { if (mpOutDevData->mpRecordLayout) { @@ -1878,7 +1878,7 @@ void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, s Rectangle OutputDevice::GetTextRect( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle, TextRectInfo* pInfo, - const ::vcl::ITextLayout* _pTextLayout ) const + const vcl::ITextLayout* _pTextLayout ) const { Rectangle aRect = rRect; @@ -2012,7 +2012,7 @@ OUString OutputDevice::GetEllipsisString( const OUString& rOrigStr, long nMaxWid } OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rOrigStr, long nMaxWidth, - sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ) + sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ) { OUString aStr = rOrigStr; sal_Int32 nIndex = _rLayout.GetTextBreak( aStr, nMaxWidth, 0, aStr.getLength() ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 90e64bd1bf3b..ac348f2ec1ad 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3795,7 +3795,7 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr // Create canvas instance with window handle - static ::vcl::DeleteUnoReferenceOnDeinit<XMultiComponentFactory> xStaticCanvasFactory( + static vcl::DeleteUnoReferenceOnDeinit<XMultiComponentFactory> xStaticCanvasFactory( css::rendering::CanvasFactory::create( xContext ) ); Reference<XMultiComponentFactory> xCanvasFactory(xStaticCanvasFactory.get()); diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 496c5769b902..4f3b910ee6af 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -507,7 +507,7 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data) if( nLength ) aText = OUString( pMBString, nLength, osl_getThreadTextEncoding() ); } - ::vcl::I18NStatus::get().setStatusText( aText ); + vcl::I18NStatus::get().setStatusText( aText ); } #if OSL_DEBUG_LEVEL > 1 else @@ -523,7 +523,7 @@ void SwitchIMCallback (XIC, XPointer, XPointer call_data) { XIMSwitchIMNotifyCallbackStruct* pCallData = reinterpret_cast<XIMSwitchIMNotifyCallbackStruct*>(call_data); - ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); + vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); } // vii. destroy callbacks: internally disable all IC/IM calls diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index dcf11cde4cc5..ce8dee888aae 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -257,7 +257,7 @@ SalI18N_InputMethod::SalI18N_InputMethod( ) SalI18N_InputMethod::~SalI18N_InputMethod() { - ::vcl::I18NStatus::free(); + vcl::I18NStatus::free(); if ( mpStyles != NULL ) XFree( mpStyles ); if ( maMethod != NULL ) |