[Libreoffice-commits] core.git: chart2/source

[Stephan Bergmann]

 chart2/source/view/main/ChartView.cxx |   32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

New commits:
commit b7a46a22b6a0a5429adec015255ce76e41dced41
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Aug 6 15:40:42 2014 +0200

    Revert "bnc#886540: Let's not push the available area down when no titles are there."
    
    This reverts commit b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7:  "Aug 06 10:11:53
    <sberg> moggi, b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7 broke
    CppunitTest_chart2_xshape, very many attributes in
    chart2/qa/extras/xshape/data/reference/fdo75075.xml have wrong values now;
    what's the best way to fix? manually fixing fdo75075.xml (assuming the new
    values are even correct?) looks /very/ tedious.  better revert the commit for
    now?"

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 902705b..9086abc 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2301,7 +2301,37 @@ boost::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
                 break;
         }
     }
-
+    else
+    {
+        // #i109336# Improve auto positioning in chart
+        switch ( eAlignment )
+        {
+            case ALIGN_TOP:
+                {
+                    rRemainingSpace.Y += nYDistance;
+                    rRemainingSpace.Height -= nYDistance;
+                }
+                break;
+            case ALIGN_BOTTOM:
+                {
+                    rRemainingSpace.Height -= nYDistance;
+                }
+                break;
+            case ALIGN_LEFT:
+                {
+                    rRemainingSpace.X += nXDistance;
+                    rRemainingSpace.Width -= nXDistance;
+                }
+                break;
+            case ALIGN_RIGHT:
+                {
+                    rRemainingSpace.Width -= nXDistance;
+                }
+                break;
+            default:
+                break;
+        }
+    }
     return apVTitle;
 }