diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-26 08:43:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-26 10:47:02 +0000 |
| commit | 80735fcbb0503ff1de198d1d9936fed9f5ae77a2 (patch) | |
| tree | 7c126266aecb7561f46897bd9c997c085a3a96df /xmloff/source/chart | |
| parent | 4112ecadd53f7ae48e007dd5024f077aca305062 (diff) | |
com::sun::star->css in xmloff/
Change-Id: Iee6e21e093fb1383f19a0716dbc1c341f446b8c2
Reviewed-on: https://gerrit.libreoffice.org/20192
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff/source/chart')
36 files changed, 373 insertions, 413 deletions
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx index 9f7411dd0966..ac3c5d5b7aeb 100644 --- a/xmloff/source/chart/ColorPropertySet.hxx +++ b/xmloff/source/chart/ColorPropertySet.hxx @@ -30,8 +30,8 @@ namespace chart { class ColorPropertySet : public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyState > + css::beans::XPropertySet, + css::beans::XPropertyState > { public: // if bFillColor == false, the color is a LineColor @@ -40,68 +40,67 @@ public: protected: // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // ____ XPropertyState ____ - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( - const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( + const css::uno::Sequence< OUString >& aPropertyName ) + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > m_xInfo; + css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo; OUString m_aColorPropName; sal_Int32 m_nColor; bool m_bIsFillColor; diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index d62a7db8ef3a..f425c947f3f9 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -54,7 +54,7 @@ public: /** @descr Abstract interface of a method for setting a variables value to that of the property. */ - virtual void SetValue (const ::com::sun::star::uno::Any & rValue) = 0; + virtual void SetValue (const css::uno::Any & rValue) = 0; const OUString msName; }; @@ -75,7 +75,7 @@ public: /** descr Set the given value inside an Any to the variable referenced by the data member. */ - virtual void SetValue (const ::com::sun::star::uno::Any & rValue) override + virtual void SetValue (const css::uno::Any & rValue) override { rValue >>= mrValue; } @@ -121,8 +121,8 @@ public: not necessarily XPropertySet or XMultiPropertySet. It is casted later to one of the two of them. */ - explicit MultiPropertySetHandler (::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> xObject); + explicit MultiPropertySetHandler (css::uno::Reference< + css::uno::XInterface> xObject); ~MultiPropertySetHandler(); /** @descr Add a property to handle. The type given implicitly by the reference to a variable is used to create an instance of @@ -152,7 +152,7 @@ private: containing the properties names. @return True if values could be derived. */ - inline bool MultiGet (const ::com::sun::star::uno::Sequence< + inline bool MultiGet (const css::uno::Sequence< OUString> & rNameList); /** @descr Try to use the XPropertySet interface to get the property @@ -161,7 +161,7 @@ private: containing the properties names. @return True if values could be derived. */ - inline bool SingleGet (const ::com::sun::star::uno::Sequence< + inline bool SingleGet (const css::uno::Sequence< OUString> & rNameList); /** @descr STL map that maps from property names to polymorphic instances of @@ -171,11 +171,11 @@ private: ::std::map< OUString, PropertyWrapperBase*, OUStringComparison> aPropertyList; /// The object from which to get the property values. - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> mxObject; + css::uno::Reference< css::uno::XInterface> mxObject; }; -MultiPropertySetHandler::MultiPropertySetHandler (::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> xObject) +MultiPropertySetHandler::MultiPropertySetHandler (css::uno::Reference< + css::uno::XInterface> xObject) : mxObject (xObject) { } @@ -190,7 +190,7 @@ MultiPropertySetHandler::~MultiPropertySetHandler() bool MultiPropertySetHandler::GetProperties() { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; - ::com::sun::star::uno::Sequence< OUString> aNameList (aPropertyList.size()); + css::uno::Sequence< OUString> aNameList (aPropertyList.size()); int i; for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) aNameList[i++] = I->second->msName; @@ -200,22 +200,22 @@ bool MultiPropertySetHandler::GetProperties() return true; } -bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequence< +bool MultiPropertySetHandler::MultiGet (const css::uno::Sequence< OUString> & rNameList) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> xMultiSet ( - mxObject, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::beans::XMultiPropertySet> xMultiSet ( + mxObject, css::uno::UNO_QUERY); if (xMultiSet.is()) try { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; int i; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValueList = + css::uno::Sequence< css::uno::Any> aValueList = xMultiSet->getPropertyValues (rNameList); for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) I->second->SetValue (aValueList[i++]); } - catch (const ::com::sun::star::beans::UnknownPropertyException&) + catch (const css::beans::UnknownPropertyException&) { return false; } @@ -225,11 +225,11 @@ bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequen return true; } -bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequence< +bool MultiPropertySetHandler::SingleGet (const css::uno::Sequence< OUString> & rNameList) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSingleSet ( - mxObject, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::beans::XPropertySet> xSingleSet ( + mxObject, css::uno::UNO_QUERY); if (xSingleSet.is()) try { @@ -238,7 +238,7 @@ bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequen for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) I->second->SetValue (xSingleSet->getPropertyValue (rNameList[i++])); } - catch (const ::com::sun::star::beans::UnknownPropertyException&) + catch (const css::beans::UnknownPropertyException&) { return false; } diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index e44ccef921a9..a7f1fba3d4a2 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -260,57 +260,57 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = const SvXMLEnumMapEntry aXMLChartAxisLabelPositionEnumMap[] = { - { ::xmloff::token::XML_NEAR_AXIS, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS }, - { ::xmloff::token::XML_NEAR_AXIS_OTHER_SIDE, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE }, - { ::xmloff::token::XML_OUTSIDE_START, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START }, - { ::xmloff::token::XML_OUTSIDE_END, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END }, - { ::xmloff::token::XML_OUTSIDE_MINIMUM, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START },//#i114142# - { ::xmloff::token::XML_OUTSIDE_MAXIMUM, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END },//#i114142# + { ::xmloff::token::XML_NEAR_AXIS, css::chart::ChartAxisLabelPosition_NEAR_AXIS }, + { ::xmloff::token::XML_NEAR_AXIS_OTHER_SIDE, css::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE }, + { ::xmloff::token::XML_OUTSIDE_START, css::chart::ChartAxisLabelPosition_OUTSIDE_START }, + { ::xmloff::token::XML_OUTSIDE_END, css::chart::ChartAxisLabelPosition_OUTSIDE_END }, + { ::xmloff::token::XML_OUTSIDE_MINIMUM, css::chart::ChartAxisLabelPosition_OUTSIDE_START },//#i114142# + { ::xmloff::token::XML_OUTSIDE_MAXIMUM, css::chart::ChartAxisLabelPosition_OUTSIDE_END },//#i114142# { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartAxisMarkPositionEnumMap[] = { - { ::xmloff::token::XML_AT_LABELS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS }, - { ::xmloff::token::XML_AT_AXIS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_AXIS }, - { ::xmloff::token::XML_AT_LABELS_AND_AXIS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS }, + { ::xmloff::token::XML_AT_LABELS, css::chart::ChartAxisMarkPosition_AT_LABELS }, + { ::xmloff::token::XML_AT_AXIS, css::chart::ChartAxisMarkPosition_AT_AXIS }, + { ::xmloff::token::XML_AT_LABELS_AND_AXIS, css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartAxisArrangementEnumMap[] = { - { ::xmloff::token::XML_SIDE_BY_SIDE, ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, - { ::xmloff::token::XML_STAGGER_EVEN, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, - { ::xmloff::token::XML_STAGGER_ODD, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_ODD }, + { ::xmloff::token::XML_SIDE_BY_SIDE, css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, + { ::xmloff::token::XML_STAGGER_EVEN, css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, + { ::xmloff::token::XML_STAGGER_ODD, css::chart::ChartAxisArrangeOrderType_STAGGER_ODD }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] = { - { ::xmloff::token::XML_NONE, ::com::sun::star::chart::ErrorBarStyle::NONE }, - { ::xmloff::token::XML_VARIANCE, ::com::sun::star::chart::ErrorBarStyle::VARIANCE }, - { ::xmloff::token::XML_STANDARD_DEVIATION, ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION }, - { ::xmloff::token::XML_CONSTANT, ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE }, - { ::xmloff::token::XML_PERCENTAGE, ::com::sun::star::chart::ErrorBarStyle::RELATIVE }, - { ::xmloff::token::XML_ERROR_MARGIN, ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN }, - { ::xmloff::token::XML_STANDARD_ERROR, ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR }, - { ::xmloff::token::XML_CELL_RANGE, ::com::sun::star::chart::ErrorBarStyle::FROM_DATA }, + { ::xmloff::token::XML_NONE, css::chart::ErrorBarStyle::NONE }, + { ::xmloff::token::XML_VARIANCE, css::chart::ErrorBarStyle::VARIANCE }, + { ::xmloff::token::XML_STANDARD_DEVIATION, css::chart::ErrorBarStyle::STANDARD_DEVIATION }, + { ::xmloff::token::XML_CONSTANT, css::chart::ErrorBarStyle::ABSOLUTE }, + { ::xmloff::token::XML_PERCENTAGE, css::chart::ErrorBarStyle::RELATIVE }, + { ::xmloff::token::XML_ERROR_MARGIN, css::chart::ErrorBarStyle::ERROR_MARGIN }, + { ::xmloff::token::XML_STANDARD_ERROR, css::chart::ErrorBarStyle::STANDARD_ERROR }, + { ::xmloff::token::XML_CELL_RANGE, css::chart::ErrorBarStyle::FROM_DATA }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] = { - { ::xmloff::token::XML_CUBOID, ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID }, - { ::xmloff::token::XML_CYLINDER, ::com::sun::star::chart::ChartSolidType::CYLINDER }, - { ::xmloff::token::XML_CONE, ::com::sun::star::chart::ChartSolidType::CONE }, - { ::xmloff::token::XML_PYRAMID, ::com::sun::star::chart::ChartSolidType::PYRAMID }, + { ::xmloff::token::XML_CUBOID, css::chart::ChartSolidType::RECTANGULAR_SOLID }, + { ::xmloff::token::XML_CYLINDER, css::chart::ChartSolidType::CYLINDER }, + { ::xmloff::token::XML_CONE, css::chart::ChartSolidType::CONE }, + { ::xmloff::token::XML_PYRAMID, css::chart::ChartSolidType::PYRAMID }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartDataRowSourceTypeEnumMap[] = { - { ::xmloff::token::XML_COLUMNS, ::com::sun::star::chart::ChartDataRowSource_COLUMNS }, - { ::xmloff::token::XML_ROWS, ::com::sun::star::chart::ChartDataRowSource_ROWS }, + { ::xmloff::token::XML_COLUMNS, css::chart::ChartDataRowSource_COLUMNS }, + { ::xmloff::token::XML_ROWS, css::chart::ChartDataRowSource_ROWS }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; @@ -336,27 +336,27 @@ const SvXMLEnumMapEntry aXMLChartInterpolationTypeEnumMap[] = const SvXMLEnumMapEntry aXMLChartDataLabelPlacementEnumMap[] = { - { ::xmloff::token::XML_AVOID_OVERLAP, ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP }, - { ::xmloff::token::XML_CENTER, ::com::sun::star::chart::DataLabelPlacement::CENTER }, - { ::xmloff::token::XML_TOP, ::com::sun::star::chart::DataLabelPlacement::TOP }, - { ::xmloff::token::XML_TOP_LEFT, ::com::sun::star::chart::DataLabelPlacement::TOP_LEFT }, - { ::xmloff::token::XML_LEFT, ::com::sun::star::chart::DataLabelPlacement::LEFT }, - { ::xmloff::token::XML_BOTTOM_LEFT, ::com::sun::star::chart::DataLabelPlacement::BOTTOM_LEFT }, - { ::xmloff::token::XML_BOTTOM, ::com::sun::star::chart::DataLabelPlacement::BOTTOM }, - { ::xmloff::token::XML_BOTTOM_RIGHT, ::com::sun::star::chart::DataLabelPlacement::BOTTOM_RIGHT }, - { ::xmloff::token::XML_RIGHT, ::com::sun::star::chart::DataLabelPlacement::RIGHT }, - { ::xmloff::token::XML_TOP_RIGHT, ::com::sun::star::chart::DataLabelPlacement::TOP_RIGHT }, - { ::xmloff::token::XML_INSIDE, ::com::sun::star::chart::DataLabelPlacement::INSIDE }, - { ::xmloff::token::XML_OUTSIDE, ::com::sun::star::chart::DataLabelPlacement::OUTSIDE }, - { ::xmloff::token::XML_NEAR_ORIGIN, ::com::sun::star::chart::DataLabelPlacement::NEAR_ORIGIN }, + { ::xmloff::token::XML_AVOID_OVERLAP, css::chart::DataLabelPlacement::AVOID_OVERLAP }, + { ::xmloff::token::XML_CENTER, css::chart::DataLabelPlacement::CENTER }, + { ::xmloff::token::XML_TOP, css::chart::DataLabelPlacement::TOP }, + { ::xmloff::token::XML_TOP_LEFT, css::chart::DataLabelPlacement::TOP_LEFT }, + { ::xmloff::token::XML_LEFT, css::chart::DataLabelPlacement::LEFT }, + { ::xmloff::token::XML_BOTTOM_LEFT, css::chart::DataLabelPlacement::BOTTOM_LEFT }, + { ::xmloff::token::XML_BOTTOM, css::chart::DataLabelPlacement::BOTTOM }, + { ::xmloff::token::XML_BOTTOM_RIGHT, css::chart::DataLabelPlacement::BOTTOM_RIGHT }, + { ::xmloff::token::XML_RIGHT, css::chart::DataLabelPlacement::RIGHT }, + { ::xmloff::token::XML_TOP_RIGHT, css::chart::DataLabelPlacement::TOP_RIGHT }, + { ::xmloff::token::XML_INSIDE, css::chart::DataLabelPlacement::INSIDE }, + { ::xmloff::token::XML_OUTSIDE, css::chart::DataLabelPlacement::OUTSIDE }, + { ::xmloff::token::XML_NEAR_ORIGIN, css::chart::DataLabelPlacement::NEAR_ORIGIN }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartMissingValueTreatmentEnumMap[] = { - { ::xmloff::token::XML_LEAVE_GAP, ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP }, - { ::xmloff::token::XML_USE_ZERO, ::com::sun::star::chart::MissingValueTreatment::USE_ZERO }, - { ::xmloff::token::XML_IGNORE, ::com::sun::star::chart::MissingValueTreatment::CONTINUE }, + { ::xmloff::token::XML_LEAVE_GAP, css::chart::MissingValueTreatment::LEAVE_GAP }, + { ::xmloff::token::XML_USE_ZERO, css::chart::MissingValueTreatment::USE_ZERO }, + { ::xmloff::token::XML_IGNORE, css::chart::MissingValueTreatment::CONTINUE }, { ::xmloff::token::XML_TOKEN_INVALID,0 }, }; diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 8d30f0845024..45b8f1734d7d 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -61,9 +61,9 @@ static const SvXMLEnumMapEntry aXMLAxisDimensionMap[] = static const SvXMLEnumMapEntry aXMLAxisTypeMap[] = { - { XML_AUTO, ::com::sun::star::chart::ChartAxisType::AUTOMATIC }, - { XML_TEXT, ::com::sun::star::chart::ChartAxisType::CATEGORY }, - { XML_DATE, ::com::sun::star::chart::ChartAxisType::DATE }, + { XML_AUTO, css::chart::ChartAxisType::AUTOMATIC }, + { XML_TEXT, css::chart::ChartAxisType::CATEGORY }, + { XML_DATE, css::chart::ChartAxisType::DATE }, { XML_TOKEN_INVALID, 0 } }; @@ -78,7 +78,7 @@ public: const OUString& rLocalName, OUString& rAddress ); virtual ~SchXMLCategoriesContext(); - virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class DateScaleContext : public SvXMLImportContext @@ -89,7 +89,7 @@ public: const Reference< beans::XPropertySet >& rAxisProps ); virtual ~DateScaleContext(); - virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: Reference< beans::XPropertySet > m_xAxisProps; @@ -769,7 +769,7 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( rChartTypeServiceName == "com.sun.star.chart2.ScatterChartType" ) { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); + , uno::makeAny( css::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainXScale.Origin >>= fCrossoverValue; xMainYAxisProp->setPropertyValue("CrossoverValue" @@ -778,22 +778,22 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainYAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); + , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_END) ); xMainYAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); + , uno::makeAny( css::chart::ChartAxisPosition_START) ); } else { xMainYAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); + , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_START) ); xMainYAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); + , uno::makeAny( css::chart::ChartAxisPosition_END) ); } } else @@ -801,24 +801,24 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); + , uno::makeAny( css::chart::ChartAxisPosition_END) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); + , uno::makeAny( css::chart::ChartAxisPosition_START) ); } else { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); + , uno::makeAny( css::chart::ChartAxisPosition_START) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); + , uno::makeAny( css::chart::ChartAxisPosition_END) ); } } chart2::ScaleData aMainYScale = xMainYAxis->getScaleData(); xMainXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); + , uno::makeAny( css::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainYScale.Origin >>= fCrossoverValue; xMainXAxisProp->setPropertyValue("CrossoverValue" @@ -827,22 +827,22 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainXAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); + , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_END) ); xMainXAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); + , uno::makeAny( css::chart::ChartAxisPosition_START) ); } else { xMainXAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); + , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_START) ); xMainXAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); + , uno::makeAny( css::chart::ChartAxisPosition_END) ); } } } @@ -933,13 +933,13 @@ struct theDateScaleAttributeTokenMap : public rtl::Static< DateScaleAttributeTok sal_Int32 lcl_getTimeUnit( const OUString& rValue ) { - sal_Int32 nTimeUnit = ::com::sun::star::chart::TimeUnit::DAY; + sal_Int32 nTimeUnit = css::chart::TimeUnit::DAY; if( IsXMLToken( rValue, XML_DAYS ) ) - nTimeUnit = ::com::sun::star::chart::TimeUnit::DAY; + nTimeUnit = css::chart::TimeUnit::DAY; else if( IsXMLToken( rValue, XML_MONTHS ) ) - nTimeUnit = ::com::sun::star::chart::TimeUnit::MONTH; + nTimeUnit = css::chart::TimeUnit::MONTH; else if( IsXMLToken( rValue, XML_YEARS ) ) - nTimeUnit = ::com::sun::star::chart::TimeUnit::YEAR; + nTimeUnit = css::chart::TimeUnit::YEAR; return nTimeUnit; } diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx index a734d3357ae8..bfc5c3e76dbe 100644 --- a/xmloff/source/chart/SchXMLAxisContext.hxx +++ b/xmloff/source/chart/SchXMLAxisContext.hxx @@ -27,7 +27,7 @@ class SchXMLAxisContext : public SvXMLImportContext public: SchXMLAxisContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName, - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > xDiagram, + css::uno::Reference< css::chart::XDiagram > xDiagram, std::vector< SchXMLAxis >& aAxes, OUString& rCategoriesAddress, bool bAddMissingXAxisForNetCharts, @@ -36,27 +36,27 @@ public: bool& rbAxisPositionAttributeImported ); virtual ~SchXMLAxisContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - static void CorrectAxisPositions( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xNewDoc, + static void CorrectAxisPositions( const css::uno::Reference< css::chart2::XChartDocument >& xNewDoc, const OUString& rChartTypeServiceName, const OUString& rODFVersionOfFile, bool bAxisPositionAttributeImported ); private: SchXMLImportHelper& m_rImportHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > m_xDiagram; + css::uno::Reference< css::chart::XDiagram > m_xDiagram; SchXMLAxis m_aCurrentAxis; std::vector< SchXMLAxis >& m_rAxes; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAxisProps; + css::uno::Reference< css::beans::XPropertySet > m_xAxisProps; OUString m_aAutoStyleName; OUString& m_rCategoriesAddress; - sal_Int32 m_nAxisType;//::com::sun::star::chart::ChartAxisType + sal_Int32 m_nAxisType;//css::chart::ChartAxisType bool m_bAxisTypeImported; bool m_bDateScaleImported; bool m_bAddMissingXAxisForNetCharts; //to correct errors from older versions @@ -64,7 +64,7 @@ private: bool m_bAdaptXAxisOrientationForOld2DBarCharts; //to correct different behaviour from older versions bool& m_rbAxisPositionAttributeImported; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTitleShape(); + css::uno::Reference< css::drawing::XShape > getTitleShape(); void CreateGrid( const OUString& sAutoStyleName, bool bIsMajor ); void CreateAxis(); void SetAxisTitle(); diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index 7bb876410044..d988c932c7ca 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -38,8 +38,7 @@ using namespace ::xmloff::token; SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) { const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); @@ -60,7 +59,7 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& } SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { return new SchXMLCalculationSettingsContext(GetImport(),nPrefix,rLocalName,xAttrList); } diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx index 762d0f11bd71..7d6ae3e84f2d 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx @@ -24,17 +24,16 @@ class SchXMLCalculationSettingsContext : public SvXMLImportContext { - com::sun::star::uno::Any m_aNullDate; + css::uno::Any m_aNullDate; public: SchXMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index fa953f59dbc8..4161ba834bb6 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -384,16 +384,14 @@ namespace struct NewDonutSeries { - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; OUString msStyleName; sal_Int32 mnAttachedAxis; ::std::vector< OUString > m_aSeriesStyles; ::std::vector< OUString > m_aPointStyles; - NewDonutSeries( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount ) + NewDonutSeries( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount ) : m_xSeries( xSeries ) , mnAttachedAxis( 1 ) { @@ -446,16 +444,15 @@ struct NewDonutSeries }; void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle >& rStyleList - , const ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries> , sal_Int32 >& rSeriesMap ) + , const ::std::map< css::uno::Reference< css::chart2::XDataSeries> , sal_Int32 >& rSeriesMap ) { ::std::list< DataRowPointStyle >::iterator aIt(rStyleList.begin()); ::std::list< DataRowPointStyle >::iterator aEnd(rStyleList.end()); //detect old series count //and add old series to aSeriesMap - ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >, sal_Int32 > aSeriesMap(rSeriesMap); + ::std::map< css::uno::Reference< + css::chart2::XDataSeries >, sal_Int32 > aSeriesMap(rSeriesMap); sal_Int32 nOldSeriesCount = 0; { sal_Int32 nMaxOldSeriesIndex = 0; @@ -581,7 +578,7 @@ bool lcl_SpecialHandlingForDonutChartNeeded( static void lcl_ApplyDataFromRectangularRangeToDiagram( const uno::Reference< chart2::XChartDocument >& xNewDoc , const OUString& rRectangularRange - , ::com::sun::star::chart::ChartDataRowSource eDataRowSource + , css::chart::ChartDataRowSource eDataRowSource , bool bRowHasLabels, bool bColHasLabels , bool bSwitchOnLabelsAndCategoriesForOwnData , const OUString& sColTrans @@ -1152,7 +1149,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - com::sun::star::awt::Point maPosition; + css::awt::Point maPosition; bool bHasXPosition=false; bool bHasYPosition=false; diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 5aeed6577557..e5e67c776979 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -48,26 +48,26 @@ namespace com { namespace sun { namespace star { struct SeriesDefaultsAndStyles { //default values for series: - ::com::sun::star::uno::Any maSymbolTypeDefault; - ::com::sun::star::uno::Any maDataCaptionDefault; + css::uno::Any maSymbolTypeDefault; + css::uno::Any maDataCaptionDefault; - ::com::sun::star::uno::Any maErrorIndicatorDefault; - ::com::sun::star::uno::Any maErrorCategoryDefault; - ::com::sun::star::uno::Any maConstantErrorLowDefault; - ::com::sun::star::uno::Any maConstantErrorHighDefault; - ::com::sun::star::uno::Any maPercentageErrorDefault; - ::com::sun::star::uno::Any maErrorMarginDefault; + css::uno::Any maErrorIndicatorDefault; + css::uno::Any maErrorCategoryDefault; + css::uno::Any maConstantErrorLowDefault; + css::uno::Any maConstantErrorHighDefault; + css::uno::Any maPercentageErrorDefault; + css::uno::Any maErrorMarginDefault; - ::com::sun::star::uno::Any maMeanValueDefault; - ::com::sun::star::uno::Any maRegressionCurvesDefault; + css::uno::Any maMeanValueDefault; + css::uno::Any maRegressionCurvesDefault; - ::com::sun::star::uno::Any maStackedDefault; - ::com::sun::star::uno::Any maPercentDefault; - ::com::sun::star::uno::Any maDeepDefault; - ::com::sun::star::uno::Any maStackedBarsConnectedDefault; + css::uno::Any maStackedDefault; + css::uno::Any maPercentDefault; + css::uno::Any maDeepDefault; + css::uno::Any maStackedBarsConnectedDefault; //additional information - ::com::sun::star::uno::Any maLinesOnProperty; + css::uno::Any maLinesOnProperty; //styles for series and datapoints ::std::list< DataRowPointStyle > maSeriesStyleList; @@ -81,28 +81,26 @@ public: SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLChartContext(); - virtual void StartElement( const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLTable maTable; SchXMLImportHelper& mrImportHelper; OUString maMainTitle, maSubTitle; - com::sun::star::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos; + css::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos; OUString m_aXLinkHRefAttributeToIndicateDataProvider; bool m_bHasRangeAtPlotArea; bool m_bHasTableElement; bool mbAllRangeAddressesAvailable; bool mbColHasLabels; bool mbRowHasLabels; - ::com::sun::star::chart::ChartDataRowSource meDataRowSource; + css::chart::ChartDataRowSource meDataRowSource; bool mbIsStockChart; OUString msCategoriesAddress; @@ -111,12 +109,12 @@ private: SeriesDefaultsAndStyles maSeriesDefaultsAndStyles; tSchXMLLSequencesPerIndex maLSequencesPerIndex; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxDrawPage; + css::uno::Reference< css::drawing::XShapes > mxDrawPage; OUString msColTrans; OUString msRowTrans; OUString maChartTypeServiceName; - ::com::sun::star::awt::Size maChartSize; + css::awt::Size maChartSize; /** @descr This method bundles some settings to the chart model and executes them with a locked controller. This includes setting the chart type. @@ -135,22 +133,21 @@ class SchXMLTitleContext : public SvXMLImportContext private: SchXMLImportHelper& mrImportHelper; OUString& mrTitle; - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxTitleShape; + css::uno::Reference< css::drawing::XShape > mxTitleShape; OUString msAutoStyleName; public: SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName, OUString& rTitle, - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xTitleShape ); + css::uno::Reference< css::drawing::XShape >& xTitleShape ); virtual ~SchXMLTitleContext(); - virtual void StartElement( const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCHARTCONTEXT_HXX diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 729b0311fa95..ac70a8e968b9 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -122,8 +122,8 @@ class SchXMLExportHelper_Impl: private boost::noncopyable { public: // first: data sequence for label, second: data sequence for values. - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >, - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > > tLabelValuesDataPair; + typedef ::std::pair< css::uno::Reference< css::chart2::data::XDataSequence >, + css::uno::Reference< css::chart2::data::XDataSequence > > tLabelValuesDataPair; typedef ::std::vector< tLabelValuesDataPair > tDataSequenceCont; public: @@ -134,8 +134,7 @@ public: // auto-styles /// parse chart and collect all auto-styles used in current pool - void collectAutoStyles( com::sun::star::uno::Reference< - com::sun::star::chart::XChartDocument > rChartDoc ); + void collectAutoStyles( css::uno::Reference< css::chart::XChartDocument > rChartDoc ); /// write the styles collected into the current pool as <style:style> elements void exportAutoStyles(); @@ -151,8 +150,7 @@ public: which is the outer element of a chart. So these attributes can easily be parsed again by the container */ - void exportChart( com::sun::star::uno::Reference< - com::sun::star::chart::XChartDocument > rChartDoc, + void exportChart( css::uno::Reference< css::chart::XChartDocument > rChartDoc, bool bIncludeTable ); rtl::Reference<XMLPropertySetMapper> GetPropertySetMapper() const; @@ -163,12 +161,10 @@ public: { msTableNumberList = rList; } void InitRangeSegmentationProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); - static ::com::sun::star::awt::Size getPageSize( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); + static css::awt::Size getPageSize( + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); /** first parseDocument: collect autostyles and store names in this queue second parseDocument: export content and use names from this queue @@ -183,20 +179,19 @@ public: { return mrAutoStylePool; } /// if bExportContent is false the auto-styles are collected - void parseDocument( com::sun::star::uno::Reference< - com::sun::star::chart::XChartDocument >& rChartDoc, + void parseDocument( css::uno::Reference< css::chart::XChartDocument >& rChartDoc, bool bExportContent, bool bIncludeTable = false ); void exportTable(); void exportPlotArea( - com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > xDiagram, - com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > xNewDiagram, - const ::com::sun::star::awt::Size & rPageSize, + css::uno::Reference< css::chart::XDiagram > xDiagram, + css::uno::Reference< css::chart2::XDiagram > xNewDiagram, + const css::awt::Size & rPageSize, bool bExportContent, bool bIncludeTable ); - void exportCoordinateRegion( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram >& xDiagram ); - void exportAxes( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > & xDiagram, - const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram, + void exportCoordinateRegion( const css::uno::Reference< css::chart::XDiagram >& xDiagram ); + void exportAxes( const css::uno::Reference< css::chart::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xNewDiagram, bool bExportContent ); void exportAxis( enum XMLTokenEnum eDimension, enum XMLTokenEnum eAxisName, const Reference< beans::XPropertySet >& rAxisProps, const Reference< chart2::XAxis >& rChart2Axis, @@ -207,46 +202,42 @@ public: void exportAxisTitle( const Reference< beans::XPropertySet >& rTitleProps, bool bExportContent ); void exportSeries( - const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram, - const ::com::sun::star::awt::Size & rPageSize, + const css::uno::Reference< css::chart2::XDiagram > & xNewDiagram, + const css::awt::Size & rPageSize, bool bExportContent, bool bHasTwoYAxes ); void exportPropertyMapping( - const com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataSource > & xSource, + const css::uno::Reference< css::chart2::data::XDataSource > & xSource, Sequence< OUString >& rSupportedMappings ); void exportCandleStickSeries( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > & aSeriesSeq, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Sequence< + css::uno::Reference< css::chart2::XDataSeries > > & aSeriesSeq, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, bool bJapaneseCandleSticks, bool bExportContent ); void exportDataPoints( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xSeriesProperties, + const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties, sal_Int32 nSeriesLength, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, bool bExportContent ); void exportRegressionCurve( - const com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries>& xSeries, - const com::sun::star::awt::Size& rPageSize, + const css::uno::Reference<css::chart2::XDataSeries>& xSeries, + const css::awt::Size& rPageSize, bool bExportContent ); void exportErrorBar ( - const ::com::sun::star::uno::Reference<beans::XPropertySet> &xSeriesProp, bool bYError, + const css::uno::Reference<beans::XPropertySet> &xSeriesProp, bool bYError, bool bExportContent ); /// add svg position as attribute for current element - void addPosition( const ::com::sun::star::awt::Point & rPosition ); - void addPosition( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape ); + void addPosition( const css::awt::Point & rPosition ); + void addPosition( css::uno::Reference< css::drawing::XShape > xShape ); /// add svg size as attribute for current element - void addSize( const ::com::sun::star::awt::Size & rSize, bool bIsOOoNamespace = false ); - void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape, bool bIsOOoNamespace = false ); + void addSize( const css::awt::Size & rSize, bool bIsOOoNamespace = false ); + void addSize( css::uno::Reference< css::drawing::XShape > xShape, bool bIsOOoNamespace = false ); /// exports a string as a paragraph element void exportText( const OUString& rText, bool bConvertTabsLFs = false ); @@ -266,14 +257,14 @@ public: bool mbRowSourceColumns; OUString msChartAddress; OUString msTableNumberList; - ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping; + css::uno::Sequence< sal_Int32 > maSequenceMapping; OUString msCLSID; OUString maSrcShellID; OUString maDestShellID; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes; + css::uno::Reference< css::drawing::XShapes > mxAdditionalShapes; tDataSequenceCont m_aDataSequencesToExport; OUString maCategoriesRange; @@ -1089,7 +1080,7 @@ void SchXMLExportHelper_Impl::exportChart( Reference< chart::XChartDocument > rC SAL_WARN_IF( !maAutoStyleNameQueue.empty(), "xmloff.chart", "There are still remaining autostyle names in the queue" ); } -static OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) +static OUString lcl_GetStringFromNumberSequence( const css::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) { const sal_Int32* pArray = rSequenceMapping.getConstArray(); const sal_Int32 nSize = rSequenceMapping.getLength(); @@ -2119,10 +2110,10 @@ namespace XMLTokenEnum eToken = XML_DAYS; switch( nTimeUnit ) { - case ::com::sun::star::chart::TimeUnit::YEAR: + case css::chart::TimeUnit::YEAR: eToken = XML_YEARS; break; - case ::com::sun::star::chart::TimeUnit::MONTH: + case css::chart::TimeUnit::MONTH: eToken = XML_MONTHS; break; default://days @@ -2140,7 +2131,7 @@ void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XProperty chart::TimeIncrement aIncrement; if( (rAxisProps->getPropertyValue("TimeIncrement") >>= aIncrement) ) { - sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::DAY; + sal_Int32 nTimeResolution = css::chart::TimeUnit::DAY; if( aIncrement.TimeResolution >>= nTimeResolution ) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_BASE_TIME_UNIT, lcl_getTimeUnitToken( nTimeResolution ) ); @@ -2424,7 +2415,7 @@ void SchXMLExportHelper_Impl::exportAxes( // x axis - Reference< ::com::sun::star::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X ); + Reference< css::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X ); if( xNewAxis.is() ) { Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(0) : nullptr, uno::UNO_QUERY ); diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx index 73751ce4efec..963d31cd62eb 100644 --- a/xmloff/source/chart/SchXMLLegendContext.hxx +++ b/xmloff/source/chart/SchXMLLegendContext.hxx @@ -27,7 +27,7 @@ public: SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLLegendContext(); - virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper& mrImportHelper; diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index b49272a362af..e8959c540a33 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -40,13 +40,13 @@ public: OUString& rText, OUString * pOutId = nullptr ); virtual ~SchXMLParagraphContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; }; diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index a21f7a5f8c06..813a90e28a0d 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -608,8 +608,7 @@ void SchXMLPlotAreaContext::EndElement() SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::list< DataRowPointStyle >& rStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, sal_Int32& rIndex, bool bSymbolSizeForSeriesIsMissingInFile ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), @@ -908,9 +907,9 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume bool bPositiveValue, bool bYError, tSchXMLLSequencesPerIndex& rSequences) { - uno::Reference< com::sun::star::chart2::data::XDataProvider > xDataProvider(xDoc->getDataProvider()); - uno::Reference< com::sun::star::chart2::data::XDataSource > xDataSource( xBarProp, uno::UNO_QUERY ); - uno::Reference< com::sun::star::chart2::data::XDataSink > xDataSink( xDataSource, uno::UNO_QUERY ); + uno::Reference< css::chart2::data::XDataProvider > xDataProvider(xDoc->getDataProvider()); + uno::Reference< css::chart2::data::XDataSource > xDataSource( xBarProp, uno::UNO_QUERY ); + uno::Reference< css::chart2::data::XDataSink > xDataSink( xDataSource, uno::UNO_QUERY ); assert( xDataSink.is() && xDataSource.is() && xDataProvider.is() ); @@ -968,8 +967,7 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext( const OUString& rLocalName, const OUString &rSeriesStyleName, ::std::list< DataRowPointStyle >& rStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ContextType eContextType, const awt::Size & rChartSize, tSchXMLLSequencesPerIndex & rLSequencesPerIndex) : @@ -1018,7 +1016,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere if ( aAny.hasValue() ) { - sal_Int32 aBarStyle = com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 aBarStyle = css::chart::ErrorBarStyle::NONE; aAny >>= aBarStyle; xBarProp->setPropertyValue("ErrorBarStyle", aAny); @@ -1085,7 +1083,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere aAny = SchXMLTools::getPropertyFromContext("PercentageError", pSeriesStyleContext, pStylesCtxt); - if( aAny.hasValue() && aBarStyle == com::sun::star::chart::ErrorBarStyle::RELATIVE ) + if( aAny.hasValue() && aBarStyle == css::chart::ErrorBarStyle::RELATIVE ) { xBarProp->setPropertyValue("PositiveError", aAny); xBarProp->setPropertyValue("NegativeError", aAny); @@ -1093,7 +1091,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere switch(aBarStyle) { - case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: + case css::chart::ErrorBarStyle::ERROR_MARGIN: { aAny = SchXMLTools::getPropertyFromContext("NegativeError", pSeriesStyleContext,pStylesCtxt); @@ -1161,7 +1159,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax uno::Reference< beans::XPropertySet > xBarProp( xFact->createInstance("com.sun.star.chart2.ErrorBar" ), uno::UNO_QUERY ); - xBarProp->setPropertyValue("ErrorBarStyle",uno::makeAny(com::sun::star::chart::ErrorBarStyle::NONE)); + xBarProp->setPropertyValue("ErrorBarStyle",uno::makeAny(css::chart::ErrorBarStyle::NONE)); xBarProp->setPropertyValue("PositiveError",uno::makeAny(static_cast<double>(0.0))); xBarProp->setPropertyValue("NegativeError",uno::makeAny(static_cast<double>(0.0))); xBarProp->setPropertyValue("Weight",uno::makeAny(static_cast<double>(1.0))); diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 0a77d653d1e1..f9cae3eb3cc8 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -48,7 +48,7 @@ public: explicit SchXML3DSceneAttributesHelper( SvXMLImport& rImporter ); virtual ~SchXML3DSceneAttributesHelper(); - void getCameraDefaultFromDiagram( const ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram >& xDiagram ); + void getCameraDefaultFromDiagram( const css::uno::Reference< css::chart::XDiagram >& xDiagram ); private: SchXML3DSceneAttributesHelper(); @@ -65,7 +65,7 @@ public: bool hasPosSize() const; bool isAutomatic() const; - ::com::sun::star::awt::Rectangle getRectangle() const { return css::awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );} + css::awt::Rectangle getRectangle() const { return css::awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );} private: bool hasSize() const; @@ -73,8 +73,8 @@ private: SvXMLImport& m_rImport; - ::com::sun::star::awt::Point m_aPosition; - ::com::sun::star::awt::Size m_aSize; + css::awt::Point m_aPosition; + css::awt::Size m_aSize; bool m_bHasSizeWidth; bool m_bHasSizeHeight; @@ -96,24 +96,24 @@ public: bool & rAllRangeAddressesAvailable, bool & rColHasLabels, bool & rRowHasLabels, - ::com::sun::star::chart::ChartDataRowSource & rDataRowSource, + css::chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, const OUString& aChartTypeServiceName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, - const ::com::sun::star::awt::Size & rChartSize ); + const css::awt::Size & rChartSize ); virtual ~SchXMLPlotAreaContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; private: SchXMLImportHelper& mrImportHelper; - ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram; - ::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxNewDoc; + css::uno::Reference< css::chart::XDiagram > mxDiagram; + css::uno::Reference< css::chart2::XChartDocument > mxNewDoc; ::std::vector< SchXMLAxis > maAxes; OUString& mrCategoriesAddress; SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles; @@ -133,33 +133,32 @@ private: bool& m_rbHasRangeAtPlotArea; bool & mrColHasLabels; bool & mrRowHasLabels; - ::com::sun::star::chart::ChartDataRowSource & mrDataRowSource; + css::chart::ChartDataRowSource & mrDataRowSource; OUString maChartTypeServiceName; tSchXMLLSequencesPerIndex & mrLSequencesPerIndex; bool mbGlobalChartTypeUsedBySeries; - ::com::sun::star::awt::Size maChartSize; + css::awt::Size maChartSize; }; class SchXMLDataPointContext : public SvXMLImportContext { private: ::std::list< DataRowPointStyle >& mrStyleList; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; sal_Int32& mrIndex; bool mbSymbolSizeForSeriesIsMissingInFile; public: SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::list< DataRowPointStyle >& rStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32& rIndex, - bool bSymbolSizeForSeriesIsMissingInFile ); + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + sal_Int32& rIndex, + bool bSymbolSizeForSeriesIsMissingInFile ); virtual ~SchXMLDataPointContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLCoordinateRegionContext : public SvXMLImportContext @@ -171,7 +170,7 @@ public: , const OUString& rLocalName , SchXMLPositonAttributesHelper& rPositioning ); virtual ~SchXMLCoordinateRegionContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLPositonAttributesHelper& m_rPositioning; @@ -188,7 +187,7 @@ public: private: SchXMLImportHelper& mrImportHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::chart::X3DDisplay > mxWallFloorSupplier; + css::uno::Reference< css::chart::X3DDisplay > mxWallFloorSupplier; ContextType meContextType; public: @@ -196,10 +195,10 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, + css::uno::Reference< css::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLWallFloorContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLStockContext : public SvXMLImportContext @@ -214,7 +213,7 @@ public: private: SchXMLImportHelper& mrImportHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XStatisticDisplay > mxStockPropProvider; + css::uno::Reference< css::chart::XStatisticDisplay > mxStockPropProvider; ContextType meContextType; public: @@ -222,10 +221,10 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, + css::uno::Reference< css::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLStockContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLStatisticsObjectContext : public SvXMLImportContext @@ -244,27 +243,25 @@ public: const OUString& rLocalName, const OUString &rSeriesStyleName, ::std::list< DataRowPointStyle >& rStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ContextType eContextType, - const ::com::sun::star::awt::Size & rChartSize, + const css::awt::Size & rChartSize, tSchXMLLSequencesPerIndex & rLSequencesPerIndex ); virtual ~SchXMLStatisticsObjectContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper & mrImportHelper; ::std::list< DataRowPointStyle > & mrStyleList; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; ContextType meContextType; - ::com::sun::star::awt::Size maChartSize; + css::awt::Size maChartSize; OUString maSeriesStyleName; tSchXMLLSequencesPerIndex& mrLSequencesPerIndex; }; diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx index e5e8e1b0a6be..afa6a7c42f9d 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx @@ -29,17 +29,17 @@ public: SchXMLPropertyMappingContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName, tSchXMLLSequencesPerIndex& rLSequencesPerIndex, - com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries > xSeries ); + css::uno::Reference< + css::chart2::XDataSeries > xSeries ); virtual ~SchXMLPropertyMappingContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: - com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxChartDocument; + css::uno::Reference< css::chart2::XChartDocument > mxChartDocument; SchXMLImportHelper& mrImportHelper; - com::sun::star::uno::Reference< com::sun::star::chart2::XDataSeries > mxDataSeries; + css::uno::Reference< css::chart2::XDataSeries > mxDataSeries; tSchXMLLSequencesPerIndex& mrLSequencesPerIndex; diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx index 6ad9775f4dcb..49274b5d9a42 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx @@ -36,23 +36,22 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, std::list< RegressionStyle >& rRegressionStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::com::sun::star::awt::Size & rChartSize ); + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + const css::awt::Size & rChartSize ); virtual ~SchXMLRegressionCurveObjectContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper& mrImportHelper; - com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries > mxSeries; - com::sun::star::awt::Size maChartSize; + css::uno::Reference<css::chart2::XDataSeries > mxSeries; + css::awt::Size maChartSize; std::list< RegressionStyle >& mrRegressionStyleList; }; @@ -64,21 +63,19 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::com::sun::star::awt::Size & rChartSize, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + const css::awt::Size & rChartSize, RegressionStyle & rRegressionStyle ); virtual ~SchXMLEquationContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper& mrImportHelper; RegressionStyle& mrRegressionStyle; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > mxSeries; - ::com::sun::star::awt::Size maChartSize; + css::uno::Reference< css::chart2::XDataSeries > mxSeries; + css::awt::Size maChartSize; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx index 57c8d9f74cb1..03c723137a00 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.hxx +++ b/xmloff/source/chart/SchXMLSeries2Context.hxx @@ -43,13 +43,12 @@ class SchXMLSeries2Context : public SvXMLImportContext { private: SchXMLImportHelper& mrImportHelper; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > mxNewDoc; + css::uno::Reference< css::chart2::XChartDocument > mxNewDoc; ::std::vector< SchXMLAxis >& mrAxes; ::std::list< DataRowPointStyle >& mrStyleList; ::std::list< RegressionStyle >& mrRegressionStyleList; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; sal_Int32 mnSeriesIndex; sal_Int32 mnDataPointIndex; bool m_bStockHasVolume; @@ -68,13 +67,12 @@ private: tSchXMLLSequencesPerIndex maPostponedSequences; bool& mrGlobalChartTypeUsedBySeries; bool mbSymbolSizeIsMissingInFile; - ::com::sun::star::awt::Size maChartSize; + css::awt::Size maChartSize; public: SchXMLSeries2Context( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xNewDoc, + const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc, std::vector< SchXMLAxis >& rAxes, ::std::list< DataRowPointStyle >& rStyleList, ::std::list< RegressionStyle >& rRegressionStyleList, @@ -84,18 +82,18 @@ public: const OUString & aGlobalChartTypeName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, bool& rGlobalChartTypeUsedBySeries, - const ::com::sun::star::awt::Size & rChartSize ); + const css::awt::Size & rChartSize ); virtual ~SchXMLSeries2Context(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; static void initSeriesPropertySets( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles - , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static void setDefaultsToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles ); diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 3ac2e358bd8c..d70b8f6ddb34 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -601,7 +601,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index 67bbdb2bfeab..21ba2fdf63a9 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -43,8 +43,8 @@ private: bool mbHasRowPermutation; bool mbHasColumnPermutation; - ::com::sun::star::uno::Sequence< sal_Int32 > maRowPermutation; - ::com::sun::star::uno::Sequence< sal_Int32 > maColumnPermutation; + css::uno::Sequence< sal_Int32 > maRowPermutation; + css::uno::Sequence< sal_Int32 > maColumnPermutation; public: SchXMLTableContext( SchXMLImportHelper& rImpHelper, @@ -56,27 +56,27 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - void setRowPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation ); - void setColumnPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation ); + void setRowPermutation( const css::uno::Sequence< sal_Int32 > & rPermutation ); + void setColumnPermutation( const css::uno::Sequence< sal_Int32 > & rPermutation ); }; class SchXMLTableHelper { public: static void applyTableToInternalDataProvider( const SchXMLTable& rTable, - com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc ); + css::uno::Reference< css::chart2::XChartDocument > xChartDoc ); /** This function reorders local data to fit the correct data structure. Call it after the data series got their styles set. */ static void switchRangesFromOuterToInternalIfNecessary( const SchXMLTable& rTable, const tSchXMLLSequencesPerIndex & rLSequencesPerIndex, - com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc, - ::com::sun::star::chart::ChartDataRowSource eDataRowSource ); + css::uno::Reference< css::chart2::XChartDocument > xChartDoc, + css::chart::ChartDataRowSource eDataRowSource ); }; // classes for columns @@ -100,7 +100,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLTableColumnContext : public SvXMLImportContext @@ -113,7 +113,7 @@ public: const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableColumnContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; // classes for rows @@ -134,7 +134,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLTableRowContext : public SvXMLImportContext @@ -153,7 +153,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; // classes for cells and their content @@ -177,8 +177,8 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index 786200b9e81d..e4a4ee06d162 100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -41,7 +41,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: OUString& m_rText; diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx index db4508fcff9b..f6f97bfcd5ef 100644 --- a/xmloff/source/chart/SchXMLTextListContext.hxx +++ b/xmloff/source/chart/SchXMLTextListContext.hxx @@ -32,18 +32,18 @@ class SchXMLTextListContext : public SvXMLImportContext public: SchXMLTextListContext( SvXMLImport& rImport, const OUString& rLocalName, - ::com::sun::star::uno::Sequence< OUString>& rTextList ); + css::uno::Sequence< OUString>& rTextList ); virtual ~SchXMLTextListContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: - ::com::sun::star::uno::Sequence< OUString>& m_rTextList; + css::uno::Sequence< OUString>& m_rTextList; std::vector< OUString> m_aTextVector; }; diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 0f1650595ae6..bb5d011d214f 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -830,7 +830,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame: return bResult; } -bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel) +bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const css::uno::Reference< css::frame::XModel >& xChartModel) { bool bResult = false; OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx index 004a2ab16bee..567fa3b5791b 100644 --- a/xmloff/source/chart/SchXMLTools.hxx +++ b/xmloff/source/chart/SchXMLTools.hxx @@ -42,14 +42,14 @@ class SvXMLExport; namespace SchXMLTools { - bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); - bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); - bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); - bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); - bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const css::uno::Reference< css::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const css::uno::Reference< css::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const css::uno::Reference< css::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const css::uno::Reference< css::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const css::uno::Reference< css::frame::XModel >& xChartModel); - void setBuildIDAtImportInfo( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel - , ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xImportInfo ); + void setBuildIDAtImportInfo( css::uno::Reference< css::frame::XModel > xModel + , css::uno::Reference< css::beans::XPropertySet > xImportInfo ); enum SchXMLChartTypeEnum { @@ -78,28 +78,26 @@ namespace SchXMLTools OUString GetNewChartTypeName( const OUString & rOldChartTypeName ); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence2 > GetNewLabeledDataSequence(); + css::uno::Reference< + css::chart2::data::XLabeledDataSequence2 > GetNewLabeledDataSequence(); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > CreateDataSequence( + css::uno::Reference< css::chart2::data::XDataSequence > CreateDataSequence( const OUString& rRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > CreateDataSequenceWithoutConvert( + css::uno::Reference< css::chart2::data::XDataSequence > CreateDataSequenceWithoutConvert( const OUString& rRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); void CreateCategories( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > & xDataProvider, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xNewDoc, + const css::uno::Reference< css::chart2::data::XDataProvider > & xDataProvider, + const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc, const OUString & rRangeAddress, sal_Int32 nCooSysIndex, sal_Int32 nDimensionIndex, tSchXMLLSequencesPerIndex * pLSequencesPerIndex = nullptr ); - ::com::sun::star::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); + css::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsLFs ); @@ -110,8 +108,7 @@ namespace SchXMLTools given in rXMLRange */ void setXMLRangePropertyAtDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xDataSequence, + const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence, const OUString & rXMLRange ); /** checks if the data sequence has the property "CachedXMLRange" (true for @@ -124,20 +121,18 @@ namespace SchXMLTools @return true, if the property was found, assigned and is non-empty */ bool getXMLRangePropertyFromDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xDataSequence, + const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence, OUString & rOutXMLRange, bool bClearProp = false ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > getDataProviderFromParent( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + css::uno::Reference< css::chart2::data::XDataProvider > getDataProviderFromParent( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); - bool switchBackToDataProviderFromParent( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDoc + bool switchBackToDataProviderFromParent( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc , const tSchXMLLSequencesPerIndex & rLSequencesPerIndex ); void copyProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xDestination ); + const css::uno::Reference< css::beans::XPropertySet > & xSource, + const css::uno::Reference< css::beans::XPropertySet > & xDestination ); } #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTOOLS_HXX diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx index de047a7444de..2f876e9dc8c5 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx @@ -50,7 +50,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { if( !m_bCrossingValue ) { - rValue <<= ::com::sun::star::chart::ChartAxisPosition_START; + rValue <<= css::chart::ChartAxisPosition_START; bResult = true; } } @@ -58,7 +58,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { if( !m_bCrossingValue ) { - rValue <<= ::com::sun::star::chart::ChartAxisPosition_END; + rValue <<= css::chart::ChartAxisPosition_END; bResult = true; } } @@ -66,7 +66,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { if( !m_bCrossingValue ) { - rValue <<= ::com::sun::star::chart::ChartAxisPosition_ZERO; + rValue <<= css::chart::ChartAxisPosition_ZERO; bResult = true; } } @@ -74,7 +74,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { if( !m_bCrossingValue ) { - rValue <<= ::com::sun::star::chart::ChartAxisPosition_VALUE; + rValue <<= css::chart::ChartAxisPosition_VALUE; bResult = true; } else @@ -107,19 +107,19 @@ bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue, } else { - ::com::sun::star::chart::ChartAxisPosition ePosition( ::com::sun::star::chart::ChartAxisPosition_ZERO ); + css::chart::ChartAxisPosition ePosition( css::chart::ChartAxisPosition_ZERO ); rValue >>= ePosition; switch(ePosition) { - case ::com::sun::star::chart::ChartAxisPosition_START: + case css::chart::ChartAxisPosition_START: rStrExpValue = GetXMLToken( XML_START ); bResult = true; break; - case ::com::sun::star::chart::ChartAxisPosition_END: + case css::chart::ChartAxisPosition_END: rStrExpValue = GetXMLToken( XML_END ); bResult = true; break; - case ::com::sun::star::chart::ChartAxisPosition_ZERO: + case css::chart::ChartAxisPosition_ZERO: ::sax::Converter::convertDouble( sValueBuffer, 0.0 ); rStrExpValue = sValueBuffer.makeStringAndClear(); bResult = true; diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx index 97d0c9b271e4..3c845d372fda 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx @@ -27,8 +27,8 @@ public: explicit XMLAxisPositionPropertyHdl( bool bCrossingValue ); virtual ~XMLAxisPositionPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: bool m_bCrossingValue; diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx index bbe9c444c849..6f139cd174a1 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.hxx +++ b/xmloff/source/chart/XMLChartPropertyContext.hxx @@ -27,8 +27,7 @@ public: XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState >& rProps, const rtl::Reference< SvXMLImportPropertyMapper >& rMapper ); @@ -38,8 +37,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) override; diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx index 087ed323db0f..49237aa6b105 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star; -XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) +XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType ) : XMLEnumPropertyHdl( pEnumMap, rType ) { } @@ -44,10 +44,10 @@ bool XMLErrorBarStylePropertyHdl::exportXML( OUString& rStrExpValue, sal_Int32 nValue = 0; if(rValue >>= nValue ) { - if( nValue == ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR - || nValue == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ) + if( nValue == css::chart::ErrorBarStyle::STANDARD_ERROR + || nValue == css::chart::ErrorBarStyle::FROM_DATA ) { - nValue = ::com::sun::star::chart::ErrorBarStyle::NONE; + nValue = css::chart::ErrorBarStyle::NONE; aValue = uno::makeAny(nValue); } } diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx index d1090b810b2c..f06d305848d0 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx @@ -24,10 +24,10 @@ class XMLErrorBarStylePropertyHdl : public XMLEnumPropertyHdl { public: - XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ); + XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType ); virtual ~XMLErrorBarStylePropertyHdl(); - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORBARSTYLEPROPERTYHDL_HXX diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx index 3f02d57c93d4..2ce64cc86caf 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx @@ -31,8 +31,8 @@ public: {} virtual ~XMLErrorIndicatorPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORINDICATORPROPERTYHDL_HXX diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx index da52a4bf1717..9cd1b6c29516 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx @@ -31,11 +31,11 @@ public: ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLLabelSeparatorContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; private: diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx index ffb55f7bc8f2..3b0d20d38a20 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.hxx +++ b/xmloff/source/chart/XMLSymbolImageContext.hxx @@ -35,16 +35,16 @@ public: ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLSymbolImageContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; private: OUString msURL; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; + css::uno::Reference < css::io::XOutputStream > mxBase64Stream; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLIMAGECONTEXT_HXX diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx index 27382a26a2f4..009198e53cbb 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx @@ -27,8 +27,8 @@ public: explicit XMLSymbolTypePropertyHdl( bool bIsNamedSymbol ); virtual ~XMLSymbolTypePropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: bool m_bIsNamedSymbol; diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx index 8acec97d5673..7f23e58c1e68 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.cxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx @@ -30,7 +30,7 @@ XMLTextOrientationHdl::~XMLTextOrientationHdl() bool XMLTextOrientationHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { bool bRetval( false ); @@ -51,7 +51,7 @@ bool XMLTextOrientationHdl::importXML( bool XMLTextOrientationHdl::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { bool bVal (false ); diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx index 0300c1d6eafc..da7d0b37f100 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.hxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx @@ -28,10 +28,10 @@ public: virtual ~XMLTextOrientationHdl(); virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 091a068a379b..b4b7c0397c49 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -53,7 +53,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; // context for flat file xml format @@ -65,13 +65,13 @@ public: SchXMLImportHelper& i_rImpHelper, SchXMLImport& i_rImport, sal_uInt16 i_nPrefix, const OUString & i_rLName, - const com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties>& i_xDocProps); + const css::uno::Reference<css::document::XDocumentProperties>& i_xDocProps); virtual ~SchXMLFlatDocContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& i_xAttrList) override; }; class SchXMLBodyContext : public SvXMLImportContext @@ -91,7 +91,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx index c32a5428e213..a384e2138e8c 100644 --- a/xmloff/source/chart/transporttypes.hxx +++ b/xmloff/source/chart/transporttypes.hxx @@ -36,7 +36,7 @@ enum SchXMLCellType struct SchXMLCell { OUString aString; - ::com::sun::star::uno::Sequence< OUString > aComplexString; + css::uno::Sequence< OUString > aComplexString; double fValue; SchXMLCellType eType; OUString aRangeId; @@ -84,7 +84,7 @@ enum SchXMLLabeledSequencePart }; typedef ::std::pair< tSchXMLIndex, SchXMLLabeledSequencePart > tSchXMLIndexWithPart; typedef ::std::multimap< tSchXMLIndexWithPart, - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tSchXMLLSequencesPerIndex; bool operator < ( const tSchXMLIndexWithPart & rFirst, const tSchXMLIndexWithPart & rSecond ); @@ -147,15 +147,15 @@ struct GlobalSeriesImportInfo struct RegressionStyle { - com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries > m_xSeries; - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > m_xEquationProperties; + css::uno::Reference< + css::chart2::XDataSeries > m_xSeries; + css::uno::Reference< + css::beans::XPropertySet > m_xEquationProperties; OUString msStyleName; - RegressionStyle(const com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries >& xSeries, + RegressionStyle(const css::uno::Reference< + css::chart2::XDataSeries >& xSeries, const OUString& sStyleName) : m_xSeries ( xSeries ), msStyleName ( sStyleName ) @@ -173,17 +173,13 @@ struct DataRowPointStyle }; StyleType meType; - com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > m_xOldAPISeries; + css::uno::Reference< css::beans::XPropertySet > m_xOldAPISeries; - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > m_xErrorXProperties; + css::uno::Reference< css::beans::XPropertySet > m_xErrorXProperties; - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > m_xErrorYProperties; + css::uno::Reference< css::beans::XPropertySet > m_xErrorYProperties; sal_Int32 m_nPointIndex; sal_Int32 m_nPointRepeat; @@ -193,8 +189,7 @@ struct DataRowPointStyle bool mbSymbolSizeForSeriesIsMissingInFile; DataRowPointStyle( StyleType eType - , const com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries >& xSeries + , const css::uno::Reference< css::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex , sal_Int32 nPointRepeat , const OUString& sStyleName @@ -210,8 +205,8 @@ struct DataRowPointStyle {} }; -typedef ::std::multimap< OUString, ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap; +typedef ::std::multimap< OUString, css::uno::Reference< + css::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap; #endif // INCLUDED_XMLOFF_SOURCE_CHART_TRANSPORTTYPES_HXX |