desktop/source/lib/init.cxx | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit e07ffae5046e9c91ef96026435cab84c3bcb4534
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Feb 8 21:44:54 2016 +0100
Revert "lok: Interaction handler for saveAs() too."
This reverts commit 809154904fe66441ada6985b153b4c1b20f3eb8f.
Revert "lok: Take over the identity of the document when performing
saveAs()."
This reverts commit bcc940956c4689888297c7bbe8d3744becc2fe9e.
The CppunitTest_desktop_lib crashes due to a null gImpl and i can't
figure out how to call lok_init so it actually works.
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5d5fe77..eaac992 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -663,15 +663,8 @@ 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());
+ xStorable->storeToURL(aURL,
aSaveMediaDescriptor.getAsConstPropertyValueList());
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
