[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/inc oox/source

[Muthu Subramanian]

 oox/inc/oox/drawingml/customshapeproperties.hxx |    2 +-
 oox/source/drawingml/customshapeproperties.cxx  |    5 ++---
 oox/source/drawingml/shape.cxx                  |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 3243987ae5bc5b78809f554222fc3ee6b36f1a16
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Mon Oct 7 19:19:10 2013 +0530

    n#819614: Fix for lines running off screens.

diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx
index ec41bb1..e389633 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/oox/inc/oox/drawingml/customshapeproperties.hxx
@@ -130,7 +130,7 @@ public:
 
     void pushToPropSet( const ::oox::core::FilterBase& rFilterBase,
             const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
-                        const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape);
+                        const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape, const ::com::sun::star::awt::Size &aSize );
 
     sal_Int32 getShapePresetType() const { return mnShapePresetType; }
     ::rtl::OUString getShapePresetTypeName() const;
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 9811502..598bb3f 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -111,7 +111,7 @@ static OUString GetConnectorShapeType( sal_Int32 nType )
 
 
 void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFilterBase */,
-    const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape )
+    const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape, const awt::Size &aSize )
 {
     if ( mnShapePresetType >= 0 )
     {
@@ -216,8 +216,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
         aPropertyMap[ PROP_Type ] <<= CREATE_OUSTRING( "ooxml-non-primitive" );
         aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX );
         aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY );
-        awt::Size aSize;
-        awt::Rectangle aViewBox( 0, 0, aSize.Width * 360, aSize.Height * 360 );
+        awt::Rectangle aViewBox( 0, 0, aSize.Width, aSize.Height );
         aPropertyMap[ PROP_ViewBox ] <<= aViewBox;
 
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjustmentValues( maAdjustmentGuideList.size() );
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2e460d3..5cd059b 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -580,7 +580,7 @@ Reference< XShape > Shape::createAndInsert(
             }
 
             SAL_INFO("oox", "==cscode== shape name: '" << msName << "'");
-            mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape );
+            mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape, maSize );
         }
         else if( getTextBody() )
             getTextBody()->getTextProperties().pushVertSimulation();