From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09 --- chart2/source/inc/CommonFunctors.hxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'chart2/source/inc/CommonFunctors.hxx') 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.

For conversion rtl::math::StringToDouble is used.

*/ -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.

For conversion rtl::math::DoubleToOUString is used.

*/ -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, -- cgit