diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 11:51:01 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-12-12 20:38:24 +0000 |
| commit | 2670760550608c3f51bb01eb7b86c33461e2e5c8 (patch) | |
| tree | 8a6d86981370bd7c0726f73574e32cdba9089cb8 /include | |
| parent | 104a31ea86ed3270ee5392bb09a66b4e063acb69 (diff) | |
tdf#104405 Clone Formatting ignores vertical text alignment
I removed the unit test, since it depends on some other changes to the
dumpAsXml code that are not in this branch.
Reviewed-on: https://gerrit.libreoffice.org/31623
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit d36aa2ba3132ce62a370b7260ca620642cbf7dbf)
Reviewed-on: https://gerrit.libreoffice.org/31746
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit a7d13674bc2271e6f191e8ecda78151a47d413f6)
Change-Id: I56cce69ddb21f7f9336b8f59e181e91306e92019
Reviewed-on: https://gerrit.libreoffice.org/31896
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sdtaitm.hxx | 1 | ||||
| -rw-r--r-- | include/svx/svdotable.hxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 590df23ce2ce..fc20689c1e8e 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -48,6 +48,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index b0e0c5c16d4c..ac29effd8a0e 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -141,6 +141,7 @@ public: void getCellBounds( const sdr::table::CellPos& rPos, ::Rectangle& rCellRect ); const SfxItemSet& GetActiveCellItemSet() const; + void SetMergedItemSetAndBroadcastOnActiveCell(const SfxItemSet& rSet, bool bClearAllItems); void setTableStyle( const css::uno::Reference< css::container::XIndexAccess >& xAutoFormatStyle ); const css::uno::Reference< css::container::XIndexAccess >& getTableStyle() const; |