[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 2 commits - desktop/source

[Jan Holesovsky]

 desktop/source/lib/init.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0bacc1213e51adf2aa5f37cba82176ec34ac4985
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Feb 8 20:09:37 2016 +0100

    lok: Interaction handler for saveAs() too.
    
    Change-Id: I3f0365e05685c21987da194e24a1165c7a3f8b5c

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 15df86a..bd60e20 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -679,6 +679,13 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
         aSaveMediaDescriptor["FilterName"] <<= aFilterName;
         aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS()] <<= aFilterOptions;
 
+        // add interaction handler too
+        rtl::Reference<LOKInteractionHandler> const pInteraction(
+            new LOKInteractionHandler(::comphelper::getProcessComponentContext(), "saveas", gImpl, pDocument));
+        uno::Reference<task::XInteractionHandler2> const xInteraction(pInteraction.get());
+
+        aSaveMediaDescriptor[MediaDescriptor::PROP_INTERACTIONHANDLER()] <<= xInteraction;
+
         uno::Reference<frame::XStorable> xStorable(pDocument->mxComponent, uno::UNO_QUERY_THROW);
         xStorable->storeAsURL(aURL, aSaveMediaDescriptor.getAsConstPropertyValueList());
 
commit 949664deadc04829087af1f6cf4d88b9a2d34114
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Feb 8 20:08:31 2016 +0100

    lok: Take over the identity of the document when performing saveAs().
    
    This way we are getting the .uno:ModifiedStatus notification even when
    performing saveAs().
    
    Change-Id: I370bf483c50161fd4b7f2255ae85fdb76487a9a0

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2072fb3..15df86a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -680,7 +680,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
         aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS()] <<= aFilterOptions;
 
         uno::Reference<frame::XStorable> xStorable(pDocument->mxComponent, uno::UNO_QUERY_THROW);
-        xStorable->storeToURL(aURL, aSaveMediaDescriptor.getAsConstPropertyValueList());
+        xStorable->storeAsURL(aURL, aSaveMediaDescriptor.getAsConstPropertyValueList());
 
         return true;
     }