diff options
Diffstat (limited to 'chart2')
25 files changed, 112 insertions, 126 deletions
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index cb34dd03b2a7..07eaf165bcc3 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -32,7 +32,7 @@ class SdrModel; namespace chart { namespace wrapper { -class AxisItemConverter : public comphelper::ItemConverter +class AxisItemConverter : public ItemConverter { public: AxisItemConverter( diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 5ab9910ab39d..f8361cbdca5a 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -28,7 +28,7 @@ namespace chart { namespace wrapper { -class CharacterPropertyItemConverter : public comphelper::ItemConverter +class CharacterPropertyItemConverter : public ItemConverter { public: CharacterPropertyItemConverter( diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index 4c37ca21bbf1..aade0d7879ad 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -33,7 +33,7 @@ class SdrModel; namespace chart { namespace wrapper { -class DataPointItemConverter : public comphelper::ItemConverter +class DataPointItemConverter : public ItemConverter { public: DataPointItemConverter( diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index 94767e3e1a05..a9ad61ade11f 100644 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -37,8 +37,7 @@ namespace chart namespace wrapper { -class ErrorBarItemConverter : - public ::comphelper::ItemConverter +class ErrorBarItemConverter : public ItemConverter { public: ErrorBarItemConverter( diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index a1b550d73581..0310add98428 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -31,8 +31,7 @@ namespace chart namespace wrapper { -class GraphicPropertyItemConverter : - public ::comphelper::ItemConverter +class GraphicPropertyItemConverter : public ItemConverter { public: enum eGraphicObjectType diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index abacdf574d2d..c4055fbce9b7 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -26,8 +26,8 @@ #include <utility> -namespace comphelper -{ +namespace chart { namespace wrapper { + /** This class serves for conversion between properties of an XPropertySet and SfxItems in SfxItemSets. @@ -193,7 +193,7 @@ private: bool m_bIsValid; }; -} // namespace comphelper +}} // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_ITEMCONVERTER_HXX #endif diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx index 52af06ca07e2..f4de00930534 100644 --- a/chart2/source/controller/inc/ItemPropertyMap.hxx +++ b/chart2/source/controller/inc/ItemPropertyMap.hxx @@ -22,11 +22,10 @@ #include <comphelper/InlineContainer.hxx> #include "ItemConverter.hxx" -#define IPM_MAP_ENTRY(wid,uno,mid) (wid, ::std::make_pair< ::comphelper::ItemConverter::tPropertyNameType, ::comphelper::ItemConverter::tMemberIdType >(\ +#define IPM_MAP_ENTRY(wid,uno,mid) (wid, ::std::make_pair< ::chart::wrapper::ItemConverter::tPropertyNameType, ::chart::wrapper::ItemConverter::tMemberIdType >(\ uno, mid)) -namespace comphelper -{ +namespace chart { namespace wrapper { typedef ::std::map< ItemConverter::tWhichIdType, ::std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > > ItemPropertyMapType; @@ -74,9 +73,8 @@ struct DeleteItemConverterPtr : public ::std::unary_function< ItemConverter *, v { delete pConv; } }; -} // namespace comphelper +}} -// INCLUDED_CHART2_SOURCE_CONTROLLER_INC_ITEMPROPERTYMAP_HXX #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index 26b78a7d3c7c..de248555703e 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -32,8 +32,7 @@ namespace chart namespace wrapper { -class LegendItemConverter : - public ::comphelper::ItemConverter +class LegendItemConverter : public ItemConverter { public: LegendItemConverter( diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index f3819b9988cb..e094b09ed484 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -27,7 +27,7 @@ class SdrModel; namespace chart { namespace wrapper { -class AllAxisItemConverter : public ::comphelper::MultipleItemConverter +class AllAxisItemConverter : public MultipleItemConverter { public: AllAxisItemConverter( @@ -43,7 +43,7 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; -class AllGridItemConverter : public ::comphelper::MultipleItemConverter +class AllGridItemConverter : public MultipleItemConverter { public: AllGridItemConverter( @@ -57,7 +57,7 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; -class AllDataLabelItemConverter : public ::comphelper::MultipleItemConverter +class AllDataLabelItemConverter : public MultipleItemConverter { public: AllDataLabelItemConverter( @@ -73,7 +73,7 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; -class AllTitleItemConverter : public ::comphelper::MultipleItemConverter +class AllTitleItemConverter : public MultipleItemConverter { public: AllTitleItemConverter( @@ -88,7 +88,7 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; -class AllSeriesStatisticsConverter : public ::comphelper::MultipleItemConverter +class AllSeriesStatisticsConverter : public MultipleItemConverter { public: AllSeriesStatisticsConverter( diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx index 0a877c3f86b4..6f5e3bcfac9d 100644 --- a/chart2/source/controller/inc/MultipleItemConverter.hxx +++ b/chart2/source/controller/inc/MultipleItemConverter.hxx @@ -25,8 +25,7 @@ #include <vector> -namespace comphelper -{ +namespace chart { namespace wrapper { /** Note: virtual const sal_uInt16 * GetWhichPairs() const; is still pure virtual */ @@ -47,7 +46,7 @@ protected: ::std::vector< ItemConverter * > m_aConverters; }; -} // namespace comphelper +}} #endif diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index df7d307dad19..4abfa57f4efb 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -34,8 +34,7 @@ namespace chart namespace wrapper { -class RegressionCurveItemConverter : - public ::comphelper::ItemConverter +class RegressionCurveItemConverter : public ItemConverter { public: RegressionCurveItemConverter( diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 3201d6c48709..184c2f4360a4 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -32,7 +32,7 @@ class SdrModel; namespace chart { namespace wrapper { -class RegressionEquationItemConverter : public comphelper::ItemConverter +class RegressionEquationItemConverter : public ItemConverter { public: RegressionEquationItemConverter( diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 4173005d8811..5f9c2a4a4407 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -30,8 +30,7 @@ namespace chart namespace wrapper { -class SeriesOptionsItemConverter : - public ::comphelper::ItemConverter +class SeriesOptionsItemConverter : public ItemConverter { public: SeriesOptionsItemConverter( diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index 2cece6f4573d..8bb5a7085ccd 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -32,8 +32,7 @@ namespace chart namespace wrapper { -class StatisticsItemConverter : - public ::comphelper::ItemConverter +class StatisticsItemConverter : public ItemConverter { public: StatisticsItemConverter( diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index c1d78f0486eb..bb057c384ff4 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -29,7 +29,7 @@ class SdrModel; namespace chart { namespace wrapper { -class TitleItemConverter : public comphelper::ItemConverter +class TitleItemConverter : public ItemConverter { public: TitleItemConverter( diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 30f014ea801a..15b06a310c28 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -51,12 +51,14 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::chart::TimeInterval; using ::com::sun::star::chart::TimeIncrement; -namespace -{ -::comphelper::ItemPropertyMapType & lcl_GetAxisPropertyMap() +namespace chart { namespace wrapper { + +namespace { + +ItemPropertyMapType & lcl_GetAxisPropertyMap() { - static ::comphelper::ItemPropertyMapType aAxisPropertyMap( - ::comphelper::MakeItemPropertyMap + static ItemPropertyMapType aAxisPropertyMap( + MakeItemPropertyMap IPM_MAP_ENTRY( SCHATTR_AXIS_SHOWDESCR, "DisplayLabels", 0 ) IPM_MAP_ENTRY( SCHATTR_AXIS_TICKS, "MajorTickmarks", 0 ) IPM_MAP_ENTRY( SCHATTR_AXIS_HELPTICKS, "MinorTickmarks", 0 ) @@ -68,9 +70,8 @@ namespace return aAxisPropertyMap; }; -} // anonymous namespace -namespace chart { namespace wrapper { +} // anonymous namespace AxisItemConverter::AxisItemConverter( const Reference< beans::XPropertySet > & rPropertySet, @@ -108,14 +109,12 @@ AxisItemConverter::~AxisItemConverter() delete m_pExplicitScale; delete m_pExplicitIncrement; - ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::DeleteItemConverterPtr() ); + ::std::for_each( m_aConverters.begin(), m_aConverters.end(), DeleteItemConverterPtr() ); } void AxisItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const { - ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::FillItemSetFunc( rOutItemSet )); + ::std::for_each( m_aConverters.begin(), m_aConverters.end(), FillItemSetFunc( rOutItemSet )); // own items ItemConverter::FillItemSet( rOutItemSet ); @@ -125,8 +124,7 @@ bool AxisItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) { bool bResult = false; - ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::ApplyItemSetFunc( rItemSet, bResult )); + ::std::for_each( m_aConverters.begin(), m_aConverters.end(), ApplyItemSetFunc( rItemSet, bResult )); // own items return ItemConverter::ApplyItemSet( rItemSet ) || bResult; @@ -140,8 +138,8 @@ const sal_uInt16 * AxisItemConverter::GetWhichPairs() const bool AxisItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const { - ::comphelper::ItemPropertyMapType & rMap( lcl_GetAxisPropertyMap()); - ::comphelper::ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); + ItemPropertyMapType & rMap( lcl_GetAxisPropertyMap()); + ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); if( aIt == rMap.end()) return false; diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 97bf8c87123f..dd1fd87df986 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -37,12 +37,14 @@ using namespace ::com::sun::star; -namespace -{ -::comphelper::ItemPropertyMapType & lcl_GetCharacterPropertyPropertyMap() +namespace chart { namespace wrapper { + +namespace { + +ItemPropertyMapType & lcl_GetCharacterPropertyPropertyMap() { - static ::comphelper::ItemPropertyMapType aCharacterPropertyMap( - ::comphelper::MakeItemPropertyMap + static ItemPropertyMapType aCharacterPropertyMap( + MakeItemPropertyMap IPM_MAP_ENTRY( EE_CHAR_COLOR, "CharColor", 0 ) IPM_MAP_ENTRY( EE_CHAR_LANGUAGE, "CharLocale", MID_LANG_LOCALE ) IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CJK, "CharLocaleAsian", MID_LANG_LOCALE ) @@ -64,8 +66,6 @@ namespace } } // anonymous namespace -namespace chart { namespace wrapper { - CharacterPropertyItemConverter::CharacterPropertyItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool ) : @@ -96,8 +96,8 @@ const sal_uInt16 * CharacterPropertyItemConverter::GetWhichPairs() const bool CharacterPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const { - ::comphelper::ItemPropertyMapType & rMap( lcl_GetCharacterPropertyPropertyMap()); - ::comphelper::ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); + ItemPropertyMapType & rMap( lcl_GetCharacterPropertyPropertyMap()); + ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); if( aIt == rMap.end()) return false; diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 2c126dee085b..233989563f03 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -54,12 +54,14 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -namespace -{ -::comphelper::ItemPropertyMapType & lcl_GetDataPointPropertyMap() +namespace chart { namespace wrapper { + +namespace { + +ItemPropertyMapType & lcl_GetDataPointPropertyMap() { - static ::comphelper::ItemPropertyMapType aDataPointPropertyMap( - ::comphelper::MakeItemPropertyMap + static ItemPropertyMapType aDataPointPropertyMap( + MakeItemPropertyMap IPM_MAP_ENTRY( SCHATTR_STYLE_SHAPE, "Geometry3D", 0 ) ); @@ -190,8 +192,6 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxIte } // anonymous namespace -namespace chart { namespace wrapper { - DataPointItemConverter::DataPointItemConverter( const uno::Reference< frame::XModel > & xChartModel, const uno::Reference< uno::XComponentContext > & xContext, @@ -240,13 +240,13 @@ DataPointItemConverter::DataPointItemConverter( DataPointItemConverter::~DataPointItemConverter() { ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::DeleteItemConverterPtr() ); + DeleteItemConverterPtr() ); } void DataPointItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const { ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::FillItemSetFunc( rOutItemSet )); + FillItemSetFunc( rOutItemSet )); // own items ItemConverter::FillItemSet( rOutItemSet ); @@ -263,7 +263,7 @@ bool DataPointItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) bool bResult = false; ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::ApplyItemSetFunc( rItemSet, bResult )); + ApplyItemSetFunc( rItemSet, bResult )); // own items return ItemConverter::ApplyItemSet( rItemSet ) || bResult; @@ -279,8 +279,8 @@ const sal_uInt16 * DataPointItemConverter::GetWhichPairs() const bool DataPointItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const { - ::comphelper::ItemPropertyMapType & rMap( lcl_GetDataPointPropertyMap()); - ::comphelper::ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); + ItemPropertyMapType & rMap( lcl_GetDataPointPropertyMap()); + ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); if( aIt == rMap.end()) return false; diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index db934341d8b9..aeafa4e2797f 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -45,12 +45,14 @@ using namespace ::com::sun::star; -namespace -{ -::comphelper::ItemPropertyMapType & lcl_GetDataPointFilledPropertyMap() +namespace chart { namespace wrapper { + +namespace { + +ItemPropertyMapType & lcl_GetDataPointFilledPropertyMap() { - static ::comphelper::ItemPropertyMapType aDataPointPropertyFilledMap( - ::comphelper::MakeItemPropertyMap + static ItemPropertyMapType aDataPointPropertyFilledMap( + MakeItemPropertyMap IPM_MAP_ENTRY( XATTR_FILLSTYLE, "FillStyle", 0 ) IPM_MAP_ENTRY( XATTR_FILLCOLOR, "Color", 0 ) IPM_MAP_ENTRY( XATTR_LINECOLOR, "BorderColor", 0 ) @@ -69,10 +71,10 @@ namespace return aDataPointPropertyFilledMap; } -::comphelper::ItemPropertyMapType & lcl_GetDataPointLinePropertyMap() +ItemPropertyMapType & lcl_GetDataPointLinePropertyMap() { - static ::comphelper::ItemPropertyMapType aDataPointPropertyLineMap( - ::comphelper::MakeItemPropertyMap + static ItemPropertyMapType aDataPointPropertyLineMap( + MakeItemPropertyMap IPM_MAP_ENTRY( XATTR_LINECOLOR, "Color", 0 ) IPM_MAP_ENTRY( XATTR_LINESTYLE, "LineStyle", 0 ) IPM_MAP_ENTRY( XATTR_LINEWIDTH, "LineWidth", 0 ) @@ -80,10 +82,10 @@ namespace return aDataPointPropertyLineMap; } -::comphelper::ItemPropertyMapType & lcl_GetLinePropertyMap() +ItemPropertyMapType & lcl_GetLinePropertyMap() { - static ::comphelper::ItemPropertyMapType aLinePropertyMap( - ::comphelper::MakeItemPropertyMap + static ItemPropertyMapType aLinePropertyMap( + MakeItemPropertyMap IPM_MAP_ENTRY( XATTR_LINESTYLE, "LineStyle", 0 ) IPM_MAP_ENTRY( XATTR_LINEWIDTH, "LineWidth", 0 ) IPM_MAP_ENTRY( XATTR_LINECOLOR, "LineColor", 0 ) @@ -92,10 +94,10 @@ namespace return aLinePropertyMap; } -::comphelper::ItemPropertyMapType & lcl_GetFillPropertyMap() +ItemPropertyMapType & lcl_GetFillPropertyMap() { - static ::comphelper::ItemPropertyMapType aFillPropertyMap( - ::comphelper::MakeItemPropertyMap + static ItemPropertyMapType aFillPropertyMap( + MakeItemPropertyMap IPM_MAP_ENTRY( XATTR_FILLSTYLE, "FillStyle", 0 ) IPM_MAP_ENTRY( XATTR_FILLCOLOR, "FillColor", 0 ) IPM_MAP_ENTRY( XATTR_FILLBACKGROUND, "FillBackground", 0 ) @@ -148,11 +150,6 @@ bool lcl_SetContentForNamedProperty( } // anonymous namespace -namespace chart -{ -namespace wrapper -{ - GraphicPropertyItemConverter::GraphicPropertyItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, @@ -191,8 +188,8 @@ const sal_uInt16 * GraphicPropertyItemConverter::GetWhichPairs() const bool GraphicPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const { - ::comphelper::ItemPropertyMapType::const_iterator aEndIt; - ::comphelper::ItemPropertyMapType::const_iterator aIt; + ItemPropertyMapType::const_iterator aEndIt; + ItemPropertyMapType::const_iterator aIt; switch( m_eGraphicObjectType ) { diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index f8a3aa3e4106..dedcdea1e9c7 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -27,8 +27,7 @@ using namespace ::com::sun::star; -namespace comphelper -{ +namespace chart { namespace wrapper { ItemConverter::ItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, @@ -243,6 +242,6 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItem } } -} // namespace comphelper +}} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index b60e423fa80d..f1064f695bbb 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -60,13 +60,13 @@ LegendItemConverter::LegendItemConverter( LegendItemConverter::~LegendItemConverter() { ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::DeleteItemConverterPtr() ); + DeleteItemConverterPtr() ); } void LegendItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const { ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::FillItemSetFunc( rOutItemSet )); + FillItemSetFunc( rOutItemSet )); // own items ItemConverter::FillItemSet( rOutItemSet ); @@ -77,7 +77,7 @@ bool LegendItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) bool bResult = false; ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::ApplyItemSetFunc( rItemSet, bResult )); + ApplyItemSetFunc( rItemSet, bResult )); // own items return ItemConverter::ApplyItemSet( rItemSet ) || bResult; diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx index 2719b345b1c5..0a64c31e2a7e 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx @@ -24,8 +24,7 @@ using namespace ::com::sun::star; -namespace comphelper -{ +namespace chart { namespace wrapper { MultipleItemConverter::MultipleItemConverter( SfxItemPool& rItemPool ) : ItemConverter( NULL, rItemPool ) @@ -71,6 +70,6 @@ bool MultipleItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropert return false; } -} // namespace comphelper +}} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index d41096270ef0..d35604525247 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -34,17 +34,18 @@ using namespace ::com::sun::star; -namespace -{ -::comphelper::ItemPropertyMapType & lcl_GetEquationPropertyMap() +namespace chart { namespace wrapper { + +namespace { + +ItemPropertyMapType & lcl_GetEquationPropertyMap() { - static ::comphelper::ItemPropertyMapType aEquationPropertyMap; + static ItemPropertyMapType aEquationPropertyMap; return aEquationPropertyMap; }; -} // anonymous namespace -namespace chart { namespace wrapper { +} // anonymous namespace RegressionEquationItemConverter::RegressionEquationItemConverter( const ::com::sun::star::uno::Reference< @@ -67,13 +68,13 @@ RegressionEquationItemConverter::RegressionEquationItemConverter( RegressionEquationItemConverter::~RegressionEquationItemConverter() { ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::DeleteItemConverterPtr() ); + DeleteItemConverterPtr() ); } void RegressionEquationItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const { ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::FillItemSetFunc( rOutItemSet )); + FillItemSetFunc( rOutItemSet )); // own items ItemConverter::FillItemSet( rOutItemSet ); @@ -84,7 +85,7 @@ bool RegressionEquationItemConverter::ApplyItemSet( const SfxItemSet & rItemSet bool bResult = false; ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::ApplyItemSetFunc( rItemSet, bResult )); + ApplyItemSetFunc( rItemSet, bResult )); // own items return ItemConverter::ApplyItemSet( rItemSet ) || bResult; @@ -98,8 +99,8 @@ const sal_uInt16 * RegressionEquationItemConverter::GetWhichPairs() const bool RegressionEquationItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const { - ::comphelper::ItemPropertyMapType & rMap( lcl_GetEquationPropertyMap()); - ::comphelper::ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); + ItemPropertyMapType & rMap( lcl_GetEquationPropertyMap()); + ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); if( aIt == rMap.end()) return false; diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 71d3230cb3b6..101d08576c03 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -34,22 +34,23 @@ using namespace ::com::sun::star; -namespace -{ -::comphelper::ItemPropertyMapType & lcl_GetTitlePropertyMap() +namespace chart { namespace wrapper { + +namespace { + +ItemPropertyMapType & lcl_GetTitlePropertyMap() { - static ::comphelper::ItemPropertyMapType aTitlePropertyMap( - ::comphelper::MakeItemPropertyMap + static ItemPropertyMapType aTitlePropertyMap( + MakeItemPropertyMap IPM_MAP_ENTRY( SCHATTR_TEXT_STACKED, "StackCharacters", 0 ) ); return aTitlePropertyMap; }; -} // anonymous namespace -namespace chart { namespace wrapper { +} // anonymous namespace -class FormattedStringsConverter : public ::comphelper::MultipleItemConverter +class FormattedStringsConverter : public MultipleItemConverter { public: FormattedStringsConverter( @@ -125,13 +126,13 @@ TitleItemConverter::TitleItemConverter( TitleItemConverter::~TitleItemConverter() { ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::DeleteItemConverterPtr() ); + DeleteItemConverterPtr() ); } void TitleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const { ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::FillItemSetFunc( rOutItemSet )); + FillItemSetFunc( rOutItemSet )); // own items ItemConverter::FillItemSet( rOutItemSet ); @@ -142,7 +143,7 @@ bool TitleItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) bool bResult = false; ::std::for_each( m_aConverters.begin(), m_aConverters.end(), - ::comphelper::ApplyItemSetFunc( rItemSet, bResult )); + ApplyItemSetFunc( rItemSet, bResult )); // own items return ItemConverter::ApplyItemSet( rItemSet ) || bResult; @@ -156,8 +157,8 @@ const sal_uInt16 * TitleItemConverter::GetWhichPairs() const bool TitleItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const { - ::comphelper::ItemPropertyMapType & rMap( lcl_GetTitlePropertyMap()); - ::comphelper::ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); + ItemPropertyMapType & rMap( lcl_GetTitlePropertyMap()); + ItemPropertyMapType::const_iterator aIt( rMap.find( nWhichId )); if( aIt == rMap.end()) return false; diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index f6367fe711a5..6f3fd5163990 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -69,12 +69,12 @@ using ::com::sun::star::uno::Reference; namespace { -::comphelper::ItemConverter* createItemConverter( +wrapper::ItemConverter* createItemConverter( 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; + wrapper::ItemConverter* pItemConverter=NULL; //get type of selected object ObjectType eObjectType = ObjectIdentifier::getObjectType( aObjectCID ); @@ -712,7 +712,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( boost::scoped_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider()); - boost::scoped_ptr<comphelper::ItemConverter> pItemConverter( + boost::scoped_ptr<wrapper::ItemConverter> pItemConverter( createItemConverter( rObjectCID, getModel(), m_xCC, m_pDrawModelWrapper->getSdrModel(), ExplicitValueProvider::getExplicitValueProvider(m_xChartView), |