chart52: #28670# make the legend within charts resizeable - part 1 - patch from hackfest2010

6 files changed, 79 insertions, 51 deletions

diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 619d308ffad2..18f042fe98df 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -37,6 +37,7 @@
 #include "UndoGuard.hxx"
 #include "Strings.hrc"
 #include "ObjectNameProvider.hxx"
+#include "DiagramHelper.hxx"
 #include "chartview/ExplicitValueProvider.hxx"
 #include "CommonConverters.hxx"
 #include <svx/ActionDescriptionProvider.hxx>
@@ -135,10 +136,12 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize()
     if( pProvider )
         aSelectedSize = ToSize( ( pProvider->getRectangleOfObject( aCID ) ) );
 
+    ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID );
+
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
             ActionDescriptionProvider::POS_SIZE,
-            ObjectNameProvider::getName( ObjectIdentifier::getObjectType( aCID ))),
+            ObjectNameProvider::getName( eObjectType)),
         m_xUndoManager, getModel() );
 
     SfxAbstractTabDialog * pDlg = NULL;
@@ -169,10 +172,18 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize()
                 awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
                 Rectangle aPageRect( 0,0,aPageSize.Width,aPageSize.Height );
 
-                bool bChanged = PositionAndSizeHelper::moveObject( m_aSelection.getSelectedCID()
+
+                bool bChanged = false;
+                if ( eObjectType == OBJECTTYPE_LEGEND && (aSelectedSize.Width != aObjectRect.getWidth()
+                      || aSelectedSize.Height != aObjectRect.getHeight()))
+                            bChanged = DiagramHelper::switchDiagramPositioningToExcludingPositioning( getModel(), false , true );
+
+
+                bool bMoved = PositionAndSizeHelper::moveObject( m_aSelection.getSelectedCID()
                             , getModel()
                             , awt::Rectangle(aObjectRect.getX(),aObjectRect.getY(),aObjectRect.getWidth(),aObjectRect.getHeight())
                             , awt::Rectangle(aPageRect.getX(),aPageRect.getY(),aPageRect.getWidth(),aPageRect.getHeight()) );
+                bChanged = bMoved || bChanged;
                 if( bChanged )
                     aUndoGuard.commitAction();
             }
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 56908ac4ef79..cb32f0a7fb4d 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -868,15 +868,21 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
                         if( !bIsMoveOnly && m_aSelection.isResizeableObjectSelected() )
                             eActionType = ActionDescriptionProvider::RESIZE;
 
+                        ObjectType eObjectType = ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() );
+
                         UndoGuard aUndoGuard(
-                            ActionDescriptionProvider::createDescription(
-                                eActionType,
-                                ObjectNameProvider::getName( ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() ))),
+                            ActionDescriptionProvider::createDescription( eActionType, ObjectNameProvider::getName( eObjectType)),
                             m_xUndoManager, getModel() );
-                        bool bChanged = PositionAndSizeHelper::moveObject( m_aSelection.getSelectedCID()
+
+                        bool bChanged = false;
+                        if ( eObjectType == OBJECTTYPE_LEGEND && eActionType == ActionDescriptionProvider::RESIZE )
+                            bChanged = DiagramHelper::switchDiagramPositioningToExcludingPositioning( getModel(), false , true );
+
+                        bool bMoved = PositionAndSizeHelper::moveObject( m_aSelection.getSelectedCID()
                                         , getModel()
                                         , awt::Rectangle(aObjectRect.getX(),aObjectRect.getY(),aObjectRect.getWidth(),aObjectRect.getHeight())
                                         , awt::Rectangle(aPageRect.getX(),aPageRect.getY(),aPageRect.getWidth(),aPageRect.getHeight()) );
+                        bChanged = bMoved || bChanged;
                         if( bChanged )
                         {
                             bDraggingDone = true;
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index f0ce3eaaa04e..30dfe898866e 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -33,6 +33,7 @@
 #include "ChartModelHelper.hxx"
 #include "ControllerLockGuard.hxx"
 #include <com/sun/star/chart2/LegendPosition.hpp>
+#include <com/sun/star/chart2/LegendExpansion.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart2/RelativeSize.hpp>
 #include "chartview/ExplicitValueProvider.hxx"
@@ -83,51 +84,13 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
     }
     else if(OBJECTTYPE_LEGEND==eObjectType)
     {
-        LegendPosition ePos = LegendPosition_LINE_END;
-        xObjectProp->getPropertyValue( C2U( "AnchorPosition" )) >>= ePos;
+        xObjectProp->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny(LegendPosition(LegendPosition_CUSTOM)));
+        xObjectProp->setPropertyValue( C2U( "Expansion" ), uno::makeAny(LegendExpansion(LegendExpansion_CUSTOM)));
         chart2::RelativePosition aRelativePosition;
+        chart2::RelativeSize aRelativeSize;
         Point aAnchor = aObjectRect.TopLeft();
 
-        switch( ePos )
-        {
-            case LegendPosition_LINE_START:
-                {
-                    //@todo language dependent positions ...
-                    aRelativePosition.Anchor = drawing::Alignment_LEFT;
-                    aAnchor = aObjectRect.LeftCenter();
-                }
-                break;
-            case LegendPosition_LINE_END:
-                {
-                    //@todo language dependent positions ...
-                    aRelativePosition.Anchor = drawing::Alignment_RIGHT;
-                    aAnchor = aObjectRect.RightCenter();
-                }
-                break;
-            case LegendPosition_PAGE_START:
-                {
-                    //@todo language dependent positions ...
-                    aRelativePosition.Anchor = drawing::Alignment_TOP;
-                    aAnchor = aObjectRect.TopCenter();
-                }
-                break;
-            case LegendPosition_PAGE_END:
-                //@todo language dependent positions ...
-                {
-                    aRelativePosition.Anchor = drawing::Alignment_BOTTOM;
-                    aAnchor = aObjectRect.BottomCenter();
-                }
-                break;
-            case LegendPosition_CUSTOM:
-                {
-                    //@todo language dependent positions ...
-                    aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT;
-                }
-                break;
-            case LegendPosition_MAKE_FIXED_SIZE:
-                OSL_ASSERT( false );
-                break;
-        }
+
         aRelativePosition.Primary =
             static_cast< double >( aAnchor.X()) /
             static_cast< double >( aPageRect.getWidth() );
@@ -136,6 +99,19 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
             static_cast< double >( aPageRect.getHeight());
 
         xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) );
+
+        aRelativeSize.Primary =
+            static_cast< double >( aObjectRect.getWidth()) /
+            static_cast< double >( aPageRect.getWidth() );
+        if (aRelativeSize.Primary > 1.0)
+            aRelativeSize.Primary = 1.0;
+        aRelativeSize.Secondary =
+            static_cast< double >( aObjectRect.getHeight()) /
+            static_cast< double >( aPageRect.getHeight());
+        if (aRelativeSize.Secondary > 1.0)
+            aRelativeSize.Secondary = 1.0;
+
+        xObjectProp->setPropertyValue( C2U( "RelativeSize" ), uno::makeAny(aRelativeSize) );
     }
     else if(OBJECTTYPE_DIAGRAM==eObjectType || OBJECTTYPE_DIAGRAM_WALL==eObjectType || OBJECTTYPE_DIAGRAM_FLOOR==eObjectType)
     {
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 567a36473a5b..ac0a871c6d2b 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -309,6 +309,7 @@ bool Selection::isResizeableObjectSelected()
         case OBJECTTYPE_DIAGRAM:
         case OBJECTTYPE_DIAGRAM_WALL:
         case OBJECTTYPE_SHAPE:
+        case OBJECTTYPE_LEGEND:
             return true;
         default:
             return false;
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index c1143ecdf77a..9949f768a642 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart2/LegendExpansion.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
+#include <com/sun/star/chart2/RelativeSize.hpp>
 
 #include <algorithm>
 
@@ -66,7 +67,8 @@ enum
     PROP_LEGEND_PREFERRED_EXPANSION,
     PROP_LEGEND_SHOW,
     PROP_LEGEND_REF_PAGE_SIZE,
-    PROP_LEGEND_REL_POS
+    PROP_LEGEND_REL_POS,
+    PROP_LEGEND_REL_SIZE
 };
 
 void lcl_AddPropertiesToVector(
@@ -105,6 +107,15 @@ void lcl_AddPropertiesToVector(
                   ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
+
+
+    rOutProperties.push_back(
+        Property( C2U( "RelativeSize" ),
+                  PROP_LEGEND_REL_SIZE,
+                  ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)),
+                  beans::PropertyAttribute::BOUND
+                  | beans::PropertyAttribute::MAYBEVOID ));
+
 }
 
 void lcl_AddDefaultsToMap(
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 7101a984ee24..3538bb06f50b 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -707,15 +707,31 @@ void VLegend::createShapes(
             tPropertyValues aLineFillProperties;
             tPropertyValues aTextProperties;
 
+            bool bIsCustomSized = false;
+
             // limit the width of texts to 30% of the total available width
             // #i109336# Improve auto positioning in chart
             sal_Int32 nMaxLabelWidth = rAvailableSpace.Width * 3 / 10;
             Reference< beans::XPropertySet > xLegendProp( m_xLegend, uno::UNO_QUERY );
             LegendExpansion eExpansion = LegendExpansion_HIGH;
+            awt::Size aCustomSize;
+
             if( xLegendProp.is())
             {
                 // get Expansion property
                 xLegendProp->getPropertyValue( C2U( "Expansion" )) >>= eExpansion;
+                bIsCustomSized = (eExpansion == LegendExpansion_CUSTOM);
+                RelativeSize aRelativeSize;
+                if ((xLegendProp->getPropertyValue( C2U( "RelativeSize" )) >>= aRelativeSize))
+                {
+                    aCustomSize.Width = aRelativeSize.Primary * rPageSize.Width;
+                    aCustomSize.Height = aRelativeSize.Secondary * rPageSize.Height;
+                }
+                else
+                {
+                    bIsCustomSized =false;
+                    eExpansion = LegendExpansion_HIGH;
+                }
                 if( eExpansion == LegendExpansion_WIDE )
                 {
                     //#i80377#
@@ -765,8 +781,15 @@ void VLegend::createShapes(
                 , xLegendContainer, m_xShapeFactory, m_xContext
                 , rAvailableSpace, rPageSize, aLegendSize );
 
-            if( xBorder.is())
-                xBorder->setSize( aLegendSize );
+            if( xBorder.is() )
+            {
+                if( bIsCustomSized )
+                {
+                    xBorder->setSize( aCustomSize );
+                }
+                else
+                    xBorder->setSize( aLegendSize );
+            }
         }
     }
     catch( uno::Exception & ex )