[Libreoffice-commits] core.git: chart2/source
Kohei Yoshida
kohei.yoshida at collabora.com
Mon Jul 21 20:12:52 PDT 2014
chart2/source/controller/inc/LegendItemConverter.hxx | 7 -
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 6 -
chart2/source/controller/main/ChartController.hxx | 2
chart2/source/controller/main/ChartController_Insert.cxx | 2
chart2/source/controller/main/ChartController_Properties.cxx | 43 ++++------
chart2/source/controller/main/ChartController_Tools.cxx | 30 ++----
6 files changed, 36 insertions(+), 54 deletions(-)
New commits:
commit 998ab5c405963accf47afc69a6bf04e045f6f71f
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Mon Jul 21 23:11:49 2014 -0400
More on removing (unreasonable) use of std::auto_ptr.
Change-Id: I98f5fb22eecb7749e4c86e1ce52965b0c73641ca
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index d00a029..26b78a7 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vector>
-#include <memory>
class SdrModel;
@@ -37,7 +36,6 @@ class LegendItemConverter :
public ::comphelper::ItemConverter
{
public:
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
LegendItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -45,9 +43,8 @@ public:
SdrModel& rDrawModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
- ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
- ::std::auto_ptr< ::com::sun::star::awt::Size >() );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ const css::awt::Size* pRefSize = NULL );
+
virtual ~LegendItemConverter();
virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE;
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index a82664a..b60e423 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -40,24 +40,22 @@ namespace chart
namespace wrapper
{
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
LegendItemConverter::LegendItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
- ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize ) :
+ const awt::Size* pRefSize ) :
ItemConverter( rPropertySet, rItemPool )
{
m_aConverters.push_back( new GraphicPropertyItemConverter(
rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::LINE_AND_FILL_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter(
- rPropertySet, rItemPool, pRefSize.get(),
+ rPropertySet, rItemPool, pRefSize,
"ReferencePageSize" ));
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
LegendItemConverter::~LegendItemConverter()
{
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index ee8b60a..a75f863 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -534,7 +534,7 @@ private:
//private methods
bool impl_isDisposedOrSuspended() const;
- ::std::auto_ptr< ReferenceSizeProvider > impl_createReferenceSizeProvider();
+ ReferenceSizeProvider* impl_createReferenceSizeProvider();
void impl_adaptDataSeriesAutoResize();
void impl_createDrawViewController();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 1111bbe..7c83ecc 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -184,7 +184,7 @@ void ChartController::executeDispatch_InsertTitles()
{
// lock controllers till end of block
ControllerLockGuardUNO aCLGuard( getModel() );
- TitleDialogData aDialogOutput( impl_createReferenceSizeProvider().release());
+ TitleDialogData aDialogOutput(impl_createReferenceSizeProvider());
aDlg.getResult( aDialogOutput );
bool bChanged = aDialogOutput.writeDifferenceToModel( getModel(), m_xCC, &aDialogInput );
if( bChanged )
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 32891de..86e51c0 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -69,16 +69,10 @@ using ::com::sun::star::uno::Reference;
namespace
{
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
::comphelper::ItemConverter* createItemConverter(
- const OUString & aObjectCID
- , const uno::Reference< frame::XModel > & xChartModel
- , const uno::Reference< uno::XComponentContext > & xContext
- , SdrModel & rDrawModel
- , ExplicitValueProvider * pExplicitValueProvider = NULL
- , ::std::auto_ptr< ReferenceSizeProvider > pRefSizeProvider =
- ::std::auto_ptr< ReferenceSizeProvider >()
- )
+ const OUString & aObjectCID, const uno::Reference<frame::XModel>& xChartModel,
+ const uno::Reference<uno::XComponentContext>& xContext, SdrModel& rDrawModel,
+ ExplicitValueProvider* pExplicitValueProvider, ReferenceSizeProvider* pRefSizeProvider )
{
::comphelper::ItemConverter* pItemConverter=NULL;
@@ -110,7 +104,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
case OBJECTTYPE_TITLE:
{
boost::scoped_ptr<awt::Size> pRefSize;
- if( pRefSizeProvider.get() )
+ if (pRefSizeProvider)
pRefSize.reset(new awt::Size(pRefSizeProvider->getPageSize()));
pItemConverter = new wrapper::TitleItemConverter(
@@ -121,14 +115,14 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
break;
case OBJECTTYPE_LEGEND:
{
- ::std::auto_ptr< awt::Size > pRefSize;
- if( pRefSizeProvider.get() )
+ boost::scoped_ptr<awt::Size> pRefSize;
+ if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
- pItemConverter = new wrapper::LegendItemConverter( xObjectProperties,
- rDrawModel.GetItemPool(), rDrawModel,
- uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ),
- pRefSize );
+ pItemConverter = new wrapper::LegendItemConverter(
+ xObjectProperties, rDrawModel.GetItemPool(), rDrawModel,
+ uno::Reference<lang::XMultiServiceFactory>(xChartModel, uno::UNO_QUERY),
+ pRefSize.get());
}
break;
case OBJECTTYPE_LEGEND_ENTRY:
@@ -145,7 +139,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
case OBJECTTYPE_AXIS:
{
boost::scoped_ptr<awt::Size> pRefSize;
- if( pRefSizeProvider.get() )
+ if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
uno::Reference< beans::XPropertySet > xDiaProp;
@@ -178,7 +172,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
case OBJECTTYPE_DATA_POINT:
{
boost::scoped_ptr<awt::Size> pRefSize;
- if( pRefSizeProvider.get() )
+ if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
wrapper::GraphicPropertyItemConverter::eGraphicObjectType eMapTo =
@@ -193,6 +187,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
eMapTo = wrapper::GraphicPropertyItemConverter::LINE_DATA_POINT;
bool bDataSeries = ( eObjectType == OBJECTTYPE_DATA_SERIES || eObjectType == OBJECTTYPE_DATA_LABELS );
+ fprintf(stdout, "chart::createItemConverter: data series = %d\n", bDataSeries);
//special color for pie chart:
bool bUseSpecialFillColor = false;
@@ -255,7 +250,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
case OBJECTTYPE_DATA_CURVE_EQUATION:
{
boost::scoped_ptr<awt::Size> pRefSize;
- if( pRefSizeProvider.get() )
+ if (pRefSizeProvider)
pRefSize.reset(new awt::Size(pRefSizeProvider->getPageSize()));
pItemConverter = new wrapper::RegressionEquationItemConverter(
@@ -289,7 +284,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
case OBJECTTYPE_AXIS:
{
boost::scoped_ptr<awt::Size> pRefSize;
- if( pRefSizeProvider.get() )
+ if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
pItemConverter = new wrapper::AllAxisItemConverter(
@@ -309,7 +304,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
}
return pItemConverter;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
OUString lcl_getTitleCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel )
{
@@ -715,14 +709,13 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri
//convert properties to ItemSet
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ReferenceSizeProvider > pRefSizeProv(
- impl_createReferenceSizeProvider());
+ boost::scoped_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
+
::std::auto_ptr< ::comphelper::ItemConverter > apItemConverter(
createItemConverter( rObjectCID, getModel(), m_xCC,
m_pDrawModelWrapper->getSdrModel(),
ExplicitValueProvider::getExplicitValueProvider(m_xChartView),
- pRefSizeProv ));
+ pRefSizeProv.get()));
SAL_WNODEPRECATED_DECLARATIONS_POP
if(!apItemConverter.get())
return bRet;
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 186ec57..d7544c8 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -152,25 +152,19 @@ bool lcl_deleteDataCurve(
} // anonymous namespace
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr< ReferenceSizeProvider > ChartController::impl_createReferenceSizeProvider()
+ReferenceSizeProvider* ChartController::impl_createReferenceSizeProvider()
{
awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
- return ::std::auto_ptr< ReferenceSizeProvider >(
- new ReferenceSizeProvider( aPageSize,
- Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY )));
+ return new ReferenceSizeProvider(
+ aPageSize, Reference<chart2::XChartDocument>(getModel(), uno::UNO_QUERY));
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
void ChartController::impl_adaptDataSeriesAutoResize()
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ReferenceSizeProvider > apRefSizeProvider(
- impl_createReferenceSizeProvider());
- SAL_WNODEPRECATED_DECLARATIONS_POP
- if( apRefSizeProvider.get())
- apRefSizeProvider->setValuesAtAllDataSeries();
+ boost::scoped_ptr<ReferenceSizeProvider> pRefSizeProvider(impl_createReferenceSizeProvider());
+ if (pRefSizeProvider)
+ pRefSizeProvider->setValuesAtAllDataSeries();
}
void ChartController::executeDispatch_NewArrangement()
@@ -243,12 +237,12 @@ void ChartController::executeDispatch_ScaleText()
SCH_RESSTR( STR_ACTION_SCALE_TEXT ),
m_xUndoManager );
ControllerLockGuardUNO aCtlLockGuard( getModel() );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ReferenceSizeProvider > apRefSizeProv( impl_createReferenceSizeProvider());
- SAL_WNODEPRECATED_DECLARATIONS_POP
- OSL_ASSERT( apRefSizeProv.get());
- if( apRefSizeProv.get())
- apRefSizeProv->toggleAutoResizeState();
+
+ boost::scoped_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
+ OSL_ASSERT( pRefSizeProv.get());
+ if (pRefSizeProv)
+ pRefSizeProv->toggleAutoResizeState();
+
aUndoGuard.commit();
}
More information about the Libreoffice-commits
mailing list