summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-02-05 14:35:17 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-02-05 17:19:48 +0100
commitb030e83fccbff8d82a4c84462075baa8442cde54 (patch)
treeea43fbba2864d484ed90348d639f70484e498e87 /include/sfx2
parente7ce52acd75cf90ff90ed5fb6a809b5813337411 (diff)
sfx2: allow storeToURL() on the main thread
This is similar to commit f1e775470e68fb1ca1fee390c10064c55932180d (framework: allow storeSelf() on the main thread, 2019-01-30), just this handles "save as" instead of "save". The result is that combining this commit with the previous OnMainThread ones allows all of document load/save/save-as/command-dispatch on the main thread even when the action is invoked via remote UNO, which would run on a non-main thread by default. Change-Id: I7d50cceb66ecc6619fe25734107a2524ca872c2a Reviewed-on: https://gerrit.libreoffice.org/67412 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/sfxbasemodel.hxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index d885f1385333..0f93d8652b6c 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -407,6 +407,9 @@ public:
virtual void SAL_CALL storeToURL( const OUString& sURL,
const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) override;
+ SAL_DLLPRIVATE void
+ impl_store(const OUString& sURL,
+ const css::uno::Sequence<css::beans::PropertyValue>& seqArguments, bool bSaveTo);
// XLoadable
@@ -715,10 +718,6 @@ private:
SAL_DLLPRIVATE void ListenForStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage );
SAL_DLLPRIVATE OUString GetMediumFilterName_Impl();
- SAL_DLLPRIVATE void impl_store( const OUString& sURL,
- const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ,
- bool bSaveTo ) ;
-
SAL_DLLPRIVATE void postEvent_Impl( const OUString& aName, const css::uno::Reference< css::frame::XController2 >& xController = css::uno::Reference< css::frame::XController2 >() );
SAL_DLLPRIVATE css::uno::Reference< css::frame::XTitle > impl_getTitleHelper ();