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 /sc/inc/addincol.hxx | |
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 'sc/inc/addincol.hxx')
-rw-r--r-- | sc/inc/addincol.hxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index 48d0b0a1ad7e..c6d9b3d3f1c5 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -44,7 +44,7 @@ class ScUnoAddInFuncData; class ScFuncDesc; -typedef ::boost::unordered_map< ::rtl::OUString, const ScUnoAddInFuncData*, ScStringHashCode, ::std::equal_to< ::rtl::OUString > > ScAddInHashMap; +typedef ::boost::unordered_map< OUString, const ScUnoAddInFuncData*, ScStringHashCode, ::std::equal_to< OUString > > ScAddInHashMap; enum ScAddInArgumentType @@ -67,9 +67,9 @@ enum ScAddInArgumentType struct ScAddInArgDesc { - ::rtl::OUString aInternalName; ///< used to match configuration and reflection information - ::rtl::OUString aName; - ::rtl::OUString aDescription; + OUString aInternalName; ///< used to match configuration and reflection information + OUString aName; + OUString aDescription; ScAddInArgumentType eType; sal_Bool bOptional; }; @@ -77,25 +77,25 @@ struct ScAddInArgDesc class ScUnoAddInFuncData { private: - ::rtl::OUString aOriginalName; ///< kept in formula - ::rtl::OUString aLocalName; ///< for display - ::rtl::OUString aUpperName; ///< for entering formulas - ::rtl::OUString aUpperLocal; ///< for entering formulas - ::rtl::OUString aDescription; + OUString aOriginalName; ///< kept in formula + OUString aLocalName; ///< for display + OUString aUpperName; ///< for entering formulas + OUString aUpperLocal; ///< for entering formulas + OUString aDescription; com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod> xFunction; com::sun::star::uno::Any aObject; long nArgCount; ScAddInArgDesc* pArgDescs; long nCallerPos; sal_uInt16 nCategory; - rtl::OString sHelpId; + OString sHelpId; mutable com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName> aCompNames; mutable sal_Bool bCompInitialized; public: - ScUnoAddInFuncData( const ::rtl::OUString& rNam, const ::rtl::OUString& rLoc, - const ::rtl::OUString& rDesc, - sal_uInt16 nCat, const rtl::OString&, + ScUnoAddInFuncData( const OUString& rNam, const OUString& rLoc, + const OUString& rDesc, + sal_uInt16 nCat, const OString&, const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& rFunc, const com::sun::star::uno::Any& rO, @@ -103,22 +103,22 @@ public: long nCP ); ~ScUnoAddInFuncData(); - const ::rtl::OUString& GetOriginalName() const { return aOriginalName; } - const ::rtl::OUString& GetLocalName() const { return aLocalName; } - const ::rtl::OUString& GetUpperName() const { return aUpperName; } - const ::rtl::OUString& GetUpperLocal() const { return aUpperLocal; } + const OUString& GetOriginalName() const { return aOriginalName; } + const OUString& GetLocalName() const { return aLocalName; } + const OUString& GetUpperName() const { return aUpperName; } + const OUString& GetUpperLocal() const { return aUpperLocal; } const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& GetFunction() const { return xFunction; } const com::sun::star::uno::Any& GetObject() const { return aObject; } long GetArgumentCount() const { return nArgCount; } const ScAddInArgDesc* GetArguments() const { return pArgDescs; } long GetCallerPos() const { return nCallerPos; } - const ::rtl::OUString& GetDescription() const { return aDescription; } + const OUString& GetDescription() const { return aDescription; } sal_uInt16 GetCategory() const { return nCategory; } - const rtl::OString GetHelpId() const { return sHelpId; } + const OString GetHelpId() const { return sHelpId; } const com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName>& GetCompNames() const; - sal_Bool GetExcelName( LanguageType eDestLang, ::rtl::OUString& rRetExcelName ) const; + sal_Bool GetExcelName( LanguageType eDestLang, OUString& rRetExcelName ) const; void SetFunction( const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& rNewFunc, const com::sun::star::uno::Any& rNewObj ); @@ -145,7 +145,7 @@ private: com::sun::star::uno::XInterface>& xInterface ); void UpdateFromAddIn( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xInterface, - const ::rtl::OUString& rServiceName ); + const OUString& rServiceName ); void LoadComponent( const ScUnoAddInFuncData& rFuncData ); public: @@ -153,12 +153,12 @@ public: ~ScUnoAddInCollection(); /// User enetered name. rUpperName MUST already be upper case! - ::rtl::OUString FindFunction( const ::rtl::OUString& rUpperName, sal_Bool bLocalFirst ); + OUString FindFunction( const OUString& rUpperName, sal_Bool bLocalFirst ); /** Only if bComplete is set, the function reference and argument types are initialized (component may have to be loaded). @param rName is the exact Name. */ - const ScUnoAddInFuncData* GetFuncData( const ::rtl::OUString& rName, bool bComplete = false ); + const ScUnoAddInFuncData* GetFuncData( const OUString& rName, bool bComplete = false ); /** For enumeration in ScCompiler::OpCodeMap::getAvailableMappings(). @param nIndex @@ -168,16 +168,16 @@ public: void Clear(); - void LocalizeString( ::rtl::OUString& rName ); ///< modify rName - input: exact name + void LocalizeString( OUString& rName ); ///< modify rName - input: exact name long GetFuncCount(); sal_Bool FillFunctionDesc( long nFunc, ScFuncDesc& rDesc ); static sal_Bool FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc ); /// leave rRetExcelName unchanged, if no matching name is found - sal_Bool GetExcelName( const ::rtl::OUString& rCalcName, LanguageType eDestLang, ::rtl::OUString& rRetExcelName ); + sal_Bool GetExcelName( const OUString& rCalcName, LanguageType eDestLang, OUString& rRetExcelName ); /// leave rRetCalcName unchanged, if no matching name is found - sal_Bool GetCalcName( const ::rtl::OUString& rExcelName, ::rtl::OUString& rRetCalcName ); + sal_Bool GetCalcName( const OUString& rExcelName, OUString& rRetCalcName ); }; @@ -193,7 +193,7 @@ private: sal_uInt16 nErrCode; sal_Bool bHasString; double fValue; - ::rtl::OUString aString; + OUString aString; ScMatrixRef xMatrix; com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xVarRes; @@ -202,7 +202,7 @@ private: public: // exact name - ScUnoAddInCall( ScUnoAddInCollection& rColl, const ::rtl::OUString& rName, + ScUnoAddInCall( ScUnoAddInCollection& rColl, const OUString& rName, long nParamCount ); ~ScUnoAddInCall(); @@ -224,7 +224,7 @@ public: bool HasMatrix() const { return xMatrix.get(); } sal_Bool HasVarRes() const { return ( xVarRes.is() ); } double GetValue() const { return fValue; } - const ::rtl::OUString& GetString() const { return aString; } + const OUString& GetString() const { return aString; } ScMatrixRef GetMatrix() const { return xMatrix; } com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> GetVarRes() const { return xVarRes; } |