makeAny->Any in canvas..configmgr

Change-Id: Id06812595f373cd0da8b421dbac34a60a266ae6e
Reviewed-on: https://gerrit.libreoffice.org/33869
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 18 insertions, 18 deletions

diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index eae148187671..4058882f46e6 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -199,12 +199,12 @@ namespace cairocanvas
 
     uno::Any DeviceHelper::isAccelerated() const
     {
-        return css::uno::makeAny(false);
+        return css::uno::Any(false);
     }
 
     uno::Any DeviceHelper::getDeviceHandle() const
     {
-        return uno::makeAny( reinterpret_cast< sal_Int64 >(mpRefDevice.get()) );
+        return uno::Any( reinterpret_cast< sal_Int64 >(mpRefDevice.get()) );
     }
 
     uno::Any DeviceHelper::getSurfaceHandle() const
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index b2a263f5c447..3f224b2771e4 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -82,7 +82,7 @@ namespace cairocanvas
 
     uno::Any SpriteDeviceHelper::isAccelerated() const
     {
-        return css::uno::makeAny(true);
+        return css::uno::Any(true);
     }
 
     uno::Any SpriteDeviceHelper::getDeviceHandle() const
diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index e46951f6caeb..e9c207967eec 100644
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.cxx
@@ -178,12 +178,12 @@ namespace dxcanvas
 
     uno::Any DeviceHelper::isAccelerated() const
     {
-        return css::uno::makeAny(false);
+        return css::uno::Any(false);
     }
 
     uno::Any DeviceHelper::getDeviceHandle() const
     {
-        return uno::makeAny( reinterpret_cast< sal_Int64 >(mpOutDev.get()) );
+        return uno::Any( reinterpret_cast< sal_Int64 >(mpOutDev.get()) );
     }
 
     uno::Any DeviceHelper::getSurfaceHandle() const
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 74e5957cdd89..ac8ce68d2c82 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -177,7 +177,7 @@ namespace dxcanvas
 
     uno::Any SpriteDeviceHelper::isAccelerated() const
     {
-        return css::uno::makeAny(true);
+        return css::uno::Any(true);
     }
 
     void SpriteDeviceHelper::notifySizeUpdate( const awt::Rectangle& rBounds )
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 7604137ce246..28b6df740b1a 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -130,9 +130,9 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
             configuration::theDefaultProvider::get( m_xContext ) );
 
         Any propValue(
-            makeAny( beans::PropertyValue(
+            Any( beans::PropertyValue(
                          "nodepath", -1,
-                         makeAny( OUString("/org.openoffice.Office.Canvas") ),
+                         Any( OUString("/org.openoffice.Office.Canvas") ),
                          beans::PropertyState_DIRECT_VALUE ) ) );
 
         m_xCanvasConfigNameAccess.set(
@@ -141,10 +141,10 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
                 Sequence<Any>( &propValue, 1 ) ),
             UNO_QUERY_THROW );
 
-        propValue = makeAny(
+        propValue = Any(
             beans::PropertyValue(
                 "nodepath", -1,
-                makeAny( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ),
+                Any( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ),
                 beans::PropertyState_DIRECT_VALUE ) );
 
         Reference<container::XNameAccess> xNameAccess(
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 50bf7142e9a4..6ac6b64250b2 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -348,13 +348,13 @@ namespace oglcanvas
 
     uno::Any SpriteDeviceHelper::isAccelerated() const
     {
-        return css::uno::makeAny(false);
+        return css::uno::Any(false);
     }
 
     uno::Any SpriteDeviceHelper::getDeviceHandle() const
     {
         const SystemChildWindow* pChildWindow = mxContext->getChildWindow();
-        return uno::makeAny( reinterpret_cast< sal_Int64 >(pChildWindow) );
+        return uno::Any( reinterpret_cast< sal_Int64 >(pChildWindow) );
     }
 
     uno::Any SpriteDeviceHelper::getSurfaceHandle() const
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 7ab36a8ed2e4..640c3a3e3b93 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1118,7 +1118,7 @@ namespace canvas
 
                     o_rxParams.realloc( 2 );
 
-                    o_rxParams[ 0 ] = uno::makeAny( xServiceInfo->getImplementationName() );
+                    o_rxParams[ 0 ] <<= xServiceInfo->getImplementationName();
                     o_rxParams[ 1 ] = xPropSet->getPropertyValue( "DeviceHandle" );
                 }
                 catch( const uno::Exception& )
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index a278273bf048..fd85af43d3fc 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -158,7 +158,7 @@ namespace vclcanvas
 
     uno::Any DeviceHelper::isAccelerated() const
     {
-        return css::uno::makeAny(false);
+        return css::uno::Any(false);
     }
 
     uno::Any DeviceHelper::getDeviceHandle() const
@@ -166,7 +166,7 @@ namespace vclcanvas
         if( !mpOutDev )
             return uno::Any();
 
-        return uno::makeAny(
+        return uno::Any(
             reinterpret_cast< sal_Int64 >(&mpOutDev->getOutDev()) );
     }
 
diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx
index cf51d9e018a6..6c4631696113 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.hxx
@@ -120,7 +120,7 @@ namespace vclcanvas
 
         css::uno::Any isUnsafeScrolling() const
         {
-            return css::uno::makeAny(mbIsUnsafeScrolling);
+            return css::uno::Any(mbIsUnsafeScrolling);
         }
         void enableUnsafeScrolling( const css::uno::Any& rAny )
         {
@@ -129,7 +129,7 @@ namespace vclcanvas
 
         css::uno::Any isSpriteBounds() const
         {
-            return css::uno::makeAny(mbShowSpriteBounds);
+            return css::uno::Any(mbShowSpriteBounds);
         }
         void enableSpriteBounds( const css::uno::Any& rAny )
         {
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 2b484f8a3852..2b9a5d169525 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -95,7 +95,7 @@ namespace vclcanvas
         if( !mpBackBuffer )
             return uno::Any();
 
-        return uno::makeAny(
+        return uno::Any(
             reinterpret_cast< sal_Int64 >(&mpBackBuffer->getOutDev()) );
     }