Vertical content alignment of vertical text frames

Change-Id: If365684f8fec5c560e948e3428681462e227dc00

Vertical content alignment of vertical text frames
Change-Id: If365684f8fec5c560e948e3428681462e227dc00
41ad6531 · Zolnai Tamás · 8b4fcb9c · 41ad6531
Kaydet (Commit) 41ad6531 authored Mar 06, 2014 tarafından Zolnai Tamás
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

fly.cxx sw/source/core/layout/fly.cxx +12 -2

No files found.
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1711,11 +1711,21 @@ void SwFlyFrm::MakeContentPos( const SwBorderAttrs &rAttrs )
            {
                if( nAdjust == SDRTEXTVERTADJUST_CENTER )
                {
-                    aNewContentPos.setY(aNewContentPos.getY() + nDiff/2);
+                    if( bVertL2R )
+                        aNewContentPos.setX(aNewContentPos.getX() + nDiff/2);
+                    else if( bVert )
+                        aNewContentPos.setX(aNewContentPos.getX() - nDiff/2);
+                    else
+                        aNewContentPos.setY(aNewContentPos.getY() + nDiff/2);
                }
                else if( nAdjust == SDRTEXTVERTADJUST_BOTTOM )
                {
-                    aNewContentPos.setY(aNewContentPos.getY() + nDiff);
+                    if( bVertL2R )
+                        aNewContentPos.setX(aNewContentPos.getX() + nDiff);
+                    else if( bVert )
+                        aNewContentPos.setX(aNewContentPos.getX() - nDiff);
+                    else
+                        aNewContentPos.setY(aNewContentPos.getY() + nDiff);
                }
            }
        }