diff options
Diffstat (limited to 'chart2/source/inc')
39 files changed, 273 insertions, 273 deletions
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 5d4ef5e0228d..3fa9ee7b9034 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -75,7 +75,7 @@ public: /** creates a sequence and initializes it with the given string. This is especially useful for labels, which only have one element. */ - explicit CachedDataSequence( const ::rtl::OUString & rSingleText ); + explicit CachedDataSequence( const OUString & rSingleText ); /// Copy CTOR explicit CachedDataSequence( const CachedDataSequence & rSource ); @@ -105,9 +105,9 @@ protected: // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation() + virtual OUString SAL_CALL getSourceRangeRepresentation() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel( + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) @@ -120,7 +120,7 @@ protected: // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() @@ -140,7 +140,7 @@ protected: // <properties> sal_Int32 m_nNumberFormatKey; - ::rtl::OUString m_sRole; + OUString m_sRole; // </properties> enum DataType @@ -161,7 +161,7 @@ private: ::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const; /** is used by interface method getTextualData(). */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > Impl_getTextualData() const; + ::com::sun::star::uno::Sequence< OUString > Impl_getTextualData() const; /** is used by interface method getData(). */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Impl_getMixedData() const; @@ -170,7 +170,7 @@ private: enum DataType m_eCurrentDataType; ::com::sun::star::uno::Sequence< double > m_aNumericalSequence; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTextualSequence; + ::com::sun::star::uno::Sequence< OUString > m_aTextualSequence; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedSequence; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 2ea057e012ce..c1165429c2a8 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -79,10 +79,10 @@ public: getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType , sal_Int32 nDimensionIndex ); - static rtl::OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference< + static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static rtl::OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference< + static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index cf4d7f069df5..32885299aab4 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -210,7 +210,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); OOO_DLLPUBLIC_CHARTTOOLS -::com::sun::star::uno::Sequence< rtl::OUString > DataSequenceToStringSequence( +::com::sun::star::uno::Sequence< OUString > DataSequenceToStringSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); @@ -261,9 +261,9 @@ OOO_DLLPUBLIC_CHARTTOOLS sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny ); OOO_DLLPUBLIC_CHARTTOOLS -bool replaceParamterInString( rtl::OUString & rInOutResourceString, - const rtl::OUString & rParamToReplace, - const rtl::OUString & rReplaceWith ); +bool replaceParamterInString( OUString & rInOutResourceString, + const OUString & rParamToReplace, + const OUString & rReplaceWith ); //............................................................................. } //namespace chart diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index a88650d6e797..458d29d7177f 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -70,18 +70,18 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::co }; /** unary function to convert ::com::sun::star::uno::Any into an - ::rtl::OUString. + OUString. */ -struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, ::rtl::OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, OUString > { - ::rtl::OUString operator() ( const ::com::sun::star::uno::Any & rAny ) + OUString operator() ( const ::com::sun::star::uno::Any & rAny ) { ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() ); if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE ) { const double* pDouble = reinterpret_cast< const double * >( rAny.getValue() ); if( ::rtl::math::isNan(*pDouble) ) - return ::rtl::OUString(); + return OUString(); return ::rtl::math::doubleToUString( * pDouble, rtl_math_StringFormat_Automatic, @@ -92,20 +92,20 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co } else if( eClass == ::com::sun::star::uno::TypeClass_STRING ) { - return * reinterpret_cast< const ::rtl::OUString * >( rAny.getValue() ); + return * reinterpret_cast< const OUString * >( rAny.getValue() ); } - return ::rtl::OUString(); + return OUString(); } }; -/** unary function to convert an ::rtl::OUString into a double number. +/** unary function to convert an OUString into a double number. <p>For conversion rtl::math::StringToDouble is used.</p> */ -struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< ::rtl::OUString, double > +struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< OUString, double > { - double operator() ( const ::rtl::OUString & rStr ) + double operator() ( const OUString & rStr ) { rtl_math_ConversionStatus eConversionStatus; double fResult = ::rtl::math::stringToDouble( rStr, '.', ',', & eConversionStatus, NULL ); @@ -117,13 +117,13 @@ struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< } }; -/** unary function to convert a double number into an ::rtl::OUString. +/** unary function to convert a double number into an OUString. <p>For conversion rtl::math::DoubleToOUString is used.</p> */ -struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, ::rtl::OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, OUString > { - ::rtl::OUString operator() ( double fNumber ) + OUString operator() ( double fNumber ) { return ::rtl::math::doubleToUString( fNumber, diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index c22df438b4c8..e6d5a3686bce 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -66,7 +66,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ ConfigItemListener ____ - SAL_DLLPRIVATE virtual void notify( const ::rtl::OUString & rPropertyName ); + SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName ); private: SAL_DLLPRIVATE void retrieveConfigColors(); diff --git a/chart2/source/inc/ConfigItemListener.hxx b/chart2/source/inc/ConfigItemListener.hxx index 4526b4291bd5..d050fa59fcb3 100644 --- a/chart2/source/inc/ConfigItemListener.hxx +++ b/chart2/source/inc/ConfigItemListener.hxx @@ -28,7 +28,7 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS ConfigItemListener { public: - virtual void notify( const ::rtl::OUString & rPropertyName ) = 0; + virtual void notify( const OUString & rPropertyName ) = 0; protected: ~ConfigItemListener() {} diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index 55c1a2247b0f..c92803097860 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -136,7 +136,7 @@ template< typename T > example: - ::std::multimap< sal_Int32, ::rtl::OUString > aMyMultiMap; + ::std::multimap< sal_Int32, OUString > aMyMultiMap; uno::Sequence< sal_Int32 > aMyKeys( ContainerHelper::MapKeysToSequence( aMyMultiMap )); // note: aMyKeys may contain duplicate keys here */ @@ -154,8 +154,8 @@ template< class Map > example: - ::std::map< sal_Int32, ::rtl::OUString > aMyMultiMap; - uno::Sequence< ::rtl::OUString > aMyValues( ContainerHelper::MapValuesToSequence( aMyMultiMap )); + ::std::map< sal_Int32, OUString > aMyMultiMap; + uno::Sequence< OUString > aMyValues( ContainerHelper::MapValuesToSequence( aMyMultiMap )); */ template< class Map > ::com::sun::star::uno::Sequence< typename Map::mapped_type > MapValuesToSequence( diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index a8a2dc8aa470..02f64f8ee5f3 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -39,7 +39,7 @@ namespace chart namespace DataSeriesHelper { -::rtl::OUString GetRole( +OUString GetRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence ); @@ -56,7 +56,7 @@ namespace DataSeriesHelper OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > getDataSequenceByRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xSource, - ::rtl::OUString aRole, + OUString aRole, bool bMatchPrefix = false ); /** Retrieves all data sequences in the given data source that match the given @@ -73,7 +73,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::std::vector< getAllDataSequencesByRole( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > & aDataSequences, - ::rtl::OUString aRole, + OUString aRole, bool bMatchPrefix = false ); /** Retrieves all data sequences found in the given data series and puts them @@ -93,14 +93,14 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< The data sequence contained in xSeries that has this role will be used to take its label. */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getDataSeriesLabel( +OOO_DLLPUBLIC_CHARTTOOLS OUString getDataSeriesLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::rtl::OUString & rLabelSequenceRole ); + const OUString & rLabelSequenceRole ); /** Get the label of a labeled sequence including neccessary automatic generation */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getLabelForLabeledDataSequence( +OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xLabeledSeq ); @@ -157,13 +157,13 @@ void makeLinesThickOrThin( const ::com::sun::star::uno::Reference< OOO_DLLPUBLIC_CHARTTOOLS void setPropertyAlsoToAllAttributedDataPoints( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rPropertyValue ); OOO_DLLPUBLIC_CHARTTOOLS bool hasAttributedDataPointDifferentValue( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rPropertyValue ); OOO_DLLPUBLIC_CHARTTOOLS bool areAllSeriesAttachedToSameAxis( diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index bfad44998bf2..d5ab613b5ada 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -53,7 +53,7 @@ public: createCachedDataSequence(); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - createCachedDataSequence( const ::rtl::OUString & rSingleText ); + createCachedDataSequence( const OUString & rSingleText ); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > createLabeledDataSequence( @@ -74,12 +74,12 @@ public: static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > createArguments( - const ::rtl::OUString & rRangeRepresentation, + const OUString & rRangeRepresentation, const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ); SAL_DLLPRIVATE static void readArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments - , ::rtl::OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping + , OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories ); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > @@ -90,13 +90,13 @@ public: static void addRangeRepresentationsFromLabeledDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence - , ::std::vector< ::rtl::OUString >& rOutRangeRepresentations ); + , ::std::vector< OUString >& rOutRangeRepresentations ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges( + static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel ); @@ -113,7 +113,7 @@ public: static bool detectRangeSegmentation( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel - , ::rtl::OUString& rOutRangeString + , OUString& rOutRangeString , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& rOutUseColumns , bool& rOutFirstCellAsLabel @@ -137,15 +137,15 @@ public: static bool allArgumentsForRectRangeDetected( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromLabeledDataSequence( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromLabeledDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq ); - SAL_DLLPRIVATE static ::rtl::OUString getRangeFromValues( + SAL_DLLPRIVATE static OUString getRangeFromValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromDataSource( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xSource ); }; diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 51896e85b51e..5b1bb7bda23f 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -53,7 +53,7 @@ public: typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate >, - ::rtl::OUString > + OUString > tTemplateWithServiceName; /** tries to find a template in the chart-type manager that matches the @@ -75,7 +75,7 @@ public: ::com::sun::star::chart2::XDiagram > & xDiagram, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xChartTypeManager, - const ::rtl::OUString & rPreferredTemplateName = ::rtl::OUString()); + const OUString & rPreferredTemplateName = OUString()); /** Sets the "SwapXAndYAxis" property at all coordinate systems found in the given diagram. @@ -224,12 +224,12 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); - static ::com::sun::star::uno::Sequence< rtl::OUString > + static ::com::sun::star::uno::Sequence< OUString > getExplicitSimpleCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< rtl::OUString > + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > generateAutomaticCategoriesFromCooSys( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCooSys ); diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index d96ef67253a1..a8feca551032 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -34,10 +34,10 @@ namespace chart struct OOO_DLLPUBLIC_CHARTTOOLS ComplexCategory { - rtl::OUString Text; + OUString Text; sal_Int32 Count; - ComplexCategory( const rtl::OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount) + ComplexCategory( const OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount) {} }; @@ -47,7 +47,7 @@ public: virtual ~SplitCategoriesProvider(); virtual sal_Int32 getLevelCount() const = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0; + virtual ::com::sun::star::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0; }; struct DatePlusIndex @@ -83,20 +83,20 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > getOriginalCategories(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > getSimpleCategories(); + ::com::sun::star::uno::Sequence< OUString > getSimpleCategories(); const std::vector<ComplexCategory>* getCategoriesByLevel( sal_Int32 nLevel ); - static ::rtl::OUString getCategoryByIndex( + static OUString getCategoryByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , sal_Int32 nIndex ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getExplicitSimpleCategories( + static ::com::sun::star::uno::Sequence< OUString > getExplicitSimpleCategories( const SplitCategoriesProvider& rSplitCategoriesProvider ); - static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< rtl::OUString >& rOutTexts + static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< OUString >& rOutTexts , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rInAnys , ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xChartModel ); @@ -119,7 +119,7 @@ private: //member ::com::sun::star::chart2::data::XLabeledDataSequence> m_xOriginalCategories; bool m_bIsExplicitCategoriesInited; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aExplicitCategories; + ::com::sun::star::uno::Sequence< OUString > m_aExplicitCategories; ::std::vector< ::std::vector< ComplexCategory > > m_aComplexCats; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList; diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index bb80a956e280..b928db423322 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -32,7 +32,7 @@ public: virtual ~ExponentialRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index ae964dc29a0d..0dadc937cea6 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -38,7 +38,7 @@ public: createFormattedStringSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext - , const ::rtl::OUString & rString + , const OUString & rString , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xTextProperties ) throw(); }; diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index e2f93d4c4f3b..3b6cd9a46da0 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -83,13 +83,13 @@ public: APPHELPER_SERVICE_FACTORY_HELPER(InternalDataProvider) // ____ XInternalDataProvider ____ - virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const ::rtl::OUString& aRange ) + virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getDataByRangeRepresentation( const ::rtl::OUString& aRange ) + getDataByRangeRepresentation( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDataByRangeRepresentation( - const ::rtl::OUString& aRange, + const OUString& aRange, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) @@ -124,22 +124,22 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( - const ::rtl::OUString& aRangeRepresentation ) + const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( - const ::rtl::OUString& aRangeRepresentation ) + const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() throw (::com::sun::star::uno::RuntimeException); // ____ XRangeXMLConversion ____ - virtual ::rtl::OUString SAL_CALL convertRangeToXML( - const ::rtl::OUString& aRangeRepresentation ) + virtual OUString SAL_CALL convertRangeToXML( + const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL convertRangeFromXML( - const ::rtl::OUString& aXMLRange ) + virtual OUString SAL_CALL convertRangeFromXML( + const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -162,17 +162,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) + ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) + ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ @@ -181,15 +181,15 @@ public: virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRowDescriptions( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) + const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setColumnDescriptions( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) + const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartData (base of XChartDataArray) ____ @@ -214,28 +214,28 @@ public: private: void lcl_addDataSequenceToMap( - const ::rtl::OUString & rRangeRepresentation, + const OUString & rRangeRepresentation, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xSequence ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - lcl_createDataSequenceAndAddToMap( const ::rtl::OUString & rRangeRepresentation, - const ::rtl::OUString & rRole ); + lcl_createDataSequenceAndAddToMap( const OUString & rRangeRepresentation, + const OUString & rRole ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - lcl_createDataSequenceAndAddToMap( const ::rtl::OUString & rRangeRepresentation ); + lcl_createDataSequenceAndAddToMap( const OUString & rRangeRepresentation ); - void lcl_deleteMapReferences( const ::rtl::OUString & rRangeRepresentation ); + void lcl_deleteMapReferences( const OUString & rRangeRepresentation ); void lcl_adaptMapReferences( - const ::rtl::OUString & rOldRangeRepresentation, - const ::rtl::OUString & rNewRangeRepresentation ); + const OUString & rOldRangeRepresentation, + const OUString & rNewRangeRepresentation ); void lcl_increaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd ); void lcl_decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd ); - typedef ::std::multimap< ::rtl::OUString, + typedef ::std::multimap< OUString, ::com::sun::star::uno::WeakReference< ::com::sun::star::chart2::data::XDataSequence > > tSequenceMap; typedef ::std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange; diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index b48c6a3825b8..c2cc8807671b 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -32,7 +32,7 @@ public: virtual ~LinearRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index 053cb5d8c413..b3709105b1f7 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -32,7 +32,7 @@ public: virtual ~LogarithmicRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index 69be677cfe2e..bc842e513b03 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -32,7 +32,7 @@ public: virtual ~MeanValueRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 0976b1352bb6..48896c7c9003 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -80,34 +80,34 @@ public: //@todo define this for debug only, except URL sal_Bool AsTemplate; //document is a template. sal_Bool ISSET_AsTemplate; - ::rtl::OUString Author; + OUString Author; sal_Bool ISSET_Author; - ::rtl::OUString CharacterSet; //identifier of used character set. + OUString CharacterSet; //identifier of used character set. sal_Bool ISSET_CharacterSet; - ::rtl::OUString Comment; + OUString Comment; sal_Bool ISSET_Comment; ::com::sun::star::uno::Any ComponentData; sal_Bool ISSET_ComponentData; - ::rtl::OUString FileName; //deprecated, same as url + OUString FileName; //deprecated, same as url sal_Bool ISSET_FileName; ::com::sun::star::uno::Any FilterData; sal_Bool ISSET_FilterData; - ::rtl::OUString FilterName; //internal filter name. + OUString FilterName; //internal filter name. sal_Bool ISSET_FilterName; - ::rtl::OUString FilterFlags;//deprecated, + OUString FilterFlags;//deprecated, sal_Bool ISSET_FilterFlags; - ::rtl::OUString FilterOptions; + OUString FilterOptions; sal_Bool ISSET_FilterOptions; //not documented ... @todo remove? - ::rtl::OUString FrameName; //name of target frame. + OUString FrameName; //name of target frame. sal_Bool ISSET_FrameName; sal_Bool Hidden; //load document, invisible. sal_Bool ISSET_Hidden; - ::rtl::OUString HierarchicalDocumentName; + OUString HierarchicalDocumentName; sal_Bool ISSET_HierarchicalDocumentName; @@ -121,17 +121,17 @@ public: InteractionHandler; //::com::sun::star::task::XInteractionHandler sal_Bool ISSET_InteractionHandler; - ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. + OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. sal_Bool ISSET_JumpMark; - ::rtl::OUString MediaType; //mime type. + OUString MediaType; //mime type. sal_Bool ISSET_MediaType; - ::rtl::OUString OpenFlags; //deprecated + OUString OpenFlags; //deprecated sal_Bool ISSET_OpenFlags; sal_Bool OpenNewView; //opens a new view for an already loaded document. sal_Bool ISSET_OpenNewView; sal_Bool Overwrite; //opens a new view for an already loaded document. sal_Bool ISSET_Overwrite; - ::rtl::OUString Password; + OUString Password; sal_Bool ISSET_Password; //not documented ... @todo remove? @@ -142,13 +142,13 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > PostData; //contains the data for HTTP post method as a sequence of bytes. sal_Bool ISSET_PostData; - ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. + OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. sal_Bool ISSET_PostString; sal_Bool Preview; //show preview. sal_Bool ISSET_Preview; sal_Bool ReadOnly; //open document readonly. sal_Bool ISSET_ReadOnly; - ::rtl::OUString Referer; //name of document referrer. + OUString Referer; //name of document referrer. sal_Bool ISSET_Referer; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > @@ -157,13 +157,13 @@ public: //not documented ... @todo remove? sal_Bool Silent; //prevents dialogs to query for more information. sal_Bool ISSET_Silent; - ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL. + OUString TemplateName; //deprecated, name of the template instead of the URL. sal_Bool ISSET_TemplateName; - ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template. + OUString TemplateRegionName; //deprecated, name of the region of the template. sal_Bool ISSET_TemplateRegionName; sal_Bool Unpacked; sal_Bool ISSET_Unpacked; - ::rtl::OUString URL;// FileName, URL of the document. + OUString URL;// FileName, URL of the document. sal_Bool ISSET_URL; sal_Int16 Version; //storage version. sal_Bool ISSET_Version; diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 3ce68aa73a91..029f4521674e 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -35,7 +35,7 @@ namespace chart //............................................................................. OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer( - const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName ); + const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); namespace impl { @@ -49,26 +49,26 @@ typedef ::cppu::WeakImplHelper3< class NameContainer : public impl::NameContainer_Base { public: - NameContainer( const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName ); + NameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); explicit NameContainer( const NameContainer & rOther ); virtual ~NameContainer(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const rtl::OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw( com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException); // XElementAccess virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException); @@ -82,10 +82,10 @@ private: //methods private: //member const ::com::sun::star::uno::Type m_aType; - const rtl::OUString m_aServicename; - const rtl::OUString m_aImplementationName; + const OUString m_aServicename; + const OUString m_aImplementationName; - typedef ::std::map< ::rtl::OUString, com::sun::star::uno::Any > tContentMap; + typedef ::std::map< OUString, com::sun::star::uno::Any > tContentMap; tContentMap m_aMap; }; diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index d4f6441bcb1b..f15f65150464 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -43,7 +43,7 @@ public: ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; }; - rtl::OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; + OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; Date getNullDate() const; private: //private member @@ -62,7 +62,7 @@ public: , sal_Int32 nNumberFormatKey ); virtual ~FixedNumberFormatter(); - rtl::OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; + OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; private: NumberFormatterWrapper m_aNumberFormatterWrapper; diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 5e26b7482d60..cc226a5031bd 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -172,19 +172,19 @@ protected: // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState( const ::rtl::OUString& PropertyName ) + getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL - getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setPropertyToDefault( const ::rtl::OUString& PropertyName ) + setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL - getPropertyDefault( const ::rtl::OUString& aPropertyName ) + getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -196,11 +196,11 @@ protected: setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -214,7 +214,7 @@ protected: // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 0c4b3c516621..b2e127dbb6be 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -93,7 +93,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier public: ObjectIdentifier(); - ObjectIdentifier( const ::rtl::OUString& rObjectCID ); + ObjectIdentifier( const OUString& rObjectCID ); ObjectIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); ObjectIdentifier( const ::com::sun::star::uno::Any& rAny ); virtual ~ObjectIdentifier(); @@ -104,152 +104,152 @@ public: bool operator!=( const ObjectIdentifier& rOID ) const; bool operator<( const ObjectIdentifier& rOID ) const; - static rtl::OUString createClassifiedIdentifierForObject( + static OUString createClassifiedIdentifierForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString createClassifiedIdentifierForParticle( - const rtl::OUString& rParticle ); + static OUString createClassifiedIdentifierForParticle( + const OUString& rParticle ); - static rtl::OUString createClassifiedIdentifierForParticles( - const rtl::OUString& rParentParticle - , const rtl::OUString& rChildParticle - , const rtl::OUString& rDragMethodServiceName = rtl::OUString() - , const rtl::OUString& rDragParameterString = rtl::OUString() ); + static OUString createClassifiedIdentifierForParticles( + const OUString& rParentParticle + , const OUString& rChildParticle + , const OUString& rDragMethodServiceName = OUString() + , const OUString& rDragParameterString = OUString() ); - static rtl::OUString createClassifiedIdentifierForGrid( + static OUString createClassifiedIdentifierForGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc - SAL_DLLPRIVATE static rtl::OUString createParticleForDiagram( + SAL_DLLPRIVATE static OUString createParticleForDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString createParticleForCoordinateSystem( + static OUString createParticleForCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSys , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString createParticleForAxis( + static OUString createParticleForAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - static rtl::OUString createParticleForGrid( + static OUString createParticleForGrid( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - static rtl::OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex + static OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex , sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex ); - static rtl::OUString createParticleForLegend( + static OUString createParticleForLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend >& xLegend , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle ); - static rtl::OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ); - static sal_Int32 getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID ); + static OUString addChildParticle( const OUString& rParticle, const OUString& rChildParticle ); + static OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ); + static sal_Int32 getIndexFromParticleOrCID( const OUString& rParticleOrCID ); - static rtl::OUString createClassifiedIdentifier( + static OUString createClassifiedIdentifier( enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_SERIES - , const rtl::OUString& rParticleID );//e.g. SeriesID + , const OUString& rParticleID );//e.g. SeriesID - static rtl::OUString createClassifiedIdentifierWithParent( + static OUString createClassifiedIdentifierWithParent( enum ObjectType //e.g. OBJECTTYPE_DATA_POINT or OBJECTTYPE_GRID - , const rtl::OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object - , const rtl::OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId" - , const rtl::OUString& rDragMethodServiceName = rtl::OUString() - , const rtl::OUString& rDragParameterString = rtl::OUString() + , const OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object + , const OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId" + , const OUString& rDragMethodServiceName = OUString() + , const OUString& rDragParameterString = OUString() ); - static bool isCID( const rtl::OUString& rName ); - static rtl::OUString getDragMethodServiceName( const rtl::OUString& rClassifiedIdentifier ); - static rtl::OUString getDragParameterString( const rtl::OUString& rCID ); - static bool isDragableObject( const rtl::OUString& rClassifiedIdentifier ); + static bool isCID( const OUString& rName ); + static OUString getDragMethodServiceName( const OUString& rClassifiedIdentifier ); + static OUString getDragParameterString( const OUString& rCID ); + static bool isDragableObject( const OUString& rClassifiedIdentifier ); bool isDragableObject(); - static bool isRotateableObject( const rtl::OUString& rClassifiedIdentifier ); - static bool isMultiClickObject( const rtl::OUString& rClassifiedIdentifier ); - static bool areSiblings( const rtl::OUString& rCID1, const rtl::OUString& rCID2 );//identical object is no sibling - static bool areIdenticalObjects( const ::rtl::OUString& rCID1, const ::rtl::OUString& rCID2 ); + static bool isRotateableObject( const OUString& rClassifiedIdentifier ); + static bool isMultiClickObject( const OUString& rClassifiedIdentifier ); + static bool areSiblings( const OUString& rCID1, const OUString& rCID2 );//identical object is no sibling + static bool areIdenticalObjects( const OUString& rCID1, const OUString& rCID2 ); - static rtl::OUString getStringForType( ObjectType eObjectType ); - static ObjectType getObjectType( const rtl::OUString& rCID ); + static OUString getStringForType( ObjectType eObjectType ); + static ObjectType getObjectType( const OUString& rCID ); ObjectType getObjectType(); - static rtl::OUString createSeriesSubObjectStub( ObjectType eSubObjectType - , const rtl::OUString& rSeriesParticle - , const rtl::OUString& rDragMethodServiceName = rtl::OUString() - , const rtl::OUString& rDragParameterString = rtl::OUString() ); - static rtl::OUString createPointCID( const rtl::OUString& rPointCID_Stub, sal_Int32 nIndex ); + static OUString createSeriesSubObjectStub( ObjectType eSubObjectType + , const OUString& rSeriesParticle + , const OUString& rDragMethodServiceName = OUString() + , const OUString& rDragParameterString = OUString() ); + static OUString createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex ); - static rtl::OUString createDataCurveCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine ); - static rtl::OUString createDataCurveEquationCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex ); + static OUString createDataCurveCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine ); + static OUString createDataCurveEquationCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex ); - SAL_DLLPRIVATE static rtl::OUString getObjectID( const rtl::OUString& rCID ); - static rtl::OUString getParticleID( const rtl::OUString& rCID ); - static rtl::OUString getFullParentParticle( const rtl::OUString& rCID ); + SAL_DLLPRIVATE static OUString getObjectID( const OUString& rCID ); + static OUString getParticleID( const OUString& rCID ); + static OUString getFullParentParticle( const OUString& rCID ); //returns the series particle of a CID when the CID is a child of the series - static rtl::OUString getSeriesParticleFromCID( const rtl::OUString& rCID ); + static OUString getSeriesParticleFromCID( const OUString& rCID ); //return the model object that is indicated by rObjectCID static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getObjectPropertySet( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getObjectPropertySet( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); //return the axis object that belongs to rObjectCID if any static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxisForCID( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); //return the series object that belongs to rObjectCID if any static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeriesForCID( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > getDiagramForCID( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static const ::rtl::OUString& getPieSegmentDragMethodServiceName(); - static ::rtl::OUString createPieSegmentDragParameterString( + static const OUString& getPieSegmentDragMethodServiceName(); + static OUString createPieSegmentDragParameterString( sal_Int32 nOffsetPercent , const ::com::sun::star::awt::Point& rMinimumPosition , const ::com::sun::star::awt::Point& rMaximumPosition ); - static bool parsePieSegmentDragParameterString( const rtl::OUString& rDragParameterString + static bool parsePieSegmentDragParameterString( const OUString& rDragParameterString , sal_Int32& rOffsetPercent , ::com::sun::star::awt::Point& rMinimumPosition , ::com::sun::star::awt::Point& rMaximumPosition ); - static TitleHelper::eTitleType getTitleTypeForCID( const ::rtl::OUString& rCID ); + static TitleHelper::eTitleType getTitleTypeForCID( const OUString& rCID ); - static ::rtl::OUString getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward ); + static OUString getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward ); bool isValid() const; bool isAutoGeneratedObject() const; bool isAdditionalShape() const; - ::rtl::OUString getObjectCID() const; + OUString getObjectCID() const; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const; ::com::sun::star::uno::Any getAny() const; @@ -259,7 +259,7 @@ private: // for all other objects m_xAdditionalShape is set. // Note, that if m_aObjectCID is set, m_xAdditionalShape must be empty // and vice versa. - ::rtl::OUString m_aObjectCID; + OUString m_aObjectCID; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape; }; diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 452c96987f35..10a999047cbe 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -34,7 +34,7 @@ public: virtual ~PotentialRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index ae3add738262..9bbcb84c3e01 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -44,22 +44,22 @@ namespace PropertyHelper @return The name used for storing this element in the table */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addLineDashUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); /** adds a gradient with a unique name to the gradient obtained by the given factory. @return The name used for storing this element in the table */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); /** adds a transparency gradient with a unique name to the gradient obtained by the given factory. @@ -67,33 +67,33 @@ OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable( @return The name used for storing this element in the table */ OOO_DLLPUBLIC_CHARTTOOLS -::rtl::OUString addTransparencyGradientUniqueNameToTable( +OUString addTransparencyGradientUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); /** adds a hatch with a unique name to the gradient obtained by the given factory. @return The name used for storing this element in the table */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addHatchUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); /** adds a bitmap with a unique name to the gradient obtained by the given factory. @return The name used for storing this element in the table */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addBitmapUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); // -------------------------------------------------------------------------------- @@ -170,7 +170,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyLess : public ::std::binary_function< struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_function< ::com::sun::star::beans::PropertyValue, bool > { - explicit PropertyValueNameEquals( const ::rtl::OUString & rName ) : + explicit PropertyValueNameEquals( const OUString & rName ) : m_aName( rName ) {} @@ -180,7 +180,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_fu } private: - ::rtl::OUString m_aName; + OUString m_aName; }; } // namespace chart diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 01291c104c61..27af18bd5830 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -40,11 +40,11 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > & xScaling ); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const = 0; - ::rtl::OUString getFormattedString( + OUString getFormattedString( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey, double fNumber ) const; @@ -71,9 +71,9 @@ protected: ::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getCorrelationCoefficient() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRepresentation() + virtual OUString SAL_CALL getRepresentation() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormattedRepresentation( + virtual OUString SAL_CALL getFormattedRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier, ::sal_Int32 nNumberFormatKey ) throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 725112a20af7..743f0bd990d2 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -50,7 +50,7 @@ public: createRegressionCurveByServiceName( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, - ::rtl::OUString aServiceName ); + OUString aServiceName ); // ------------------------------------------------------------ @@ -163,7 +163,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveCalculator > createRegressionCurveCalculatorByServiceName( - ::rtl::OUString aServiceName ); + OUString aServiceName ); /** recalculates the regression parameters according to the data given in the data source. @@ -200,7 +200,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ); - static ::rtl::OUString getUINameForRegressionCurve( const ::com::sun::star::uno::Reference< + static OUString getUINameForRegressionCurve( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve >& xCurve ); static ::std::vector< ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 5a0ae97806cb..ac25d268d8a6 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -63,7 +63,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: @@ -105,7 +105,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: @@ -145,7 +145,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: @@ -186,7 +186,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index 9e0bba409be4..ab60ee5a6c04 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -23,7 +23,7 @@ to use these macros the supported services and the implementation name needs to be static especially you need to implement (declaration is contained in macro already): -static com::sun::star::uno::Sequence< rtl::OUString > +static com::sun::star::uno::Sequence< OUString > Class::getSupportedServiceNames_Static(); */ @@ -36,18 +36,18 @@ namespace apphelper { #define APPHELPER_XSERVICEINFO_DECL() \ - virtual ::rtl::OUString SAL_CALL \ + virtual OUString SAL_CALL \ getImplementationName() \ throw( ::com::sun::star::uno::RuntimeException ); \ virtual sal_Bool SAL_CALL \ - supportsService( const ::rtl::OUString& ServiceName ) \ + supportsService( const OUString& ServiceName ) \ throw( ::com::sun::star::uno::RuntimeException ); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL \ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL \ getSupportedServiceNames() \ throw( ::com::sun::star::uno::RuntimeException ); \ \ - static ::rtl::OUString getImplementationName_Static(); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > \ + static OUString getImplementationName_Static(); \ + static ::com::sun::star::uno::Sequence< OUString > \ getSupportedServiceNames_Static(); //========================================================================= @@ -57,24 +57,24 @@ namespace apphelper //========================================================================= #define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ -::rtl::OUString SAL_CALL Class::getImplementationName() \ +OUString SAL_CALL Class::getImplementationName() \ throw( ::com::sun::star::uno::RuntimeException ) \ { \ return getImplementationName_Static(); \ } \ \ -::rtl::OUString Class::getImplementationName_Static() \ +OUString Class::getImplementationName_Static() \ { \ return ImplName; \ } \ \ sal_Bool SAL_CALL \ -Class::supportsService( const ::rtl::OUString& ServiceName ) \ +Class::supportsService( const OUString& ServiceName ) \ throw( ::com::sun::star::uno::RuntimeException ) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = \ + ::com::sun::star::uno::Sequence< OUString > aSNL = \ getSupportedServiceNames(); \ - const ::rtl::OUString* pArray = aSNL.getArray(); \ + const OUString* pArray = aSNL.getArray(); \ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) \ { \ if( pArray[ i ] == ServiceName ) \ @@ -84,7 +84,7 @@ Class::supportsService( const ::rtl::OUString& ServiceName ) \ return sal_False; \ } \ \ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL \ +::com::sun::star::uno::Sequence< OUString > SAL_CALL \ Class::getSupportedServiceNames() \ throw( ::com::sun::star::uno::RuntimeException ) \ { \ diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 695f22ff26fb..87c1b6099c53 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -76,10 +76,10 @@ public: ::com::sun::star::chart2::data::XDataSource > & xDataSource, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > & xDataProvider, - const ::rtl::OUString & rNewRange, + const OUString & rNewRange, bool bPositiveValue, bool bYError = true, - ::rtl::OUString * pXMLRange = 0 ); + OUString * pXMLRange = 0 ); /// @return the newly created or existing error bar object static ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index fd4ef07c22e9..ec9db23e2401 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -60,7 +60,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > createTitle( eTitleType nTitleIndex - , const rtl::OUString& rTitleText + , const OUString& rTitleText , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel , const ::com::sun::star::uno::Reference< @@ -71,9 +71,9 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); - static rtl::OUString getCompleteString( const ::com::sun::star::uno::Reference< + static OUString getCompleteString( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& xTitle ); - static void setCompleteString( const rtl::OUString& rNewText + static void setCompleteString( const OUString& rNewText , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& xTitle , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 6b3e8a4bd7ca..6dc447be4045 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -75,12 +75,12 @@ public: UncachedDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv, - const ::rtl::OUString & rRangeRepresentation ); + const OUString & rRangeRepresentation ); UncachedDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv, - const ::rtl::OUString & rRangeRepresentation, - const ::rtl::OUString & rRole ); + const OUString & rRangeRepresentation, + const OUString & rRole ); UncachedDataSequence( const UncachedDataSequence & rSource ); virtual ~UncachedDataSequence(); @@ -105,9 +105,9 @@ protected: // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation() + virtual OUString SAL_CALL getSourceRangeRepresentation() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel( + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) @@ -120,7 +120,7 @@ protected: // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); // ____ XIndexReplace ____ virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) @@ -144,9 +144,9 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XNamed (for setting a new range representation) ____ - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ @@ -174,8 +174,8 @@ protected: // <properties> sal_Int32 m_nNumberFormatKey; - ::rtl::OUString m_sRole; - ::rtl::OUString m_aXMLRange; + OUString m_sRole; + OUString m_aXMLRange; // </properties> /** This method registers all properties. It should be called by all @@ -186,7 +186,7 @@ protected: private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > m_xDataProvider; - ::rtl::OUString m_aSourceRepresentation; + OUString m_aSourceRepresentation; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index 961031f6663d..b90961f985c7 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -29,7 +29,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDefaultProperty : public WrappedProperty { public: explicit WrappedDefaultProperty( - const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName, + const OUString& rOuterName, const OUString& rInnerName, const ::com::sun::star::uno::Any& rNewOuterDefault ); virtual ~WrappedDefaultProperty(); diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index cac3dd38d774..f292272b09b6 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -30,7 +30,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDirectStateProperty : { public: explicit WrappedDirectStateProperty( - const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName ); + const OUString& rOuterName, const OUString& rInnerName ); virtual ~WrappedDirectStateProperty(); virtual ::com::sun::star::beans::PropertyState getPropertyState( diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index c95b3a143a94..9d55c8a94025 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -32,7 +32,7 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty { public: - WrappedIgnoreProperty( const ::rtl::OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue ); + WrappedIgnoreProperty( const OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue ); virtual ~WrappedIgnoreProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index d24d6ff2b7f5..1410ee1e37e6 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -36,11 +36,11 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedProperty a corresponding property of the inner PropertySet. Use this class to do the conversion between the two. */ public: - WrappedProperty( const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName ); + WrappedProperty( const OUString& rOuterName, const OUString& rInnerName ); virtual ~WrappedProperty(); - const ::rtl::OUString& getOuterName() const; - virtual ::rtl::OUString getInnerName() const; + const OUString& getOuterName() const; + virtual OUString getInnerName() const; virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const 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); @@ -62,8 +62,8 @@ protected: virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const; protected: - ::rtl::OUString m_aOuterName; - ::rtl::OUString m_aInnerName; + OUString m_aOuterName; + OUString m_aInnerName; }; //............................................................................. diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 9eed3075692b..6968f319ff9f 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -61,33 +61,33 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::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); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + 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); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::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); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::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); + 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); + 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); + 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); + 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); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + 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); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); protected: //methods /** give all the properties that should be visible to the outer side @@ -108,7 +108,7 @@ protected: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); SAL_DLLPRIVATE tWrappedPropertyMap& getWrappedPropertyMap(); - const WrappedProperty* getWrappedProperty( const ::rtl::OUString& rOuterName ); + const WrappedProperty* getWrappedProperty( const OUString& rOuterName ); const WrappedProperty* getWrappedProperty( sal_Int32 nHandle ); protected: //member diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index ce95dc13a2ff..e583f5a67fd2 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -51,12 +51,12 @@ struct OOO_DLLPUBLIC_CHARTTOOLS CellRange { Cell aUpperLeft; Cell aLowerRight; - ::rtl::OUString aTableName; + OUString aTableName; }; -CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString ); +CellRange getCellRangeFromXMLString( const OUString & rXMLString ); -::rtl::OUString getXMLStringFromCellRange( const CellRange & rRange ); +OUString getXMLStringFromCellRange( const CellRange & rRange ); } // namespace XMLRangeHelper diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 1e89f8c442fa..1872ed49534b 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -94,7 +94,7 @@ public: XHatchListRef GetHatchList() const; XBitmapListRef GetBitmapList() const; - SdrObject* getNamedSdrObject( const rtl::OUString& rName ); + SdrObject* getNamedSdrObject( const OUString& rName ); static SdrObject* getNamedSdrObject( const String& rName, SdrObjList* pObjList ); static bool removeShape( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index 4c518843cd41..dfe7afccaaad 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -58,12 +58,12 @@ public: if bSnapRect is set to true you get the resulting visible position (left-top) and size */ virtual ::com::sun::star::awt::Rectangle - getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false )=0; + getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false )=0; virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes()=0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - getShapeForCID( const rtl::OUString& rObjectCID )=0; + getShapeForCID( const OUString& rObjectCID )=0; virtual ::boost::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0; |