summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-05 11:51:01 +0200
committerAndras Timar <andras.timar@collabora.com>2016-12-08 10:36:43 +0000
commita7d13674bc2271e6f191e8ecda78151a47d413f6 (patch)
tree4a0536079ae887cf8178bc65098f036c89d63bba /include
parenta1f6159db30e2463b118c1571bb01a09356b7c49 (diff)
tdf#104405 Clone Formatting ignores vertical text alignment
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) Change-Id: I56cce69ddb21f7f9336b8f59e181e91306e92019 Reviewed-on: https://gerrit.libreoffice.org/31746 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'include')
-rw-r--r--include/svx/sdtaitm.hxx1
-rw-r--r--include/svx/svdotable.hxx1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index e25259de9072..9c59352de964 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, MapUnit eCoreMetric, MapUnit 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 c7fb16cabefe..3de0a341246a 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;