[Libreoffice-commits] core.git: extensions/source fpicker/source

[Stephan Bergmann]

 extensions/source/ole/oleobjw.cxx                 |    8 ++++----
 fpicker/source/win32/filepicker/asyncrequests.hxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 98d9bb5eb266ff4f897adbe4d0c0a49ff9b4c7bb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 21 18:14:18 2016 +0200

    Adapt Windows-only code to deletion of the "Any-to-Any" specializatios
    
    ...upcoming with <https://gerrit.libreoffice.org/#/c/30022/> "Delete the 'Any-
    to-Any' template specializations for LIBO_INTERNAL_ONLY"
    
    Change-Id: If070825d88ffa7bb49e645b3bfeae9dfa387f000

diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 25112dd..272491c 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1386,14 +1386,14 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, con
                 {
                     PropertyPutArgument arg;
                     anyArg >>= arg;
-                    anyArg <<= arg.Value;
+                    anyArg = arg.Value;
                 }
                 // named argument
                 if (anyArg.getValueType() == cppu::UnoType<NamedArgument>::get())
                 {
                     NamedArgument aNamedArgument;
                     anyArg >>= aNamedArgument;
-                    anyArg <<= aNamedArgument.Value;
+                    anyArg = aNamedArgument.Value;
                 }
 
                 if ( nInd < aParams.getLength() && anyArg.getValueTypeClass() != TypeClass_VOID )
@@ -1858,14 +1858,14 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
             {
                 PropertyPutArgument arg;
                 anyArg >>= arg;
-                anyArg <<= arg.Value;
+                anyArg = arg.Value;
             }
             // named argument
             if (anyArg.getValueType() == cppu::UnoType<NamedArgument>::get())
             {
                 NamedArgument aNamedArgument;
                 anyArg >>= aNamedArgument;
-                anyArg <<= aNamedArgument.Value;
+                anyArg = aNamedArgument.Value;
             }
             // out param
             if (paramFlags & PARAMFLAG_FOUT &&
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 50f0a56..2b62ba7 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -83,7 +83,7 @@ class Request
         void setArgument(const OUString& sName ,
                          const TArgumentType&   aValue)
         {
-            m_lArguments[sName] <<= aValue;
+            m_lArguments[sName] = css::uno::toAny(aValue);
         }