diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-03-25 13:28:27 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-03-26 19:09:46 +0100 |
| commit | 41dc917b9b55b8c0c4307ffc58a1fb7257df2b69 (patch) | |
| tree | 52ea7fbb48fd3877c95c4efab76971cc48b27485 /include/svl | |
| parent | cd19a7664a25eda786bb76feefb40ebcbf79a54d (diff) | |
Generate MSO lock files when the related MSO compat. option is set
Added a new compatibility option to the Tools -> Load / Save ->
Microsoft.
When this option is set on the UI or or set in the configuration files
LO generates lock files for MSO supported file formats, similar to
the lock files MSO generates itself.
Change-Id: I2f882723841162add01be9d3f7285a5162a60331
Reviewed-on: https://gerrit.libreoffice.org/69678
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/lockfilecommon.hxx | 2 | ||||
| -rw-r--r-- | include/svl/msodocumentlockfile.hxx | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx index e99ed64d7f36..97210d010279 100644 --- a/include/svl/lockfilecommon.hxx +++ b/include/svl/lockfilecommon.hxx @@ -68,7 +68,7 @@ public: static OUString GetCurrentLocalTime(); static LockFileEntry GenerateOwnEntry(); - INetURLObject ResolveLinks( const INetURLObject& aDocURL ) const; + static INetURLObject ResolveLinks( const INetURLObject& aDocURL ); }; } diff --git a/include/svl/msodocumentlockfile.hxx b/include/svl/msodocumentlockfile.hxx index 5a6753389370..7deed847669f 100644 --- a/include/svl/msodocumentlockfile.hxx +++ b/include/svl/msodocumentlockfile.hxx @@ -55,9 +55,9 @@ class SVL_DLLPUBLIC MSODocumentLockFile : public GenDocumentLockFile private: OUString m_sOrigURL; - bool isWordFormat(const OUString& aOrigURL) const; - bool isExcelFormat(const OUString& aOrigURL) const; - bool isPowerPointFormat(const OUString& aOrigURL) const; + static bool isWordFormat(const OUString& aOrigURL); + static bool isExcelFormat(const OUString& aOrigURL); + static bool isPowerPointFormat(const OUString& aOrigURL); protected: virtual void @@ -74,6 +74,8 @@ public: virtual LockFileEntry GetLockData() override; virtual void RemoveFile() override; + + static bool IsMSOSupportedFileFormat(const OUString& aURL); }; } |