jl152 merge with DEV300_m83

5 files changed, 216 insertions, 121 deletions

diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx
index 247e1a678e02..82848203699c 100644
--- a/comphelper/inc/comphelper/propertycontainerhelper.hxx
+++ b/comphelper/inc/comphelper/propertycontainerhelper.hxx
@@ -42,7 +42,7 @@ namespace comphelper
 //.........................................................................
 
 // infos about one single property
-struct COMPHELPER_DLLPRIVATE PropertyDescription
+struct COMPHELPER_DLLPUBLIC PropertyDescription
 {
     // the possibilities where a property holding object may be located
     enum LocationType
diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
new file mode 100644
index 000000000000..1ade47220c6f
--- /dev/null
+++ b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#ifndef _COMPHELPER_STILLREADWRITEINTERACTION_HXX_
+#define _COMPHELPER_STRILLREADWRITEINTERACTION_HXX_
+
+//_______________________________________________
+// includes
+#include <ucbhelper/interceptedinteraction.hxx>
+
+#ifndef __COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP__
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#endif
+
+#include <ucbhelper/interceptedinteraction.hxx>
+#include "comphelper/comphelperdllapi.h"
+
+//_______________________________________________
+// namespace
+
+namespace comphelper{
+class COMPHELPER_DLLPUBLIC StillReadWriteInteraction : public ::ucbhelper::InterceptedInteraction
+{
+private:
+    static const sal_Int32 HANDLE_INTERACTIVEIOEXCEPTION       = 0;
+    static const sal_Int32 HANDLE_UNSUPPORTEDDATASINKEXCEPTION = 1;
+
+    sal_Bool m_bUsed;
+    sal_Bool m_bHandledByMySelf;
+    sal_Bool m_bHandledByInternalHandler;
+
+public:
+    StillReadWriteInteraction(const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler);
+
+    void resetInterceptions();
+    void resetErrorStates();
+    sal_Bool wasWriteError();
+
+private:
+    virtual ucbhelper::InterceptedInteraction::EInterceptionState intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest&                         aRequest,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest);
+
+};
+}
+#endif
diff --git a/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk
index a49c2eb59c84..cecba554b332 100644
--- a/comphelper/source/misc/makefile.mk
+++ b/comphelper/source/misc/makefile.mk
@@ -93,6 +93,7 @@ SLOFILES=   \
             $(SLO)$/comphelper_module.obj \
             $(SLO)$/comphelper_services.obj \
             $(SLO)$/componentbase.obj \
+            $(SLO)$/stillreadwriteinteraction.obj \
 
 # --- Targets ----------------------------------
 
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 1710a43027cf..1bc40a454d43 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -28,6 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_comphelper.hxx"
 #include <comphelper/mediadescriptor.hxx>
+#include <comphelper/stillreadwriteinteraction.hxx>
 
 //_______________________________________________
 // includes
@@ -59,22 +60,10 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #endif
 
-#ifndef __COM_SUN_STAR_UCB_INTERACTIVEIOEXCEPTION_HPP__
-#include <com/sun/star/ucb/InteractiveIOException.hpp>
-#endif
-
-#ifndef __COM_SUN_STAR_UCB_UNSUPPORTEDDATASINKEXCEPTION_HPP__
-#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
-#endif
-
 #ifndef __COM_SUN_STAR_UCB_COMMANDFAILEDEXCEPTION_HPP__
 #include <com/sun/star/ucb/CommandFailedException.hpp>
 #endif
 
-#ifndef __COM_SUN_STAR_TASK_XINTERACTIONABORT_HPP__
-#include <com/sun/star/task/XInteractionAbort.hpp>
-#endif
-
 #ifndef __COM_SUN_STAR_URI_XURIREFERENCEFACTORY_HPP__
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #endif
@@ -673,114 +662,6 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
 }
 
 /*-----------------------------------------------*/
-class StillReadWriteInteraction : public ::ucbhelper::InterceptedInteraction
-{
-    private:
-        static const sal_Int32 HANDLE_INTERACTIVEIOEXCEPTION       = 0;
-        static const sal_Int32 HANDLE_UNSUPPORTEDDATASINKEXCEPTION = 1;
-
-        sal_Bool m_bUsed;
-        sal_Bool m_bHandledByMySelf;
-        sal_Bool m_bHandledByInternalHandler;
-
-    public:
-        StillReadWriteInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xHandler)
-            : m_bUsed                    (sal_False)
-            , m_bHandledByMySelf         (sal_False)
-            , m_bHandledByInternalHandler(sal_False)
-        {
-            ::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions;
-            ::ucbhelper::InterceptedInteraction::InterceptedRequest                  aInterceptedRequest;
-
-            aInterceptedRequest.Handle               = HANDLE_INTERACTIVEIOEXCEPTION;
-            aInterceptedRequest.Request            <<= css::ucb::InteractiveIOException();
-            aInterceptedRequest.Continuation         = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
-            aInterceptedRequest.MatchExact           = sal_False;
-            lInterceptions.push_back(aInterceptedRequest);
-
-            aInterceptedRequest.Handle               = HANDLE_UNSUPPORTEDDATASINKEXCEPTION;
-            aInterceptedRequest.Request            <<= css::ucb::UnsupportedDataSinkException();
-            aInterceptedRequest.Continuation         = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
-            aInterceptedRequest.MatchExact           = sal_False;
-            lInterceptions.push_back(aInterceptedRequest);
-
-            setInterceptedHandler(xHandler);
-            setInterceptions(lInterceptions);
-        }
-
-        void resetInterceptions()
-        {
-            setInterceptions(::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest >());
-        }
-
-        void resetErrorStates()
-        {
-            m_bUsed                     = sal_False;
-            m_bHandledByMySelf          = sal_False;
-            m_bHandledByInternalHandler = sal_False;
-        }
-
-        sal_Bool wasWriteError()
-        {
-            return (m_bUsed && m_bHandledByMySelf);
-        }
-
-    private:
-        virtual ucbhelper::InterceptedInteraction::EInterceptionState intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest&                         aRequest,
-                                                                                  const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest)
-        {
-            // we are used!
-            m_bUsed = sal_True;
-
-            // check if its a real interception - might some parameters are not the right ones ...
-            sal_Bool bAbort = sal_False;
-            switch(aRequest.Handle)
-            {
-                case HANDLE_INTERACTIVEIOEXCEPTION:
-                {
-                    css::ucb::InteractiveIOException exIO;
-                    xRequest->getRequest() >>= exIO;
-                    bAbort = (
-                                (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     )
-                             || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
-#ifdef MACOSX
-                             // this is a workaround for MAC, on this platform if the file is locked
-                             // the returned error code looks to be wrong
-                             || (exIO.Code == css::ucb::IOErrorCode_GENERAL )
-#endif
-                            );
-                }
-                break;
-
-                case HANDLE_UNSUPPORTEDDATASINKEXCEPTION:
-                {
-                    bAbort = sal_True;
-                }
-                break;
-            }
-
-            // handle interaction by ourself
-            if (bAbort)
-            {
-                m_bHandledByMySelf = sal_True;
-                css::uno::Reference< css::task::XInteractionContinuation > xAbort = ::ucbhelper::InterceptedInteraction::extractContinuation(
-                    xRequest->getContinuations(),
-                    ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0)));
-                if (!xAbort.is())
-                    return ::ucbhelper::InterceptedInteraction::E_NO_CONTINUATION_FOUND;
-                xAbort->select();
-                return ::ucbhelper::InterceptedInteraction::E_INTERCEPTED;
-            }
-
-            // Otherwhise use internal handler.
-            if (m_xInterceptedHandler.is())
-            {
-                m_bHandledByInternalHandler = sal_True;
-                m_xInterceptedHandler->handle(xRequest);
-            }
-            return ::ucbhelper::InterceptedInteraction::E_INTERCEPTED;
-        }
-};
 
 /*-----------------------------------------------
     25.03.2004 12:29
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx
new file mode 100644
index 000000000000..9054f0754b5e
--- /dev/null
+++ b/comphelper/source/misc/stillreadwriteinteraction.cxx
@@ -0,0 +1,144 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_comphelper.hxx"
+#include <comphelper/stillreadwriteinteraction.hxx>
+
+#ifndef __COM_SUN_STAR_UCB_INTERACTIVEIOEXCEPTION_HPP__
+#include <com/sun/star/ucb/InteractiveIOException.hpp>
+#endif
+
+#ifndef __COM_SUN_STAR_TASK_XINTERACTIONABORT_HPP__
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#endif
+
+#ifndef __COM_SUN_STAR_UCB_UNSUPPORTEDDATASINKEXCEPTION_HPP__
+#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
+#endif
+
+namespace comphelper{
+
+    namespace css = ::com::sun::star;
+
+StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xHandler)
+             : m_bUsed                    (sal_False)
+             , m_bHandledByMySelf         (sal_False)
+             , m_bHandledByInternalHandler(sal_False)
+{
+    ::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions;
+    ::ucbhelper::InterceptedInteraction::InterceptedRequest                  aInterceptedRequest;
+
+    aInterceptedRequest.Handle = HANDLE_INTERACTIVEIOEXCEPTION;
+    aInterceptedRequest.Request <<= css::ucb::InteractiveIOException();
+    aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
+    aInterceptedRequest.MatchExact = sal_False;
+    lInterceptions.push_back(aInterceptedRequest);
+
+    aInterceptedRequest.Handle = HANDLE_UNSUPPORTEDDATASINKEXCEPTION;
+    aInterceptedRequest.Request <<= css::ucb::UnsupportedDataSinkException();
+    aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
+    aInterceptedRequest.MatchExact = sal_False;
+    lInterceptions.push_back(aInterceptedRequest);
+
+    setInterceptedHandler(xHandler);
+    setInterceptions(lInterceptions);
+}
+
+void StillReadWriteInteraction::resetInterceptions()
+{
+    setInterceptions(::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest >());
+}
+
+void StillReadWriteInteraction::resetErrorStates()
+{
+    m_bUsed                     = sal_False;
+    m_bHandledByMySelf          = sal_False;
+    m_bHandledByInternalHandler = sal_False;
+}
+
+sal_Bool StillReadWriteInteraction::wasWriteError()
+{
+    return (m_bUsed && m_bHandledByMySelf);
+}
+
+ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction::intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest&                         aRequest,
+                                                                  const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest)
+{
+    // we are used!
+    m_bUsed = sal_True;
+
+    // check if its a real interception - might some parameters are not the right ones ...
+    sal_Bool bAbort = sal_False;
+    switch(aRequest.Handle)
+    {
+    case HANDLE_INTERACTIVEIOEXCEPTION:
+        {
+            css::ucb::InteractiveIOException exIO;
+            xRequest->getRequest() >>= exIO;
+            bAbort = (
+                (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     )
+                || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
+                || (exIO.Code == css::ucb::IOErrorCode_NOT_EXISTING )
+#ifdef MACOSX
+                // this is a workaround for MAC, on this platform if the file is locked
+                // the returned error code looks to be wrong
+                || (exIO.Code == css::ucb::IOErrorCode_GENERAL )
+#endif
+                );
+        }
+        break;
+
+    case HANDLE_UNSUPPORTEDDATASINKEXCEPTION:
+        {
+            bAbort = sal_True;
+        }
+        break;
+    }
+
+    // handle interaction by ourself
+    if (bAbort)
+    {
+        m_bHandledByMySelf = sal_True;
+        css::uno::Reference< css::task::XInteractionContinuation > xAbort = ::ucbhelper::InterceptedInteraction::extractContinuation(
+            xRequest->getContinuations(),
+            ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0)));
+        if (!xAbort.is())
+            return ::ucbhelper::InterceptedInteraction::E_NO_CONTINUATION_FOUND;
+        xAbort->select();
+        return ::ucbhelper::InterceptedInteraction::E_INTERCEPTED;
+    }
+
+    // Otherwhise use internal handler.
+    if (m_xInterceptedHandler.is())
+    {
+        m_bHandledByInternalHandler = sal_True;
+        m_xInterceptedHandler->handle(xRequest);
+    }
+    return ::ucbhelper::InterceptedInteraction::E_INTERCEPTED;
+}
+}