diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /scaddins | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
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
Diffstat (limited to 'scaddins')
-rw-r--r-- | scaddins/source/analysis/analysishelper.cxx | 2 | ||||
-rw-r--r-- | scaddins/source/analysis/analysishelper.hxx | 12 | ||||
-rw-r--r-- | scaddins/source/datefunc/datefunc.hxx | 74 | ||||
-rw-r--r-- | scaddins/source/pricing/pricing.hxx | 70 |
4 files changed, 79 insertions, 79 deletions
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 27fea9383c5c..278b26fcb434 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -1779,7 +1779,7 @@ OUString Complex::GetString() const throw( uno::RuntimeException, lang::IllegalA { CHK_FINITE(r); CHK_FINITE(i); - rtl::OUStringBuffer aRet; + OUStringBuffer aRet; bool bHasImag = i != 0.0; bool bHasReal = !bHasImag || (r != 0.0); diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 871ad917684a..1ee12a6c9fd8 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -232,7 +232,7 @@ struct FuncDataBase class FuncData { private: - ::rtl::OUString aIntName; + OUString aIntName; sal_uInt16 nUINameID; sal_uInt16 nDescrID; // leads also to parameter descriptions! sal_Bool bDouble; // flag for names, wich already exist in Calc @@ -252,7 +252,7 @@ public: inline sal_Bool HasIntParam( void ) const; sal_uInt16 GetStrIndex( sal_uInt16 nParamNum ) const; - inline sal_Bool Is( const ::rtl::OUString& rCompareTo ) const; + inline sal_Bool Is( const OUString& rCompareTo ) const; inline const StringList& GetCompNameList( void ) const; @@ -276,7 +276,7 @@ public: class FuncDataList : private MyList { - ::rtl::OUString aLastName; + OUString aLastName; sal_uInt32 nLast; public: FuncDataList( ResMgr& ); @@ -286,7 +286,7 @@ public: inline const FuncData* Get( sal_uInt32 nIndex ) const; using MyList::Count; - const FuncData* Get( const ::rtl::OUString& aProgrammaticName ) const; + const FuncData* Get( const OUString& aProgrammaticName ) const; }; @@ -761,7 +761,7 @@ inline sal_Bool FuncData::HasIntParam( void ) const } -inline sal_Bool FuncData::Is( const ::rtl::OUString& r ) const +inline sal_Bool FuncData::Is( const OUString& r ) const { return aIntName == r; } @@ -1041,7 +1041,7 @@ private: on strings not representing any double value. @return the converted double value. */ double convertToDouble( - const ::rtl::OUString& rString ) const + const OUString& rString ) const throw( css::lang::IllegalArgumentException ); public: diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index 2999918070e0..03373e2c7fe2 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -93,40 +93,40 @@ public: using ScaList::Count; - inline const ::rtl::OUString* Get( sal_uInt32 nIndex ) const; + inline const OUString* Get( sal_uInt32 nIndex ) const; - inline ::rtl::OUString* First(); - inline ::rtl::OUString* Next(); + inline OUString* First(); + inline OUString* Next(); using ScaList::Append; - inline void Append( ::rtl::OUString* pNew ); - inline void Append( const ::rtl::OUString& rNew ); + inline void Append( OUString* pNew ); + inline void Append( const OUString& rNew ); }; -inline const ::rtl::OUString* ScaStringList::Get( sal_uInt32 nIndex ) const +inline const OUString* ScaStringList::Get( sal_uInt32 nIndex ) const { - return static_cast< const ::rtl::OUString* >( ScaList::GetObject( nIndex ) ); + return static_cast< const OUString* >( ScaList::GetObject( nIndex ) ); } -inline ::rtl::OUString* ScaStringList::First() +inline OUString* ScaStringList::First() { - return static_cast< ::rtl::OUString* >( ScaList::First() ); + return static_cast< OUString* >( ScaList::First() ); } -inline ::rtl::OUString* ScaStringList::Next() +inline OUString* ScaStringList::Next() { - return static_cast< ::rtl::OUString* >( ScaList::Next() ); + return static_cast< OUString* >( ScaList::Next() ); } -inline void ScaStringList::Append( ::rtl::OUString* pNew ) +inline void ScaStringList::Append( OUString* pNew ) { ScaList::Append( pNew ); } -inline void ScaStringList::Append( const ::rtl::OUString& rNew ) +inline void ScaStringList::Append( const OUString& rNew ) { - ScaList::Append( new ::rtl::OUString( rNew ) ); + ScaList::Append( new OUString( rNew ) ); } @@ -204,7 +204,7 @@ public: class ScaFuncRes : public Resource { public: - ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, ::rtl::OUString& rRet ); + ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ); }; @@ -236,7 +236,7 @@ struct ScaFuncDataBase class ScaFuncData { private: - ::rtl::OUString aIntName; // internal name (get***) + OUString aIntName; // internal name (get***) sal_uInt16 nUINameID; // resource ID to UI name sal_uInt16 nDescrID; // leads also to parameter descriptions! sal_uInt16 nCompListID; // resource ID to list of valid names @@ -257,7 +257,7 @@ public: inline sal_Bool HasIntParam() const { return bWithOpt; } sal_uInt16 GetStrIndex( sal_uInt16 nParam ) const; - inline sal_Bool Is( const ::rtl::OUString& rCompare ) const + inline sal_Bool Is( const OUString& rCompare ) const { return aIntName == rCompare; } inline const ScaStringList& GetCompNameList() const { return aCompList; } @@ -268,7 +268,7 @@ public: class ScaFuncDataList : private ScaList { - ::rtl::OUString aLastName; + OUString aLastName; sal_uInt32 nLast; public: @@ -278,7 +278,7 @@ public: using ScaList::Count; inline const ScaFuncData* Get( sal_uInt32 nIndex ) const; - const ScaFuncData* Get( const ::rtl::OUString& rProgrammaticName ) const; + const ScaFuncData* Get( const OUString& rProgrammaticName ) const; inline ScaFuncData* First(); inline ScaFuncData* Next(); @@ -332,39 +332,39 @@ private: ResMgr& GetResMgr() throw( ::com::sun::star::uno::RuntimeException ); void InitData(); - ::rtl::OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( ::com::sun::star::uno::RuntimeException ); - ::rtl::OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( ::com::sun::star::uno::RuntimeException ); + OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( ::com::sun::star::uno::RuntimeException ); + OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( ::com::sun::star::uno::RuntimeException ); public: ScaDateAddIn(); virtual ~ScaDateAddIn(); - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XAddIn - virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); // XCompatibilityNames - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); // XLocalizable virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw( ::com::sun::star::uno::RuntimeException ); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException ); // 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 ); // methods from own interfaces start here @@ -408,8 +408,8 @@ public: throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); // XMiscFunctions - virtual ::rtl::OUString SAL_CALL getRot13( - const ::rtl::OUString& aSrcText ) + virtual OUString SAL_CALL getRot13( + const OUString& aSrcText ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); }; diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 5cb509cec08f..29d0ff9f3270 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -105,40 +105,40 @@ public: using ScaList::Count; - inline const ::rtl::OUString* Get( sal_uInt32 nIndex ) const; + inline const OUString* Get( sal_uInt32 nIndex ) const; - inline ::rtl::OUString* First(); - inline ::rtl::OUString* Next(); + inline OUString* First(); + inline OUString* Next(); using ScaList::Append; - inline void Append( ::rtl::OUString* pNew ); - inline void Append( const ::rtl::OUString& rNew ); + inline void Append( OUString* pNew ); + inline void Append( const OUString& rNew ); }; -inline const ::rtl::OUString* ScaStringList::Get( sal_uInt32 nIndex ) const +inline const OUString* ScaStringList::Get( sal_uInt32 nIndex ) const { - return static_cast< const ::rtl::OUString* >( ScaList::GetObject( nIndex ) ); + return static_cast< const OUString* >( ScaList::GetObject( nIndex ) ); } -inline ::rtl::OUString* ScaStringList::First() +inline OUString* ScaStringList::First() { - return static_cast< ::rtl::OUString* >( ScaList::First() ); + return static_cast< OUString* >( ScaList::First() ); } -inline ::rtl::OUString* ScaStringList::Next() +inline OUString* ScaStringList::Next() { - return static_cast< ::rtl::OUString* >( ScaList::Next() ); + return static_cast< OUString* >( ScaList::Next() ); } -inline void ScaStringList::Append( ::rtl::OUString* pNew ) +inline void ScaStringList::Append( OUString* pNew ) { ScaList::Append( pNew ); } -inline void ScaStringList::Append( const ::rtl::OUString& rNew ) +inline void ScaStringList::Append( const OUString& rNew ) { - ScaList::Append( new ::rtl::OUString( rNew ) ); + ScaList::Append( new OUString( rNew ) ); } @@ -216,7 +216,7 @@ public: class ScaFuncRes : public Resource { public: - ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, ::rtl::OUString& rRet ); + ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ); }; @@ -248,7 +248,7 @@ struct ScaFuncDataBase class ScaFuncData { private: - ::rtl::OUString aIntName; // internal name (get***) + OUString aIntName; // internal name (get***) sal_uInt16 nUINameID; // resource ID to UI name sal_uInt16 nDescrID; // leads also to parameter descriptions! sal_uInt16 nCompListID; // resource ID to list of valid names @@ -269,7 +269,7 @@ public: inline sal_Bool HasIntParam() const { return bWithOpt; } sal_uInt16 GetStrIndex( sal_uInt16 nParam ) const; - inline sal_Bool Is( const ::rtl::OUString& rCompare ) const + inline sal_Bool Is( const OUString& rCompare ) const { return aIntName == rCompare; } inline const ScaStringList& GetCompNameList() const { return aCompList; } @@ -280,7 +280,7 @@ public: class ScaFuncDataList : private ScaList { - ::rtl::OUString aLastName; + OUString aLastName; sal_uInt32 nLast; public: @@ -290,7 +290,7 @@ public: using ScaList::Count; inline const ScaFuncData* Get( sal_uInt32 nIndex ) const; - const ScaFuncData* Get( const ::rtl::OUString& rProgrammaticName ) const; + const ScaFuncData* Get( const OUString& rProgrammaticName ) const; inline ScaFuncData* First(); inline ScaFuncData* Next(); @@ -347,39 +347,39 @@ private: ResMgr& GetResMgr() throw( css::uno::RuntimeException ); void InitData(); - ::rtl::OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( css::uno::RuntimeException ); - ::rtl::OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException ); + OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( css::uno::RuntimeException ); + OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException ); public: ScaPricingAddIn(); virtual ~ScaPricingAddIn(); - static ::rtl::OUString getImplementationName_Static(); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XAddIn - virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); // XCompatibilityNames - virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); // XLocalizable virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) throw( css::uno::RuntimeException ); virtual css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException ); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getServiceName() throw( css::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); // ---------------------------------------- // methods from own interfaces start here |