[Libreoffice-commits] core.git: vcl/osx vcl/source

[Stephan Bergmann]

 vcl/osx/DataFlavorMapping.cxx |   12 ++++++------
 vcl/source/window/mouse.cxx   |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bd7dd48189e5ff7f62e16e53f0a02d1068583108
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 28 20:10:52 2017 +0100

    loplugin:unoany
    
    Change-Id: I525ba4d7706e6f6a385a0fbf5976d8e9883a40a5

diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 31edf56..6db7d41 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -216,9 +216,9 @@ Any UniDataProvider::getOOoData()
 
   if (mSystemData)
     {
-      oOOData = makeAny(OUString(static_cast<const sal_Char*>([mSystemData bytes]),
+      oOOData <<= OUString(static_cast<const sal_Char*>([mSystemData bytes]),
                                  [mSystemData length],
-                                 RTL_TEXTENCODING_UTF8));
+                                 RTL_TEXTENCODING_UTF8);
     }
   else
     {
@@ -268,7 +268,7 @@ Any ByteSequenceDataProvider::getOOoData()
       Sequence<sal_Int8> byteSequence;
       byteSequence.realloc(flavorDataLength);
       memcpy(byteSequence.getArray(), [mSystemData bytes], flavorDataLength);
-      oOOData = makeAny(byteSequence);
+      oOOData <<= byteSequence;
     }
   else
     {
@@ -324,7 +324,7 @@ Any HTMLFormatDataProvider::getOOoData()
           pPlainHtml = &plainHtml;
         }
 
-      oOOData = makeAny(*pPlainHtml);
+      oOOData <<= *pPlainHtml;
     }
   else
     {
@@ -388,7 +388,7 @@ Any PNGDataProvider::getOOoData()
 
         Sequence<sal_Int8> pngData;
         if( ImageToPNG( imgData, pngData, meImageType))
-            oOOData = makeAny( pngData);
+            oOOData <<= pngData;
     }
     else
     {
@@ -450,7 +450,7 @@ Any FileListDataProvider::getOOoData()
           pBuffer += l + 1;
         }
 
-      oOOData = makeAny(oOOFileList);
+      oOOData <<= oOOFileList;
     }
   else
     {
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index d0349d8..d6bf320 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -741,8 +741,8 @@ Reference< css::datatransfer::dnd::XDragSource > Window::GetDragSource()
              * Using Windows based dnd as a temporary solution        */
                     aDragSourceSN = "com.sun.star.datatransfer.dnd.OleDragSource";
                     aDropTargetSN = "com.sun.star.datatransfer.dnd.OleDropTarget";
-                    aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) ) );
-                    aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) ) );
+                    aDragSourceAL[ 1 ] <<= static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) );
+                    aDropTargetAL[ 0 ] <<= static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) );
 #elif HAVE_FEATURE_X11
                     aDragSourceSN = "com.sun.star.datatransfer.dnd.X11DragSource";
                     aDropTargetSN = "com.sun.star.datatransfer.dnd.X11DropTarget";