summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-04-05 15:12:11 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-04-15 15:40:56 +0200
commitc671094154ecec6f3ba5beea9d26ff0d2d4d86ad (patch)
tree3a7d65d16e9161cc5326235041a35ff3e488e54e /include
parent727bf1bdd516dc826620ea9254de1b0b76805907 (diff)
Introduce text rotation for Impress tables
* Introduce new table property for text rotation * Support only two rotation angle (270° and 90°) * Implement editing and rendering of 270° rotated text (90° rotation was already implemented) Change-Id: Ifc2e0f171e9c840e86b365e9af2c30aa97ecd92e
Diffstat (limited to 'include')
-rw-r--r--include/editeng/charrotateitem.hxx1
-rw-r--r--include/editeng/editeng.hxx3
-rw-r--r--include/editeng/editobj.hxx3
-rw-r--r--include/editeng/outliner.hxx2
-rw-r--r--include/editeng/outlobj.hxx3
-rw-r--r--include/svx/svddef.hxx3
-rw-r--r--include/svx/svdoashp.hxx2
7 files changed, 11 insertions, 6 deletions
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index fec33b5d4944..292712cc6823 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -63,6 +63,7 @@ public:
void SetBottomToTop() { SetValue(900); }
bool IsTopToBottom() const { return 2700 == GetValue(); }
bool IsBottomToTop() const { return 900 == GetValue(); }
+ bool IsVertical() const { return IsTopToBottom() || IsBottomToTop(); }
void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index a8fa950a6805..6b3ba51a6578 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -242,8 +242,9 @@ public:
void SetPaperSize( const Size& rSize );
const Size& GetPaperSize() const;
- void SetVertical( bool bVertical );
+ void SetVertical( bool bVertical, bool bTopToBottom = true );
bool IsVertical() const;
+ bool IsTopToBottom() const;
void SetFixedCellHeight( bool bUseFixedCellHeight );
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index 509954069b09..2833be068fa7 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -86,7 +86,8 @@ public:
void SetUserType( OutlinerMode n );
bool IsVertical() const;
- void SetVertical( bool bVertical );
+ bool IsTopToBottom() const;
+ void SetVertical( bool bVertical, bool bTopToBottom = true);
SvtScriptType GetScriptType() const;
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 665497ed33a3..5d2ce0044517 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -684,7 +684,7 @@ public:
void Init( OutlinerMode nOutlinerMode );
OutlinerMode GetMode() const { return nOutlinerMode; }
- void SetVertical( bool bVertical );
+ void SetVertical( bool bVertical, bool bTopToBottom = true);
bool IsVertical() const;
void SetFixedCellHeight( bool bUseFixedCellHeight );
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index b296d7907376..1477e38d8b5b 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -81,7 +81,8 @@ public:
// vertical access
bool IsVertical() const;
- void SetVertical(bool bNew);
+ bool IsTopToBottom() const;
+ void SetVertical(bool bNew, bool bTopToBottom = true);
// data read access
sal_Int32 Count() const;
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index f3bf1ea8484a..2afa2f94f4b8 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -296,8 +296,9 @@
#define SDRATTR_TABLE_BORDER_INNER (SDRATTR_TABLE_FIRST+1)
#define SDRATTR_TABLE_BORDER_TLBR (SDRATTR_TABLE_FIRST+2)
#define SDRATTR_TABLE_BORDER_BLTR (SDRATTR_TABLE_FIRST+3)
+#define SDRATTR_TABLE_TEXT_ROTATION (SDRATTR_TABLE_FIRST+4)
-#define SDRATTR_TABLE_LAST (SDRATTR_TABLE_BORDER_BLTR)
+#define SDRATTR_TABLE_LAST (SDRATTR_TABLE_TEXT_ROTATION)
#define SDRATTR_END SDRATTR_TABLE_LAST /* 1357 */ /* 1333 V4+++*/ /* 1243 V4+++*/ /*1213*/ /*1085*/ /*1040*/ /*Pool V2: 1123,V1: 1065 */
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 483455aa2d25..dd4d03789c51 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -210,7 +210,7 @@ public:
virtual bool AdjustTextFrameWidthAndHeight() override;
virtual bool IsAutoGrowHeight() const override;
virtual bool IsAutoGrowWidth() const override;
- virtual void SetVerticalWriting( bool bVertical ) override;
+ virtual void SetVerticalWriting(bool bVertical) override;
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override;
virtual void EndTextEdit( SdrOutliner& rOutl ) override;
virtual void TakeTextAnchorRect( tools::Rectangle& rAnchorRect ) const override;