diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-03-26 16:12:49 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-03-27 10:01:33 +0100 |
| commit | ad47e9b1c0d3f1720665b2786090e8c0927b5b45 (patch) | |
| tree | c36ae294d606e935ec1716b07deea622a743986f /include | |
| parent | f1e52cbdd4a9753a9b9d562ef280a00e52db1dae (diff) | |
MSO lockfiles: Deduplicate MSO lock file reading code
The removed code was extracted to MSODocumentLockFile class
so use that class here too.
Use openStreamNoLock() for reading MSO lockfiles, because otherwise
we can not read lock files written by MSO.
Change-Id: Ib31cb9f3783d0b0ce784f900821047b9d32156f2
Reviewed-on: https://gerrit.libreoffice.org/69759
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/documentlockfile.hxx | 2 | ||||
| -rw-r--r-- | include/svl/msodocumentlockfile.hxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx index 87334e4b73e7..79bb087c8362 100644 --- a/include/svl/documentlockfile.hxx +++ b/include/svl/documentlockfile.hxx @@ -50,7 +50,7 @@ public: protected: virtual void WriteEntryToStream( const LockFileEntry& aEntry, const css::uno::Reference< css::io::XOutputStream >& xStream ) = 0; - css::uno::Reference< css::io::XInputStream > OpenStream(); + virtual css::uno::Reference< css::io::XInputStream > OpenStream(); }; /// Class implementing reading and writing LO lockfiles. diff --git a/include/svl/msodocumentlockfile.hxx b/include/svl/msodocumentlockfile.hxx index 7deed847669f..cd0db0ffb6d9 100644 --- a/include/svl/msodocumentlockfile.hxx +++ b/include/svl/msodocumentlockfile.hxx @@ -64,6 +64,8 @@ protected: WriteEntryToStream(const LockFileEntry& aEntry, const css::uno::Reference<css::io::XOutputStream>& xStream) override; + virtual css::uno::Reference<css::io::XInputStream> OpenStream() override; + public: MSODocumentLockFile(const OUString& aOrigURL); virtual ~MSODocumentLockFile() override; |