Skip to content

C
core
Kaydet (Commit) 9e970303 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Remove auto_ptr from CharacterPropertyItemConverter. 

And adjust all that's necessary.

Change-Id: I121e5aa4d117da2e5e6b11e4fd85960a8b3aa727
üst b2ffa40c
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 300 deletions
chart2/source/controller/inc/AxisItemConverter.hxx
Dosyayı görüntüle @ 9e970303
......@@ -27,31 +27,22 @@
#include "ItemConverter.hxx"
#include <vector>
#include <memory>
class SdrModel;
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
class AxisItemConverter : public ::comphelper::ItemConverter
class AxisItemConverter : public comphelper::ItemConverter
{
public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
AxisItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDoc,
ExplicitScaleData * pScale = NULL,
ExplicitIncrementData * pIncrement = NULL,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >() );
SAL_WNODEPRECATED_DECLARATIONS_POP
const css::uno::Reference<css::beans::XPropertySet>& rPropertySet,
SfxItemPool& rItemPool, SdrModel& rDrawModel,
const css::uno::Reference<css::chart2::XChartDocument> & xChartDoc,
ExplicitScaleData* pScale = NULL,
ExplicitIncrementData* pIncrement = NULL,
const css::awt::Size* pRefSize = NULL );
virtual ~AxisItemConverter();
virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE;
......@@ -62,26 +53,24 @@ protected:
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE;
virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
throw( css::uno::Exception ) SAL_OVERRIDE;
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
throw( css::uno::Exception ) SAL_OVERRIDE;
private:
::std::vector< ItemConverter * > m_aConverters;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis > m_xAxis;
css::uno::Reference<
css::chart2::XAxis > m_xAxis;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > m_xChartDoc;
css::uno::Reference<
css::chart2::XChartDocument > m_xChartDoc;
ExplicitScaleData* m_pExplicitScale;
ExplicitIncrementData* m_pExplicitIncrement;
};
} // namespace wrapper
} // namespace chart
}}
// INCLUDED_CHART2_SOURCE_CONTROLLER_INC_AXISITEMCONVERTER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
Dosyayı görüntüle @ 9e970303
......@@ -24,59 +24,44 @@
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <memory>
#include <boost/optional.hpp>
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
class CharacterPropertyItemConverter :
public ::comphelper::ItemConverter
class CharacterPropertyItemConverter : public comphelper::ItemConverter
{
public:
CharacterPropertyItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
const css::uno::Reference<css::beans::XPropertySet>& rPropertySet,
SfxItemPool& rItemPool );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
CharacterPropertyItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
const css::uno::Reference<css::beans::XPropertySet>& rPropertySet,
SfxItemPool& rItemPool,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize,
const css::awt::Size* pRefSize,
const OUString & rRefSizePropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rRefSizePropSet =
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() );
SAL_WNODEPRECATED_DECLARATIONS_POP
const css::uno::Reference<css::beans::XPropertySet>& rRefSizePropSet = css::uno::Reference<css::beans::XPropertySet>() );
virtual ~CharacterPropertyItemConverter();
protected:
virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE;
virtual const sal_uInt16* GetWhichPairs() const SAL_OVERRIDE;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE;
virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
throw (css::uno::Exception) SAL_OVERRIDE;
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
throw (css::uno::Exception) SAL_OVERRIDE;
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > GetRefSizePropertySet() const { return m_xRefSizePropSet;}
css::uno::Reference<css::beans::XPropertySet> GetRefSizePropertySet() const;
private:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::com::sun::star::awt::Size > m_pRefSize;
SAL_WNODEPRECATED_DECLARATIONS_POP
OUString m_aRefSizePropertyName;
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > m_xRefSizePropSet;
OUString m_aRefSizePropertyName;
css::uno::Reference<css::beans::XPropertySet> m_xRefSizePropSet;
boost::optional<css::awt::Size> m_pRefSize;
};
} // namespace wrapper
} // namespace chart
}}
// INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CHARACTERPROPERTYITEMCONVERTER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/inc/DataPointItemConverter.hxx
Dosyayı görüntüle @ 9e970303
......@@ -27,45 +27,32 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <memory>
#include <vector>
class SdrModel;
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
class DataPointItemConverter :
public ::comphelper::ItemConverter
class DataPointItemConverter : public comphelper::ItemConverter
{
public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
DataPointItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > & xContext,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > & xSeries,
const css::uno::Reference<css::frame::XModel>& xChartModel,
const css::uno::Reference<css::uno::XComponentContext>& xContext,
const css::uno::Reference<css::beans::XPropertySet>& rPropertySet,
const css::uno::Reference<css::chart2::XDataSeries>& xSeries,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::eGraphicObjectType eMapTo =
GraphicPropertyItemConverter::FILLED_DATA_POINT,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >(),
const css::awt::Size* pRefSize = NULL,
bool bDataSeries = false,
bool bUseSpecialFillColor = false,
sal_Int32 nSpecialFillColor = 0,
bool bOverwriteLabelsForAttributedDataPointsAlso=false,
sal_Int32 nNumberFormat=0,
sal_Int32 nPercentNumberFormat=0);
SAL_WNODEPRECATED_DECLARATIONS_POP
bool bOverwriteLabelsForAttributedDataPointsAlso = false,
sal_Int32 nNumberFormat = 0,
sal_Int32 nPercentNumberFormat = 0 );
virtual ~DataPointItemConverter();
......@@ -77,9 +64,9 @@ protected:
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE;
virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
throw (css::uno::Exception) SAL_OVERRIDE;
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
throw (css::uno::Exception) SAL_OVERRIDE;
private:
::std::vector< ItemConverter * > m_aConverters;
......@@ -89,14 +76,12 @@ private:
sal_Int32 m_nSpecialFillColor;
sal_Int32 m_nNumberFormat;
sal_Int32 m_nPercentNumberFormat;
::com::sun::star::uno::Sequence< sal_Int32 > m_aAvailableLabelPlacements;
css::uno::Sequence<sal_Int32> m_aAvailableLabelPlacements;
bool m_bForbidPercentValue;
};
} // namespace wrapper
} // namespace chart
}}
// INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DATAPOINTITEMCONVERTER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/inc/MultipleChartConverters.hxx
Dosyayı görüntüle @ 9e970303
......@@ -23,29 +23,20 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <memory>
class SdrModel;
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
class AllAxisItemConverter : public ::comphelper::MultipleItemConverter
{
public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllAxisItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
const css::uno::Reference<css::frame::XModel> & xChartModel,
SfxItemPool& rItemPool,
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::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
const css::awt::Size* pRefSize = NULL );
virtual ~AllAxisItemConverter();
protected:
......@@ -56,12 +47,10 @@ class AllGridItemConverter : public ::comphelper::MultipleItemConverter
{
public:
AllGridItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
const css::uno::Reference<css::frame::XModel>& xChartModel,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory );
const css::uno::Reference<css::lang::XMultiServiceFactory> & xNamedPropertyContainerFactory );
virtual ~AllGridItemConverter();
protected:
......@@ -71,17 +60,13 @@ protected:
class AllDataLabelItemConverter : public ::comphelper::MultipleItemConverter
{
public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllDataLabelItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
const css::uno::Reference<css::frame::XModel>& xChartModel,
SfxItemPool& rItemPool,
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::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
const css::awt::Size* pRefSize = NULL );
virtual ~AllDataLabelItemConverter();
protected:
......@@ -91,17 +76,12 @@ protected:
class AllTitleItemConverter : public ::comphelper::MultipleItemConverter
{
public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllTitleItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
SfxItemPool& rItemPool,
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::uno::Reference<css::frame::XModel>& xChartModel,
SfxItemPool& rItemPool, SdrModel& rDrawModel,
const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
const css::awt::Size* pRefSize = NULL );
virtual ~AllTitleItemConverter();
protected:
......@@ -112,9 +92,7 @@ class AllSeriesStatisticsConverter : public ::comphelper::MultipleItemConverter
{
public:
AllSeriesStatisticsConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
SfxItemPool& rItemPool );
const css::uno::Reference<css::frame::XModel>& xChartModel, SfxItemPool& rItemPool );
virtual ~AllSeriesStatisticsConverter();
protected:
......
chart2/source/controller/inc/RegressionEquationItemConverter.hxx
Dosyayı görüntüle @ 9e970303
......@@ -26,21 +26,15 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <memory>
#include <vector>
class SdrModel;
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
class RegressionEquationItemConverter :
public ::comphelper::ItemConverter
class RegressionEquationItemConverter : public comphelper::ItemConverter
{
public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
RegressionEquationItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
......@@ -48,9 +42,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 ~RegressionEquationItemConverter();
virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE;
......@@ -69,10 +62,8 @@ private:
::std::vector< ItemConverter * > m_aConverters;
};
} // namespace wrapper
} // namespace chart
}}
// INCLUDED_CHART2_SOURCE_CONTROLLER_INC_REGRESSIONEQUATIONITEMCONVERTER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/inc/TitleItemConverter.hxx
Dosyayı görüntüle @ 9e970303
......@@ -24,30 +24,19 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vector>
#include <memory>
class SdrModel;
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
class TitleItemConverter :
public ::comphelper::ItemConverter
class TitleItemConverter : public comphelper::ItemConverter
{
public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
TitleItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
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::uno::Reference<css::beans::XPropertySet>& rPropertySet,
SfxItemPool& rItemPool, SdrModel& rDrawModel,
const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
const css::awt::Size* pRefSize = NULL );
virtual ~TitleItemConverter();
......@@ -59,18 +48,16 @@ protected:
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE;
virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
throw (css::uno::Exception) SAL_OVERRIDE;
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
throw (css::uno::Exception) SAL_OVERRIDE;
private:
::std::vector< ItemConverter * > m_aConverters;
};
} // namespace wrapper
} // namespace chart
}}
// INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TITLEITEMCONVERTER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
Dosyayı görüntüle @ 9e970303
......@@ -70,12 +70,8 @@ namespace
};
} // anonymous namespace
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
SAL_WNODEPRECATED_DECLARATIONS_PUSH
AxisItemConverter::AxisItemConverter(
const Reference< beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
......@@ -83,7 +79,7 @@ AxisItemConverter::AxisItemConverter(
const Reference< chart2::XChartDocument > & xChartDoc,
::chart::ExplicitScaleData * pScale /* = NULL */,
::chart::ExplicitIncrementData * pIncrement /* = NULL */,
::std::auto_ptr< awt::Size > pRefSize /* = NULL */ ) :
const awt::Size* pRefSize ) :
ItemConverter( rPropertySet, rItemPool ),
m_xChartDoc( xChartDoc ),
m_pExplicitScale( NULL ),
......@@ -100,13 +96,12 @@ AxisItemConverter::AxisItemConverter(
rPropertySet, rItemPool, rDrawModel,
xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::LINE_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
"ReferencePageSize" ));
m_aConverters.push_back(
new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) );
OSL_ASSERT( m_xAxis.is());
}
SAL_WNODEPRECATED_DECLARATIONS_POP
AxisItemConverter::~AxisItemConverter()
{
......@@ -993,7 +988,6 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
return (bSetScale || bChangedOtherwise);
}
} // namespace wrapper
} // namespace chart
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
Dosyayı görüntüle @ 9e970303
......@@ -64,10 +64,7 @@ namespace
}
} // anonymous namespace
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
CharacterPropertyItemConverter::CharacterPropertyItemConverter(
const uno::Reference< beans::XPropertySet > & rPropertySet,
......@@ -75,19 +72,19 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
ItemConverter( rPropertySet, rItemPool )
{}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
CharacterPropertyItemConverter::CharacterPropertyItemConverter(
const uno::Reference< beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
::std::auto_ptr< awt::Size > pRefSize,
const awt::Size* pRefSize,
const OUString & rRefSizePropertyName,
const uno::Reference< beans::XPropertySet > & rRefSizePropSet ) :
ItemConverter( rPropertySet, rItemPool ),
m_pRefSize( pRefSize ),
m_aRefSizePropertyName( rRefSizePropertyName ),
m_xRefSizePropSet( rRefSizePropSet.is() ? rRefSizePropSet : rPropertySet )
{}
SAL_WNODEPRECATED_DECLARATIONS_POP
{
if (pRefSize)
m_pRefSize.reset(*pRefSize);
}
CharacterPropertyItemConverter::~CharacterPropertyItemConverter()
{}
......@@ -268,7 +265,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
float fHeight;
if( aValue >>= fHeight )
{
if( m_pRefSize.get())
if (m_pRefSize)
{
awt::Size aOldRefSize;
if( GetRefSizePropertySet()->getPropertyValue( m_aRefSizePropertyName ) >>= aOldRefSize )
......@@ -518,7 +515,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
bSetValue = true;
else
{
if( m_pRefSize.get() )
if (m_pRefSize)
{
awt::Size aNewRefSize = *m_pRefSize;
awt::Size aOldRefSize;
......@@ -533,11 +530,10 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( bSetValue )
{
// set new reference size only if there was a reference size before (auto-scaling on)
if( m_pRefSize.get() &&
GetRefSizePropertySet()->getPropertyValue( m_aRefSizePropertyName ).hasValue())
if (m_pRefSize && GetRefSizePropertySet()->getPropertyValue( m_aRefSizePropertyName ).hasValue())
{
GetRefSizePropertySet()->setPropertyValue( m_aRefSizePropertyName,
uno::makeAny( *m_pRefSize ));
GetRefSizePropertySet()->setPropertyValue(
m_aRefSizePropertyName, uno::makeAny(*m_pRefSize));
}
GetPropertySet()->setPropertyValue( "CharHeight" + aPostfix, aValue );
......@@ -556,7 +552,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
return bChanged;
}
} // namespace wrapper
} // namespace chart
uno::Reference<beans::XPropertySet> CharacterPropertyItemConverter::GetRefSizePropertySet() const
{
return m_xRefSizePropSet;
}
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
Dosyayı görüntüle @ 9e970303
......@@ -190,12 +190,8 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxIte
} // anonymous namespace
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
SAL_WNODEPRECATED_DECLARATIONS_PUSH
DataPointItemConverter::DataPointItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
const uno::Reference< uno::XComponentContext > & xContext,
......@@ -203,16 +199,15 @@ DataPointItemConverter::DataPointItemConverter(
const uno::Reference< XDataSeries > & xSeries,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::eGraphicObjectType eMapTo /* = FILL_PROPERTIES */,
::std::auto_ptr< awt::Size > pRefSize /* = NULL */,
bool bDataSeries /* = false */,
bool bUseSpecialFillColor /* = false */,
sal_Int32 nSpecialFillColor /* =0 */,
bool bOverwriteLabelsForAttributedDataPointsAlso /*false*/,
const uno::Reference<lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::eGraphicObjectType eMapTo,
const awt::Size* pRefSize,
bool bDataSeries,
bool bUseSpecialFillColor,
sal_Int32 nSpecialFillColor,
bool bOverwriteLabelsForAttributedDataPointsAlso,
sal_Int32 nNumberFormat,
sal_Int32 nPercentNumberFormat
) :
sal_Int32 nPercentNumberFormat ) :
ItemConverter( rPropertySet, rItemPool ),
m_bDataSeries( bDataSeries ),
m_bOverwriteLabelsForAttributedDataPointsAlso(m_bDataSeries && bOverwriteLabelsForAttributedDataPointsAlso),
......@@ -225,7 +220,7 @@ DataPointItemConverter::DataPointItemConverter(
{
m_aConverters.push_back( new GraphicPropertyItemConverter(
rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, eMapTo ));
m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
m_aConverters.push_back( new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
if( bDataSeries )
{
m_aConverters.push_back( new StatisticsItemConverter( xChartModel, rPropertySet, rItemPool ));
......@@ -241,7 +236,6 @@ DataPointItemConverter::DataPointItemConverter(
m_bForbidPercentValue = AxisType::CATEGORY != ChartTypeHelper::getAxisType( xChartType, 0 );
}
SAL_WNODEPRECATED_DECLARATIONS_POP
DataPointItemConverter::~DataPointItemConverter()
{
......@@ -674,7 +668,6 @@ void DataPointItemConverter::FillSpecialItem(
}
}
} // namespace wrapper
} // namespace chart
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
Dosyayı görüntüle @ 9e970303
......@@ -54,7 +54,7 @@ LegendItemConverter::LegendItemConverter(
rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::LINE_AND_FILL_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter(
rPropertySet, rItemPool, pRefSize,
rPropertySet, rItemPool, pRefSize.get(),
"ReferencePageSize" ));
}
SAL_WNODEPRECATED_DECLARATIONS_POP
......
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
Dosyayı görüntüle @ 9e970303
......@@ -32,23 +32,21 @@
#include "chartview/ExplicitValueProvider.hxx"
#include "DiagramHelper.hxx"
#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllAxisItemConverter::AllAxisItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
const uno::Reference< lang::XMultiServiceFactory > & /*xNamedPropertyContainerFactory*/,
::std::auto_ptr< awt::Size > pRefSize )
const awt::Size* pRefSize )
: MultipleItemConverter( rItemPool )
{
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
......@@ -56,18 +54,12 @@ AllAxisItemConverter::AllAxisItemConverter(
for( sal_Int32 nA = 0; nA < aElementList.getLength(); nA++ )
{
uno::Reference< beans::XPropertySet > xObjectProperties(aElementList[nA], uno::UNO_QUERY);
if( pRefSize.get())
m_aConverters.push_back( new ::chart::wrapper::AxisItemConverter(
xObjectProperties, rItemPool, rDrawModel,
uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ), 0, 0,
::std::auto_ptr< awt::Size >( new awt::Size( *pRefSize )) ));
else
m_aConverters.push_back( new ::chart::wrapper::AxisItemConverter(
xObjectProperties, rItemPool, rDrawModel,
uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ), 0, 0 ) );
m_aConverters.push_back( new ::chart::wrapper::AxisItemConverter(
xObjectProperties, rItemPool, rDrawModel,
uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ), 0, 0,
pRefSize));
}
}
SAL_WNODEPRECATED_DECLARATIONS_POP
AllAxisItemConverter::~AllAxisItemConverter()
{
......@@ -107,13 +99,12 @@ const sal_uInt16 * AllGridItemConverter::GetWhichPairs() const
return nGridWhichPairs;
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllDataLabelItemConverter::AllDataLabelItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
::std::auto_ptr< awt::Size > pRefSize )
const awt::Size* pRefSize )
: MultipleItemConverter( rItemPool )
{
::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
......@@ -129,21 +120,13 @@ AllDataLabelItemConverter::AllDataLabelItemConverter(
sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel(
xObjectProperties,uno::Reference< util::XNumberFormatsSupplier >(xChartModel, uno::UNO_QUERY));
m_aConverters.push_back( new ::chart::wrapper::DataPointItemConverter(
xChartModel, xContext,
xObjectProperties, *aIt, rItemPool, rDrawModel,
xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::FILLED_DATA_POINT,
::std::auto_ptr< awt::Size >( pRefSize.get() ? new awt::Size( *pRefSize ) : 0),
true, /*bDataSeries*/
false, /*bUseSpecialFillColor*/
0, /*nSpecialFillColor*/
true /*bOverwriteLabelsForAttributedDataPointsAlso*/,
nNumberFormat, nPercentNumberFormat
));
m_aConverters.push_back(
new ::chart::wrapper::DataPointItemConverter(
xChartModel, xContext, xObjectProperties, *aIt, rItemPool, rDrawModel,
xNamedPropertyContainerFactory, GraphicPropertyItemConverter::FILLED_DATA_POINT,
pRefSize, true, false, 0, true, nNumberFormat, nPercentNumberFormat));
}
}
SAL_WNODEPRECATED_DECLARATIONS_POP
AllDataLabelItemConverter::~AllDataLabelItemConverter()
{
......@@ -155,13 +138,12 @@ const sal_uInt16 * AllDataLabelItemConverter::GetWhichPairs() const
return nDataLabelWhichPairs;
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllTitleItemConverter::AllTitleItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
::std::auto_ptr< awt::Size > pRefSize )
const awt::Size* pRefSize )
: MultipleItemConverter( rItemPool )
{
for(sal_Int32 nTitle = TitleHelper::TITLE_BEGIN; nTitle < TitleHelper::NORMAL_TITLE_END; nTitle++ )
......@@ -170,14 +152,11 @@ AllTitleItemConverter::AllTitleItemConverter(
if(!xTitle.is())
continue;
uno::Reference< beans::XPropertySet > xObjectProperties( xTitle, uno::UNO_QUERY);
::std::auto_ptr< awt::Size > pSingleRefSize(0);
if( pRefSize.get())
pSingleRefSize = ::std::auto_ptr< awt::Size >( new awt::Size( *pRefSize ));
m_aConverters.push_back( new ::chart::wrapper::TitleItemConverter(
xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, pSingleRefSize ));
m_aConverters.push_back(
new ::chart::wrapper::TitleItemConverter(
xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, pRefSize));
}
}
SAL_WNODEPRECATED_DECLARATIONS_POP
AllTitleItemConverter::~AllTitleItemConverter()
{
......@@ -215,7 +194,6 @@ const sal_uInt16 * AllSeriesStatisticsConverter::GetWhichPairs() const
return nStatWhichPairs;
}
} // namespace wrapper
} // namespace chart
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
Dosyayı görüntüle @ 9e970303
......@@ -44,19 +44,15 @@ namespace
};
} // anonymous namespace
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
SAL_WNODEPRECATED_DECLARATIONS_PUSH
RegressionEquationItemConverter::RegressionEquationItemConverter(
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(
......@@ -64,10 +60,9 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::LINE_AND_FILL_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter(
rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
m_aConverters.push_back(
new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
}
SAL_WNODEPRECATED_DECLARATIONS_POP
RegressionEquationItemConverter::~RegressionEquationItemConverter()
{
......@@ -156,7 +151,6 @@ void RegressionEquationItemConverter::FillSpecialItem(
}
}
} // namespace wrapper
} // namespace chart
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
Dosyayı görüntüle @ 9e970303
......@@ -47,53 +47,44 @@ namespace
};
} // anonymous namespace
namespace chart
{
namespace wrapper
{
namespace chart { namespace wrapper {
class FormattedStringsConverter : public ::comphelper::MultipleItemConverter
{
public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
FormattedStringsConverter(
const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings,
SfxItemPool & rItemPool,
::std::auto_ptr< awt::Size > pRefSize,
const awt::Size* pRefSize,
const uno::Reference< beans::XPropertySet > & xParentProp );
SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~FormattedStringsConverter();
protected:
virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE;
};
SAL_WNODEPRECATED_DECLARATIONS_PUSH
FormattedStringsConverter::FormattedStringsConverter(
const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings,
SfxItemPool & rItemPool,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize,
const awt::Size* pRefSize,
const uno::Reference< beans::XPropertySet > & xParentProp ) :
MultipleItemConverter( rItemPool )
{
bool bHasRefSize = (pRefSize.get() && xParentProp.is());
bool bHasRefSize = (pRefSize && xParentProp.is());
for( sal_Int32 i = 0; i < aStrings.getLength(); ++i )
{
uno::Reference< beans::XPropertySet > xProp( aStrings[ i ], uno::UNO_QUERY );
if( xProp.is())
{
if( bHasRefSize )
m_aConverters.push_back( new CharacterPropertyItemConverter(
xProp, rItemPool,
::std::auto_ptr< awt::Size >( new awt::Size( *pRefSize )),
"ReferencePageSize" ,
xParentProp ));
m_aConverters.push_back(
new CharacterPropertyItemConverter(
xProp, rItemPool, pRefSize, "ReferencePageSize", xParentProp));
else
m_aConverters.push_back( new CharacterPropertyItemConverter( xProp, rItemPool ));
}
}
}
SAL_WNODEPRECATED_DECLARATIONS_POP
FormattedStringsConverter::~FormattedStringsConverter()
{
......@@ -104,14 +95,12 @@ const sal_uInt16 * FormattedStringsConverter::GetWhichPairs() const
return nCharacterPropertyWhichPairs;
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
TitleItemConverter::TitleItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
const uno::Reference<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(
......@@ -132,7 +121,6 @@ TitleItemConverter::TitleItemConverter(
}
}
}
SAL_WNODEPRECATED_DECLARATIONS_POP
TitleItemConverter::~TitleItemConverter()
{
......
chart2/source/controller/main/ChartController_Properties.cxx
Dosyayı görüntüle @ 9e970303
......@@ -53,6 +53,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <memory>
#include <boost/scoped_ptr.hpp>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
......@@ -108,14 +109,14 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
break;
case OBJECTTYPE_TITLE:
{
::std::auto_ptr< awt::Size > pRefSize;
boost::scoped_ptr<awt::Size> pRefSize;
if( pRefSizeProvider.get() )
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
pRefSize.reset(new awt::Size(pRefSizeProvider->getPageSize()));
pItemConverter = new wrapper::TitleItemConverter( xObjectProperties,
rDrawModel.GetItemPool(), rDrawModel,
uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ),
pRefSize );
pItemConverter = new wrapper::TitleItemConverter(
xObjectProperties, rDrawModel.GetItemPool(), rDrawModel,
uno::Reference<lang::XMultiServiceFactory>(xChartModel, uno::UNO_QUERY),
pRefSize.get());
}
break;
case OBJECTTYPE_LEGEND:
......@@ -143,7 +144,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
break;
case OBJECTTYPE_AXIS:
{
::std::auto_ptr< awt::Size > pRefSize;
boost::scoped_ptr<awt::Size> pRefSize;
if( pRefSizeProvider.get() )
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
......@@ -166,7 +167,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
rDrawModel,
uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ),
&aExplicitScale, &aExplicitIncrement,
pRefSize );
pRefSize.get() );
}
break;
case OBJECTTYPE_AXIS_UNITLABEL:
......@@ -176,7 +177,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
case OBJECTTYPE_DATA_LABEL:
case OBJECTTYPE_DATA_POINT:
{
::std::auto_ptr< awt::Size > pRefSize;
boost::scoped_ptr<awt::Size> pRefSize;
if( pRefSizeProvider.get() )
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
......@@ -223,7 +224,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pItemConverter = new wrapper::DataPointItemConverter( xChartModel, xContext,
xObjectProperties, xSeries, rDrawModel.GetItemPool(), rDrawModel,
uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ),
eMapTo, pRefSize, bDataSeries, bUseSpecialFillColor, nSpecialFillColor, true,
eMapTo, pRefSize.get(), bDataSeries, bUseSpecialFillColor, nSpecialFillColor, true,
nNumberFormat, nPercentNumberFormat );
break;
}
......@@ -253,14 +254,14 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
break;
case OBJECTTYPE_DATA_CURVE_EQUATION:
{
::std::auto_ptr< awt::Size > pRefSize;
boost::scoped_ptr<awt::Size> pRefSize;
if( pRefSizeProvider.get() )
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
pRefSize.reset(new awt::Size(pRefSizeProvider->getPageSize()));
pItemConverter = new wrapper::RegressionEquationItemConverter(
xObjectProperties, rDrawModel.GetItemPool(), rDrawModel,
uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ),
pRefSize );
pRefSize.get());
break;
}
case OBJECTTYPE_DATA_STOCK_RANGE:
......@@ -287,12 +288,13 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
break;
case OBJECTTYPE_AXIS:
{
::std::auto_ptr< awt::Size > pRefSize;
boost::scoped_ptr<awt::Size> pRefSize;
if( pRefSizeProvider.get() )
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
pItemConverter = new wrapper::AllAxisItemConverter( xChartModel, rDrawModel.GetItemPool(),
rDrawModel, uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ), pRefSize );
pItemConverter = new wrapper::AllAxisItemConverter(
xChartModel, rDrawModel.GetItemPool(),
rDrawModel, uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ), pRefSize.get());
}
break;
case OBJECTTYPE_GRID:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment