diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-09-28 17:46:27 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-09-28 17:46:27 +0200 |
| commit | e3daa3b3aa88ada77d4680a2df9ef534341cb618 (patch) | |
| tree | 0f274ea0334d8e61b7ce9fba97fee7ccde4e2c55 /include | |
| parent | speed-up: preload JVM when PreloadJVM is set (diff) | |
| parent | fix disable qrcodegen option (diff) | |
| download | core-e3daa3b3aa88ada77d4680a2df9ef534341cb618.tar.gz core-e3daa3b3aa88ada77d4680a2df9ef534341cb618.zip | |
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Change-Id: Id89f295a3e669a51da822c09a759165dfc79dc6f
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/filechangedchecker.hxx | 2 | ||||
| -rw-r--r-- | include/unotools/compatibility.hxx | 4 | ||||
| -rw-r--r-- | include/xmloff/txtparae.hxx | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx index ec8d8a41fdac..a1c2fcb38eaa 100644 --- a/include/svtools/filechangedchecker.hxx +++ b/include/svtools/filechangedchecker.hxx @@ -28,7 +28,7 @@ class Timer; class SVT_DLLPUBLIC FileChangedChecker { private: - Idle mIdle; + Timer mTimer; OUString const mFileName; TimeValue mLastModTime; ::std::function<void ()> const mpCallback; diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index 24f2da53e590..812b8cc480bd 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -62,6 +62,10 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry MsWordTrailingBlanks, SubtractFlysAnchoredAtFlys, EmptyDbFieldHidesPara, + /// special entry: optcomp.cxx converts the other values to + /// integers but not this one because it doesn't have its own + /// checkbox, so keep it at the end! + AddTableLineSpacing, /* Should be at the end. Do not remove it. */ INVALID diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 7ded21114fd6..c01c03eea4d3 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -365,6 +365,8 @@ protected: const css::uno::Reference< css::beans::XPropertySet> & i_xPortion, bool i_bAutoStyles, bool i_isProgress, bool & rPrevCharIsSpace); + bool isAutoStylesCollected() const { return mbCollected; } + virtual void exportTableAutoStyles(); public: |