summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-11-26 18:37:38 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2019-11-27 09:32:42 +0100
commit653b53287ca09a9ffe3f5ce0242919e719c1086c (patch)
tree83a3de8a5940e122be51dcebe0aa6cefef028ab5 /sd/source/ui/func
parentb919f246977a4a048419ba6129d411d30d37013e (diff)
Better handling of text rotation attribute.
We need to have a separate attribute for vertical option and for rotation option. So rotation won't be lost by setting the text direction. So I added a rotation member variable and use that as an orthogonal variable to the vertical text direction. A follow-up fix for tdf#100926. The problem was that the rotation was imported / exported correctly from/in ODP, but the text was not displayed as rotated. Change-Id: Icddc0689f06fdcd52df6dc911e02a9a948c42654 Reviewed-on: https://gerrit.libreoffice.org/83809 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/futext.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 3d5abb848bc8..30aa80e08164 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1078,7 +1078,10 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag)
{
OutlinerParaObject* pOPO = pTextObj->GetOutlinerParaObject();
if( pOPO && pOPO->IsVertical() )
- pOutl->SetVertical( true, pOPO->IsTopToBottom());
+ {
+ pOutl->SetVertical(pOPO->GetDirectVertical());
+ pOutl->SetRotation(pOPO->GetRotation());
+ }
else if (nSlotId == SID_ATTR_CHAR_VERTICAL || nSlotId == SID_TEXT_FITTOSIZE_VERTICAL)
pOutl->SetVertical( true );