diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-05-17 14:43:18 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-05-22 10:31:09 +0200 |
| commit | e0f5f8cd19ae0b14200263cc71b2c73a28cdfa41 (patch) | |
| tree | 73bedfcf4c14c6da75641aaf2c138774111a4e98 /include | |
| parent | 24201323b6f25f62947d5e788e8444993920472c (diff) | |
tdf#100033: Frames with the same name are removed
Allow to have frames with the same name. For removing
real duplicated frames (generated by LO earlier)
check other things also next to the frame name:
position, size or whether the two frames are anchored
to the same position.
Reviewed-on: https://gerrit.libreoffice.org/37702
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 6952d696439981962ad378aa28b0d16ea6e48f0e)
Change-Id: I191ae5128d0228eb85f78f065b44b1f0b3ba6dcf
Reviewed-on: https://gerrit.libreoffice.org/37706
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/txtimp.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index cab9f53653e4..ceedf377d9a2 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -536,6 +536,11 @@ public: GetChapterNumbering() const; bool HasFrameByName( const OUString& rName ) const; + + bool IsDuplicateFrame(const OUString& sName, sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight) const; + void StoreLastImportedFrameName(const OUString& rName); + void ClearLastImportedTextFrameName(); + void ConnectFrameChains( const OUString& rFrmName, const OUString& rNextFrmName, const css::uno::Reference< css::beans::XPropertySet >& rFrmPropSet ); |