From f0a13fa4339ee940f267fb8787d6137b148abec9 Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Tue, 5 Oct 2010 11:10:54 +0200 Subject: chart49: #i113103# prevent deadlock caused by mixed mutex locking order wiht static variable initialization --- chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx (limited to 'chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx') diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx old mode 100644 new mode 100755 -- cgit From 9f5af964256e4e6a98fc85b18e9dd477e012995e Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Wed, 6 Oct 2010 14:12:36 +0200 Subject: chart49: cleanup --- chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx') diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 16ddb1137d4a..f58f4aeefd14 100755 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -197,7 +197,6 @@ enum //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -//static void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( @@ -226,7 +225,6 @@ void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutPro //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -//static void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { -- cgit From b2f916eaf3425088cfcfe06c8dfcd5aae30aa7b7 Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Thu, 7 Oct 2010 18:24:57 +0200 Subject: chart49: #i113572# save data points order 2 correctly for b-splines --- chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx') diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index f58f4aeefd14..6890e06a1641 100755 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -229,7 +229,7 @@ void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { rList.push_back( new WrappedSplineTypeProperty( spChart2ModelContact ) ); - rList.push_back( new WrappedSplineProperty( C2U("SplineOrder"), C2U("SplineOrder"), uno::makeAny(sal_Int32(2)), spChart2ModelContact ) ); + rList.push_back( new WrappedSplineProperty( C2U("SplineOrder"), C2U("SplineOrder"), uno::makeAny(sal_Int32(3)), spChart2ModelContact ) ); rList.push_back( new WrappedSplineProperty( C2U("SplineResolution"), C2U("CurveResolution"), uno::makeAny(sal_Int32(20)), spChart2ModelContact ) ); } -- cgit