From 2670760550608c3f51bb01eb7b86c33461e2e5c8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 Dec 2016 11:51:01 +0200 Subject: 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 Reviewed-by: Miklos Vajna (cherry picked from commit d36aa2ba3132ce62a370b7260ca620642cbf7dbf) Reviewed-on: https://gerrit.libreoffice.org/31746 Tested-by: Jenkins Reviewed-by: Andras Timar (cherry picked from commit a7d13674bc2271e6f191e8ecda78151a47d413f6) Change-Id: I56cce69ddb21f7f9336b8f59e181e91306e92019 Reviewed-on: https://gerrit.libreoffice.org/31896 Tested-by: Jenkins Reviewed-by: Andras Timar --- include/svx/sdtaitm.hxx | 1 + include/svx/svdotable.hxx | 1 + 2 files changed, 2 insertions(+) (limited to 'include') 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; -- cgit