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 | |
| 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')
112 files changed, 1687 insertions, 1687 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx index 339eadbd1635..0c6bd58afaa3 100644 --- a/sc/inc/AccessibleFilterMenu.hxx +++ b/sc/inc/AccessibleFilterMenu.hxx @@ -49,7 +49,7 @@ public: explicit ScAccessibleFilterMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos); + ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos); virtual ~ScAccessibleFilterMenu(); // XAccessibleComponent @@ -72,7 +72,7 @@ public: // XAccessibleContext - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleChildCount() @@ -87,7 +87,7 @@ public: getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); // XAccessibleEventBroadcaster @@ -144,7 +144,7 @@ public: // non-UNO methods - void appendMenuItem(const ::rtl::OUString& rName, bool bEnabled, size_t nMenuPos); + void appendMenuItem(const OUString& rName, bool bEnabled, size_t nMenuPos); void setMenuPos(size_t nMenuPos); void setEnabled(bool bEnabled); diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx index 550a77999733..82b6f843ccd4 100644 --- a/sc/inc/AccessibleFilterMenuItem.hxx +++ b/sc/inc/AccessibleFilterMenuItem.hxx @@ -37,7 +37,7 @@ class ScAccessibleFilterMenuItem : public: explicit ScAccessibleFilterMenuItem( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos); + ::com::sun::star::accessibility::XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos); virtual ~ScAccessibleFilterMenuItem(); @@ -56,7 +56,7 @@ public: getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); // XAccessibleAction @@ -67,7 +67,7 @@ public: virtual ::sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) + virtual OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< @@ -105,7 +105,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet; ScMenuFloatingWindow* mpWindow; - ::rtl::OUString maName; + OUString maName; size_t mnMenuPos; bool mbEnabled; }; diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index ac088907a1f5..36de65dc2089 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -31,7 +31,7 @@ public: ScAccessibleFilterTopWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - ScCheckListMenuWindow* pWin, const ::rtl::OUString& rName); + ScCheckListMenuWindow* pWin, const OUString& rName); virtual ~ScAccessibleFilterTopWindow(); // XAccessibleContext @@ -43,7 +43,7 @@ public: getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); // Non-UNO Methods diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx index bde5aecbec58..747042afc536 100644 --- a/sc/inc/addincfg.hxx +++ b/sc/inc/addincfg.hxx @@ -24,16 +24,16 @@ class ScAddInCfg : public utl::ConfigItem { - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetPropertyNames(); public: ScAddInCfg(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ); virtual void Commit(); com::sun::star::uno::Sequence< com::sun::star::uno::Any> - GetProperties(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) + GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } using ConfigItem::GetNodeNames; 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; } diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index a45b346d4a9e..2f5956546393 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -250,7 +250,7 @@ public: struct ExternalInfo { - ::rtl::OUString maTabName; + OUString maTabName; sal_uInt16 mnFileId; bool mbExternal; @@ -293,7 +293,7 @@ public: const ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL ); - SC_DLLPUBLIC void Format( rtl::OUString&, sal_uInt16 = 0, const ScDocument* = NULL, + SC_DLLPUBLIC void Format( OUString&, sal_uInt16 = 0, const ScDocument* = NULL, const Details& rDetails = detailsOOOa1) const; SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, const ScDocument* = NULL, const Details& rDetails = detailsOOOa1) const; @@ -493,7 +493,7 @@ public: SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, const ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ) const; - SC_DLLPUBLIC void Format( rtl::OUString&, sal_uInt16 = 0, const ScDocument* = NULL, + SC_DLLPUBLIC void Format( OUString&, sal_uInt16 = 0, const ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ) const; inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1, @@ -774,18 +774,18 @@ bool ConvertDoubleRef(ScDocument* pDoc, const String& rRefString, ScAddress::ExternalInfo* pExtInfo = NULL ); /// append alpha representation of column to buffer -SC_DLLPUBLIC void ScColToAlpha( rtl::OUStringBuffer& rBuffer, SCCOL nCol); +SC_DLLPUBLIC void ScColToAlpha( OUStringBuffer& rBuffer, SCCOL nCol); inline void ScColToAlpha( String& rStr, SCCOL nCol) { - rtl::OUStringBuffer aBuf(2); + OUStringBuffer aBuf(2); ScColToAlpha( aBuf, nCol); rStr.Append( aBuf.getStr(), static_cast<xub_StrLen>(aBuf.getLength())); } inline String ScColToAlpha( SCCOL nCol ) { - rtl::OUStringBuffer aBuf(2); + OUStringBuffer aBuf(2); ScColToAlpha( aBuf, nCol); return aBuf.makeStringAndClear(); } diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index ac80bfb3aba7..72e0bd76fc29 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -52,7 +52,7 @@ public: 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, + 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, @@ -60,29 +60,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -90,11 +90,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index d0369c730e3c..9ca1827cd3a8 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -60,29 +60,29 @@ class ScAutoFormatsObj : public ::cppu::WeakImplHelper4< { private: ScAutoFormatObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - ScAutoFormatObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScAutoFormatObj* GetObjectByName_Impl(const OUString& aName); public: ScAutoFormatsObj(); virtual ~ScAutoFormatsObj(); - 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(); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + 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 ::rtl::OUString& Name ) + 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, + 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, @@ -90,13 +90,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -116,11 +116,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -167,15 +167,15 @@ public: createEnumeration() throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // 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, + 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, @@ -183,29 +183,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -213,11 +213,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel @@ -251,7 +251,7 @@ public: 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, + 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, @@ -259,29 +259,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -289,11 +289,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index f1902595098b..aba493bab79e 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -58,14 +58,14 @@ public: ScSpreadsheetSettings(); virtual ~ScSpreadsheetSettings(); - 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(); // 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, + 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, @@ -73,29 +73,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -103,11 +103,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -120,8 +120,8 @@ public: ScRecentFunctionsObj(); virtual ~ScRecentFunctionsObj(); - 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(); // XRecentFunctions virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getRecentFunctionIds() @@ -133,11 +133,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -152,8 +152,8 @@ public: ScFunctionListObj(); virtual ~ScFunctionListObj(); - 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(); // XFunctionDescriptions virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL @@ -162,13 +162,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -188,11 +188,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index 819568d96d9b..7f8a5941a67f 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -127,13 +127,13 @@ class ScAppCfg : public ScAppOptions DECL_LINK( MiscCommitHdl, void* ); DECL_LINK( CompatCommitHdl, void* ); - com::sun::star::uno::Sequence<rtl::OUString> GetLayoutPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetInputPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetRevisionPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetContentPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetSortListPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetMiscPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetCompatPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetInputPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetRevisionPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetContentPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetSortListPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetMiscPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetCompatPropertyNames(); public: ScAppCfg(); diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index 5af1d2bae034..eea6b1546bda 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -252,7 +252,7 @@ public: class SC_DLLPUBLIC ScAutoFormatData { private: - rtl::OUString aName; + OUString aName; sal_uInt16 nStrResId; // common flags of Calc and Writer bool bIncludeFont : 1; @@ -277,8 +277,8 @@ public: ScAutoFormatData( const ScAutoFormatData& rData ); ~ScAutoFormatData(); - void SetName( const rtl::OUString& rName ) { aName = rName; nStrResId = USHRT_MAX; } - const rtl::OUString& GetName() const { return aName; } + void SetName( const OUString& rName ) { aName = rName; nStrResId = USHRT_MAX; } + const OUString& GetName() const { return aName; } bool GetIncludeValueFormat() const { return bIncludeValueFormat; } bool GetIncludeFont() const { return bIncludeFont; } @@ -311,7 +311,7 @@ public: class SC_DLLPUBLIC ScAutoFormat { - typedef boost::ptr_map<rtl::OUString, ScAutoFormatData> MapType; + typedef boost::ptr_map<OUString, ScAutoFormatData> MapType; MapType maData; bool mbSaveLater; ScAfVersions m_aVersions; @@ -333,8 +333,8 @@ public: ScAutoFormatData* findByIndex(size_t nIndex); const_iterator find(const ScAutoFormatData* pData) const; iterator find(const ScAutoFormatData* pData); - const_iterator find(const rtl::OUString& rName) const; - iterator find(const rtl::OUString& rName); + const_iterator find(const OUString& rName) const; + iterator find(const OUString& rName); bool insert(ScAutoFormatData* pNew); void erase(const iterator& it); diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index ba4025def5b3..386e0822f7f0 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -54,25 +54,25 @@ class FuncData friend class FuncCollection; const ModuleData* pModuleData; - rtl::OUString aInternalName; - rtl::OUString aFuncName; + OUString aInternalName; + OUString aFuncName; sal_uInt16 nNumber; sal_uInt16 nParamCount; ParamType eAsyncType; ParamType eParamType[MAXFUNCPARAM]; public: FuncData(const ModuleData*pModule, - const rtl::OUString& rIName, - const rtl::OUString& rFName, + const OUString& rIName, + const OUString& rFName, sal_uInt16 nNo, sal_uInt16 nCount, const ParamType* peType, ParamType eType); FuncData(const FuncData& rData); - const rtl::OUString& GetModuleName() const; - const rtl::OUString& GetInternalName() const { return aInternalName; } - const rtl::OUString& GetFuncName() const { return aFuncName; } + const OUString& GetModuleName() const; + const OUString& GetInternalName() const { return aInternalName; } + const OUString& GetFuncName() const { return aFuncName; } sal_uInt16 GetParamCount() const { return nParamCount; } ParamType GetParamType(sal_uInt16 nIndex) const { return eParamType[nIndex]; } ParamType GetReturnType() const { return eParamType[0]; } @@ -83,13 +83,13 @@ public: // name and description of parameter nParam. // nParam==0 => Desc := function description, // Name := n/a - bool getParamDesc( ::rtl::OUString& aName, ::rtl::OUString& aDesc, sal_uInt16 nParam ) const; + bool getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const; }; class FuncCollection { - typedef boost::ptr_map<rtl::OUString, FuncData> MapType; + typedef boost::ptr_map<OUString, FuncData> MapType; MapType maData; public: typedef MapType::const_iterator const_iterator; @@ -97,8 +97,8 @@ public: FuncCollection(); FuncCollection(const FuncCollection& r); - const FuncData* findByName(const rtl::OUString& rName) const; - FuncData* findByName(const rtl::OUString& rName); + const FuncData* findByName(const OUString& rName) const; + FuncData* findByName(const OUString& rName); void insert(FuncData* pNew); const_iterator begin() const; @@ -106,7 +106,7 @@ public: }; -bool InitExternalFunc(const rtl::OUString& rModuleName); +bool InitExternalFunc(const OUString& rModuleName); void ExitExternalFunc(); #endif diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index 1384c2b027f0..7b7019cc1ada 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -85,7 +85,7 @@ public: bool HasEmptyData() const; bool HasValueData() const; bool HasStringData() const; - rtl::OUString GetStringData() const; // only real strings + OUString GetStringData() const; // only real strings private: ScBaseCell& operator=( const ScBaseCell& ); @@ -145,18 +145,18 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( ScStringCell ) #endif - explicit ScStringCell(const rtl::OUString& rString); + explicit ScStringCell(const OUString& rString); #if OSL_DEBUG_LEVEL > 0 ~ScStringCell(); #endif - inline void SetString( const rtl::OUString& rString ) { maString = rString; } - inline const rtl::OUString& GetString() const { return maString; } + inline void SetString( const OUString& rString ) { maString = rString; } + inline const OUString& GetString() const { return maString; } const OUString* GetStringPtr() const { return &maString; } private: - rtl::OUString maString; + OUString maString; }; class ScEditCell : public ScBaseCell diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx index 08561f8f64bf..87181ca06cf6 100644 --- a/sc/inc/cellform.hxx +++ b/sc/inc/cellform.hxx @@ -42,7 +42,7 @@ class SC_DLLPUBLIC ScCellFormat public: static void GetString( - ScRefCellValue& rCell, sal_uLong nFormat, rtl::OUString& rString, + ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString, Color** ppColor, SvNumberFormatter& rFormatter, bool bNullVals = true, bool bFormula = false, ScForceTextFmt eForceTextFmt = ftDontForce, bool bUseStarFormat = false ); diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 6aa36e207401..d1ff40410a84 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -269,7 +269,7 @@ public: 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, + 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, @@ -277,29 +277,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -307,51 +307,51 @@ public: ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + 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< ::rtl::OUString >& aPropertyNames ) + 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< ::rtl::OUString >& aPropertyNames, + 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, + 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); // XTolerantMultiPropertySet virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL - setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL - getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL - getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( - const ::rtl::OUString& PropertyName ) + 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 ) + OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + 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 ::rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -378,15 +378,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 ) + 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 ) + OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException); // XCellRangesQuery @@ -456,11 +456,11 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel @@ -506,7 +506,7 @@ public: // XSheetCellRanges virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL getCells() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRangeAddressesAsString() + virtual OUString SAL_CALL getRangeAddressesAsString() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL getRangeAddresses() throw(::com::sun::star::uno::RuntimeException); @@ -528,19 +528,19 @@ public: ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + 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 ::rtl::OUString& Name ) + 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, + 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, @@ -548,13 +548,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -574,11 +574,11 @@ public: createEnumeration() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider @@ -628,8 +628,8 @@ protected: throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SetArrayFormula_Impl( const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, + void SetArrayFormula_Impl( const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(::com::sun::star::uno::RuntimeException); @@ -650,8 +650,8 @@ public: virtual void RefChanged(); // via getImplementation() - virtual void SetArrayFormulaWithGrammar( const ::rtl::OUString& rFormula, - const ::rtl::OUString& rFormulaNmsp, + virtual void SetArrayFormulaWithGrammar( const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar ) throw(::com::sun::star::uno::RuntimeException); @@ -664,8 +664,8 @@ public: getSpreadsheet() throw(::com::sun::star::uno::RuntimeException); // XArrayFormulaRange - virtual ::rtl::OUString SAL_CALL getArrayFormula() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setArrayFormula( const ::rtl::OUString& aFormula ) + virtual OUString SAL_CALL getArrayFormula() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setArrayFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); // XArrayFormulaTokens @@ -686,10 +686,10 @@ public: // XCellRangeFormula virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< - ::rtl::OUString > > SAL_CALL getFormulaArray() + OUString > > SAL_CALL getFormulaArray() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFormulaArray( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aArray ) + ::com::sun::star::uno::Sequence< OUString > >& aArray ) throw (::com::sun::star::uno::RuntimeException); // XMultipleOperation @@ -715,7 +715,7 @@ public: throw(::com::sun::star::uno::RuntimeException); // XAutoFormattable - virtual void SAL_CALL autoFormat( const ::rtl::OUString& aName ) + virtual void SAL_CALL autoFormat( const OUString& aName ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -782,10 +782,10 @@ public: throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getCellRangeByName( const ::rtl::OUString& aRange ) + getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > - getCellRangeByName( const ::rtl::OUString& aRange, const ScAddress::Details& rDetails ) + getCellRangeByName( const OUString& aRange, const ScAddress::Details& rDetails ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet overloaded due to Range-Properties @@ -794,11 +794,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider @@ -866,7 +866,7 @@ public: // not meant for any other purpose. const ScAddress& GetPosition() const { return aCellPos; } - void InputEnglishString( const ::rtl::OUString& rText ); + void InputEnglishString( const OUString& rText ); // XText virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< @@ -890,7 +890,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, - const ::rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, @@ -905,8 +905,8 @@ public: getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess @@ -919,12 +919,12 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XCell - virtual ::rtl::OUString SAL_CALL getFormula() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) + virtual OUString SAL_CALL getFormula() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFormulaResult( double nValue ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormulaString( const ::rtl::OUString& aFormula ) + virtual void SAL_CALL setFormulaString( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException); @@ -959,11 +959,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider @@ -1058,12 +1058,12 @@ public: ::com::sun::star::uno::RuntimeException); using ScCellRangeObj::getCellRangeByName; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getCellRangeByName( const ::rtl::OUString& aRange ) + getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XSheetPageBreak @@ -1135,16 +1135,16 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLinkMode( ::com::sun::star::sheet::SheetLinkMode nLinkMode ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkUrl() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkUrl( const ::rtl::OUString& aLinkUrl ) + virtual OUString SAL_CALL getLinkUrl() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLinkUrl( const OUString& aLinkUrl ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkSheetName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkSheetName( const ::rtl::OUString& aLinkSheetName ) + virtual OUString SAL_CALL getLinkSheetName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLinkSheetName( const OUString& aLinkSheetName ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL link( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aSheetName, - const ::rtl::OUString& aFilterName, - const ::rtl::OUString& aFilterOptions, + virtual void SAL_CALL link( const OUString& aUrl, + const OUString& aSheetName, + const OUString& aFilterName, + const OUString& aFilterOptions, ::com::sun::star::sheet::SheetLinkMode nMode ) throw(::com::sun::star::uno::RuntimeException); @@ -1181,17 +1181,17 @@ public: throw(::com::sun::star::uno::RuntimeException); // XProtectable - virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL protect( const OUString& aPassword ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL unprotect( const OUString& aPassword ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException); // XScenario virtual sal_Bool SAL_CALL getIsScenario() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getScenarioComment() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScenarioComment( const ::rtl::OUString& aScenarioComment ) + virtual OUString SAL_CALL getScenarioComment() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setScenarioComment( const OUString& aScenarioComment ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addRanges( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges ) @@ -1203,7 +1203,7 @@ public: throw(::com::sun::star::uno::RuntimeException); // XExternalSheetName - virtual void SAL_CALL setExternalName( const ::rtl::OUString& aUrl, const ::rtl::OUString& aSheetName ) + virtual void SAL_CALL setExternalName( const OUString& aUrl, const OUString& aSheetName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); @@ -1217,11 +1217,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel @@ -1268,8 +1268,8 @@ public: virtual void SAL_CALL release() throw(); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet overloaded due to column properties @@ -1278,11 +1278,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider @@ -1318,11 +1318,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -1352,11 +1352,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -1391,11 +1391,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -1435,11 +1435,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -1475,11 +1475,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -1522,11 +1522,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -1554,11 +1554,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 6107e345245d..6d53073495bc 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -91,12 +91,12 @@ public: 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() @@ -115,10 +115,10 @@ public: // XRangeXMLConversion --------------------------------------------------- - virtual ::rtl::OUString SAL_CALL convertRangeToXML( const ::rtl::OUString& sRangeRepresentation ) + virtual OUString SAL_CALL convertRangeToXML( const OUString& sRangeRepresentation ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); - virtual ::rtl::OUString SAL_CALL convertRangeFromXML( const ::rtl::OUString& sXMLRange ) + virtual OUString SAL_CALL convertRangeFromXML( const OUString& sXMLRange ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); // XPropertySet ---------------------------------------------------------- @@ -128,7 +128,7 @@ public: getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -137,13 +137,13 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -151,7 +151,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -159,7 +159,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -167,7 +167,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -176,13 +176,13 @@ public: // XServiceInfo ---------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) 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); @@ -216,13 +216,13 @@ public: // XServiceInfo ---------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) 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); @@ -265,9 +265,9 @@ public: 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 > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel(::com::sun::star::chart2::data::LabelOrigin nOrigin) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) @@ -281,7 +281,7 @@ public: // XTextualDataSequence -------------------------------------------------- - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData( ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet ---------------------------------------------------------- @@ -291,7 +291,7 @@ public: getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -300,13 +300,13 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -314,7 +314,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -322,7 +322,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -330,7 +330,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -353,13 +353,13 @@ public: // XServiceInfo ---------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) 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); @@ -418,7 +418,7 @@ private: struct Item { double mfValue; - ::rtl::OUString maString; + OUString maString; bool mbIsValue; Item(); }; diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 6a584c608977..73fdb1c6930e 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -38,8 +38,8 @@ class ScMemChart short nRowCnt; short nColCnt; double* pData; - ::rtl::OUString* pColText; - ::rtl::OUString* pRowText; + OUString* pColText; + OUString* pRowText; ScMemChart(const ScMemChart& rMemChart); // not implemented @@ -49,17 +49,17 @@ public: short GetColCount() const { return nColCnt; } short GetRowCount() const { return nRowCnt; } - const ::rtl::OUString& GetColText(short nCol) const { return pColText[nCol]; } - const ::rtl::OUString& GetRowText(short nRow) const { return pRowText[nRow]; } + const OUString& GetColText(short nCol) const { return pColText[nCol]; } + const OUString& GetRowText(short nRow) const { return pRowText[nRow]; } double GetData(short nCol, short nRow) const { return pData[nCol * nRowCnt + nRow]; } void SetData(short nCol, short nRow, const double& rVal) { pData[nCol * nRowCnt + nRow] = rVal; } - void SetColText(short nCol, const ::rtl::OUString& rText) { pColText[nCol] = rText; } - void SetRowText(short nRow, const ::rtl::OUString& rText) { pRowText[nRow] = rText; } + void SetColText(short nCol, const OUString& rText) { pColText[nCol] = rText; } + void SetRowText(short nRow, const OUString& rText) { pRowText[nRow] = rText; } }; class SC_DLLPUBLIC ScChartArray // only parameter-struct { - ::rtl::OUString aName; + OUString aName; ScDocument* pDocument; ScChartPositioner aPositioner; bool bValid; // for creation out of SchMemChart @@ -71,9 +71,9 @@ public: ScChartArray( ScDocument* pDoc, SCTAB nTab, SCCOL nStartColP, SCROW nStartRowP, SCCOL nEndColP, SCROW nEndRowP, - const ::rtl::OUString& rChartName ); + const OUString& rChartName ); ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList, - const ::rtl::OUString& rChartName ); + const OUString& rChartName ); ScChartArray( const ScChartArray& rArr ); ~ScChartArray(); @@ -86,8 +86,8 @@ public: bool HasColHeaders() const { return aPositioner.HasColHeaders(); } bool HasRowHeaders() const { return aPositioner.HasRowHeaders(); } bool IsValid() const { return bValid; } - void SetName(const ::rtl::OUString& rNew) { aName = rNew; } - const ::rtl::OUString& GetName() const { return aName; } + void SetName(const OUString& rNew) { aName = rNew; } + const OUString& GetName() const { return aName; } bool operator==(const ScChartArray& rCmp) const; diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx index 0f82e79ac73d..245e7336d8b8 100644 --- a/sc/inc/charthelper.hxx +++ b/sc/inc/charthelper.hxx @@ -43,15 +43,15 @@ public: static void UpdateChartsOnDestinationPage( ScDocument* pDestDoc, const SCTAB nDestTab ); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartFromSdrObject( SdrObject* pObject ); static void GetChartRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, - ::com::sun::star::uno::Sequence< rtl::OUString >& rRanges ); + ::com::sun::star::uno::Sequence< OUString >& rRanges ); static void SetChartRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, - const ::com::sun::star::uno::Sequence< rtl::OUString >& rRanges ); + const ::com::sun::star::uno::Sequence< OUString >& rRanges ); static void AddRangesIfProtectedChart( ScRangeListVector& rRangesVector, ScDocument* pDocument, SdrObject* pObject ); static void FillProtectedChartRangesVector( ScRangeListVector& rRangesVector, ScDocument* pDocument, SdrPage* pPage ); - static void GetChartNames( ::std::vector< ::rtl::OUString >& rChartNames, SdrPage* pPage ); + static void GetChartNames( ::std::vector< OUString >& rChartNames, SdrPage* pPage ); static void CreateProtectedChartListenersAndNotify( ScDocument* pDoc, SdrPage* pPage, ScModelObj* pModelObj, SCTAB nTab, - const ScRangeListVector& rRangesVector, const ::std::vector< ::rtl::OUString >& rExcludedChartNames, bool bSameDoc = true ); + const ScRangeListVector& rRangesVector, const ::std::vector< OUString >& rExcludedChartNames, bool bSameDoc = true ); }; #endif diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 788c3264d962..df3c02231422 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -67,7 +67,7 @@ private: boost::scoped_ptr<ExternalRefListener> mpExtRefListener; boost::scoped_ptr<std::vector<ScTokenRef> > mpTokens; - rtl::OUString maName; + OUString maName; ScChartUnoData* pUnoData; ScDocument* mpDoc; bool bUsed:1; // for ScChartListenerCollection::FreeUnused @@ -78,14 +78,14 @@ private: ScChartListener& operator=( const ScChartListener& ); public: - ScChartListener( const rtl::OUString& rName, ScDocument* pDoc, + ScChartListener( const OUString& rName, ScDocument* pDoc, const ScRangeListRef& rRangeListRef ); - ScChartListener( const rtl::OUString& rName, ScDocument* pDoc, + ScChartListener( const OUString& rName, ScDocument* pDoc, ::std::vector<ScTokenRef>* pTokens ); ScChartListener( const ScChartListener& ); ~ScChartListener(); - const rtl::OUString& GetName() const; + const OUString& GetName() const; void SetUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); @@ -143,8 +143,8 @@ public: explicit RangeListenerItem(const ScRange& rRange, ScChartHiddenRangeListener* p); }; - typedef boost::ptr_map<rtl::OUString, ScChartListener> ListenersType; - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StringSetType; + typedef boost::ptr_map<OUString, ScChartListener> ListenersType; + typedef boost::unordered_set<OUString, OUStringHash> StringSetType; private: ListenersType maListeners; ::std::list<RangeListenerItem> maHiddenListeners; @@ -167,8 +167,8 @@ public: void StartAllListeners(); SC_DLLPUBLIC void insert(ScChartListener* pListener); - ScChartListener* findByName(const rtl::OUString& rName); - const ScChartListener* findByName(const rtl::OUString& rName) const; + ScChartListener* findByName(const OUString& rName); + const ScChartListener* findByName(const OUString& rName) const; bool hasListeners() const; const ListenersType& getListeners() const; @@ -179,7 +179,7 @@ public: * Create a unique name that's not taken by any existing chart listener * objects. The name consists of a prefix given followed by a number. */ - rtl::OUString getUniqueName(const rtl::OUString& rPrefix) const; + OUString getUniqueName(const OUString& rPrefix) const; void ChangeListening( const String& rName, const ScRangeListRef& rRangeListRef, diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index f3ea24786612..4fe5fac45605 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -54,7 +54,7 @@ private: SCTAB nTab; // Charts are per sheet ScChartObj* GetObjectByIndex_Impl(long nIndex) const; - ScChartObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScChartObj* GetObjectByName_Impl(const OUString& aName) const; public: ScChartsObj(ScDocShell* pDocSh, SCTAB nT); @@ -63,23 +63,23 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XTableCharts - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const OUString& aName, const ::com::sun::star::awt::Rectangle& aRect, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -99,11 +99,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -175,16 +175,16 @@ public: getEmbeddedObject() throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPropertySet diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 6b06c222870a..38b683c50d5d 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -216,8 +216,8 @@ protected: ScBigRange aBigRange; // Ins/Del/MoveTo/ContentPos DateTime aDateTime; //! UTC - rtl::OUString aUser; // who? - rtl::OUString aComment; // user comment + OUString aUser; // who? + OUString aComment; // user comment ScChangeAction* pNext; // next in linked list ScChangeAction* pPrev; // previous in linked list ScChangeActionLinkEntry* pLinkAny; // arbitrary links @@ -239,20 +239,20 @@ protected: const sal_uLong nRejectAction, const ScChangeActionState eState, const DateTime& aDateTime, - const rtl::OUString& aUser, - const rtl::OUString& aComment ); + const OUString& aUser, + const OUString& aComment ); // only to be used in the XML import ScChangeAction( ScChangeActionType, const ScBigRange&, const sal_uLong nAction); virtual ~ScChangeAction(); - rtl::OUString GetRefString( + OUString GetRefString( const ScBigRange& rRange, ScDocument* pDoc, bool bFlag3D = false) const; void SetActionNumber( sal_uLong n ) { nAction = n; } void SetRejectAction( sal_uLong n ) { nRejectAction = n; } - void SetUser( const rtl::OUString& r ); + void SetUser( const OUString& r ); void SetType( ScChangeActionType e ) { eType = e; } void SetState( ScChangeActionState e ) { eState = e; } void SetRejected(); @@ -376,22 +376,22 @@ public: // with bSplitRange only one column/row will be considered for delete // (for a listing of entries) virtual void GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, + OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const; virtual void GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const; + OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const; // for DocumentMerge set old date of the other // action, fetched by GetDateTimeUTC void SetDateTimeUTC( const DateTime& rDT ) { aDateTime = rDT; } - SC_DLLPUBLIC const rtl::OUString& GetUser() const; - const rtl::OUString& GetComment() const; + SC_DLLPUBLIC const OUString& GetUser() const; + const OUString& GetComment() const; // set user comment - void SetComment( const rtl::OUString& rStr ); + void SetComment( const OUString& rStr ); // only to be used in the XML import void SetDeletedInThis( sal_uLong nActionNumber, @@ -423,13 +423,13 @@ public: const ScChangeActionState eState, const sal_uLong nRejectingNumber, const ScBigRange& aBigRange, - const rtl::OUString& aUser, + const OUString& aUser, const DateTime& aDateTime, - const rtl::OUString &sComment, + const OUString &sComment, const ScChangeActionType eType); // only to use in the XML import virtual void GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true) const; + OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true) const; }; @@ -520,8 +520,8 @@ public: ScChangeActionDel( const sal_uLong nActionNumber, const ScChangeActionState eState, const sal_uLong nRejectingNumber, const ScBigRange& aBigRange, - const rtl::OUString& aUser, const DateTime& aDateTime, - const rtl::OUString &sComment, const ScChangeActionType eType, + const OUString& aUser, const DateTime& aDateTime, + const OUString &sComment, const ScChangeActionType eType, const SCsCOLROW nD, ScChangeTrack* pTrack); // only to use in the XML import // which of nDx and nDy is set is dependend on the type @@ -549,7 +549,7 @@ public: short GetCutOffCount() const { return nCutOff; } virtual void GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const; + OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const; void SetCutOffInsert( ScChangeActionIns* p, short n ) { pCutOff = p; nCutOff = n; } // only to use in the XML import @@ -612,9 +612,9 @@ public: const ScChangeActionState eState, const sal_uLong nRejectingNumber, const ScBigRange& aToBigRange, - const rtl::OUString& aUser, + const OUString& aUser, const DateTime& aDateTime, - const rtl::OUString &sComment, + const OUString &sComment, const ScBigRange& aFromBigRange, ScChangeTrack* pTrack); // only to use in the XML import @@ -625,11 +625,11 @@ public: SC_DLLPUBLIC void GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nDz ) const; virtual void GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, + OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const; virtual void GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const; + OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const; }; @@ -704,7 +704,7 @@ class ScChangeActionContent : public ScChangeAction void GetValueString( OUString& rStr, const OUString& rValue, const ScCellValue& rCell ) const; - void GetFormulaString( rtl::OUString& rStr, const ScFormulaCell* pCell ) const; + void GetFormulaString( OUString& rStr, const ScFormulaCell* pCell ) const; virtual void AddContent( ScChangeActionContent* ) {} virtual void DeleteCellEntries() {} @@ -788,15 +788,15 @@ public: // assigns string / creates forumula cell void SetOldValue( const OUString& rOld, ScDocument* pDoc ); - void GetOldString( rtl::OUString& rStr ) const; - void GetNewString( rtl::OUString& rStr ) const; + void GetOldString( OUString& rStr ) const; + void GetNewString( OUString& rStr ) const; SC_DLLPUBLIC const ScCellValue& GetOldCell() const; SC_DLLPUBLIC const ScCellValue& GetNewCell() const; virtual void GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const; + OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const; virtual void GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const; + OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const; static ScChangeActionContentCellType GetContentCellType( const ScCellValue& rCell ); static ScChangeActionContentCellType GetContentCellType( const ScRefCellValue& rIter ); @@ -834,9 +834,9 @@ public: const ScChangeActionState eState, const sal_uLong nRejectingNumber, const ScBigRange& aBigRange, - const rtl::OUString& aUser, + const OUString& aUser, const DateTime& aDateTime, - const rtl::OUString &sComment); // only to use in the XML import + const OUString &sComment); // only to use in the XML import }; @@ -896,8 +896,8 @@ class ScChangeTrack : public utl::ConfigurationListener ScChangeTrackMsgQueue aMsgQueue; ScChangeTrackMsgStack aMsgStackTmp; ScChangeTrackMsgStack aMsgStackFinal; - std::set<rtl::OUString> maUserCollection; - rtl::OUString maUser; + std::set<OUString> maUserCollection; + OUString maUser; Link aModifiedLink; ScRange aInDeleteRange; DateTime aFixDateTime; @@ -1017,7 +1017,7 @@ public: } SC_DLLPUBLIC ScChangeTrack( ScDocument* ); - ScChangeTrack(ScDocument* pDocP, const std::set<rtl::OUString>& aTempUserCollection); // only to use in the XML import + ScChangeTrack(ScDocument* pDocP, const std::set<OUString>& aTempUserCollection); // only to use in the XML import SC_DLLPUBLIC virtual ~ScChangeTrack(); void Clear(); @@ -1070,9 +1070,9 @@ public: bool IsInDeleteTop() const { return bInDeleteTop; } bool IsInDeleteUndo() const { return bInDeleteUndo; } bool IsInPasteCut() const { return bInPasteCut; } - SC_DLLPUBLIC void SetUser( const rtl::OUString& rUser ); - SC_DLLPUBLIC const rtl::OUString& GetUser() const; - SC_DLLPUBLIC const std::set<rtl::OUString>& GetUserCollection() const; + SC_DLLPUBLIC void SetUser( const OUString& rUser ); + SC_DLLPUBLIC const OUString& GetUser() const; + SC_DLLPUBLIC const std::set<OUString>& GetUserCollection() const; ScDocument* GetDocument() const { return pDoc; } // for import filter const DateTime& GetFixDateTime() const { return aFixDateTime; } @@ -1222,7 +1222,7 @@ public: sal_uLong nStartAction, sal_uLong nEndAction ); sal_uLong AddLoadedGenerated( - const ScCellValue& rNewCell, const ScBigRange& aBigRange, const rtl::OUString& sNewValue ); // only to use in the XML import + const ScCellValue& rNewCell, const ScBigRange& aBigRange, const OUString& sNewValue ); // only to use in the XML import void AppendLoaded( ScChangeAction* pAppend ); // this is only for the XML import public, it should be protected void SetActionMax(sal_uLong nTempActionMax) { nActionMax = nTempActionMax; } // only to use in the XML import diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 9c001cda8ba1..565225a76730 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -40,8 +40,8 @@ private: utl::TextSearch* pCommentSearcher; DateTime aFirstDateTime; DateTime aLastDateTime; - ::rtl::OUString aAuthorToShow; - ::rtl::OUString aComment; + OUString aAuthorToShow; + OUString aComment; ScRangeList aRangeList; ScChgsDateMode eDateMode; sal_Bool bShowIt; @@ -98,16 +98,16 @@ public: sal_Bool HasAuthor() const {return bIsAuthor;} void SetHasAuthor(sal_Bool nFlag=sal_True) {bIsAuthor=nFlag;} - ::rtl::OUString GetTheAuthorToShow()const {return aAuthorToShow;} - void SetTheAuthorToShow(const ::rtl::OUString& aString){aAuthorToShow=aString;} + OUString GetTheAuthorToShow()const {return aAuthorToShow;} + void SetTheAuthorToShow(const OUString& aString){aAuthorToShow=aString;} sal_Bool HasComment() const {return bIsComment;} void SetHasComment(sal_Bool nFlag=sal_True) {bIsComment=nFlag;} - ::rtl::OUString GetTheComment()const {return aComment;} - void SetTheComment(const ::rtl::OUString& aString); + OUString GetTheComment()const {return aComment;} + void SetTheComment(const OUString& aString); - sal_Bool IsValidComment(const ::rtl::OUString* pCommentStr) const; + sal_Bool IsValidComment(const OUString* pCommentStr) const; sal_Bool IsEveryoneButMe() const {return bEveryoneButMe;} void SetEveryoneButMe(sal_Bool nFlag=sal_True) {bEveryoneButMe=nFlag;} diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index be31eb785b2b..f7413a2d6315 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -79,13 +79,13 @@ public: void SetColor(const Color&); double GetValue() const; void SetValue(double nValue); - void SetFormula(const rtl::OUString& rFormula, ScDocument* pDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT); + void SetFormula(const OUString& rFormula, ScDocument* pDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT); void UpdateMoveTab(SCTAB nOldTab, SCTAB nNewTab, SCTAB nTabNo); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); const ScTokenArray* GetFormula() const; - rtl::OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const; + OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const; ScColorScaleEntryType GetType() const; void SetType( ScColorScaleEntryType eType ); diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index fec98d941331..e872d87ec5b8 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -274,14 +274,14 @@ public: void SetValue( SCROW nRow, const double& rVal); void SetError( SCROW nRow, const sal_uInt16 nError); - void GetString( SCROW nRow, rtl::OUString& rString ) const; + void GetString( SCROW nRow, OUString& rString ) const; const OUString* GetStringCell( SCROW nRow ) const; double* GetValueCell( SCROW nRow ); - void GetInputString( SCROW nRow, rtl::OUString& rString ) const; + void GetInputString( SCROW nRow, OUString& rString ) const; double GetValue( SCROW nRow ) const; const EditTextObject* GetEditText( SCROW nRow ) const; void RemoveEditTextCharAttribs( SCROW nRow, const ScPatternAttr& rAttr ); - void GetFormula( SCROW nRow, rtl::OUString& rFormula ) const; + void GetFormula( SCROW nRow, OUString& rFormula ) const; const ScTokenArray* GetFormulaTokens( SCROW nRow ) const; const ScFormulaCell* GetFormulaCell( SCROW nRow ) const; ScFormulaCell* GetFormulaCell( SCROW nRow ); diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index c70d184141c2..518635ddf669 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -235,7 +235,7 @@ public: Convention( formula::FormulaGrammar::AddressConvention eConvP ); virtual ~Convention(); - virtual void MakeRefStr( rtl::OUStringBuffer& rBuffer, + virtual void MakeRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler, const ScComplexRefData& rRef, bool bSingleRef ) const = 0; @@ -257,11 +257,11 @@ public: virtual String makeExternalNameStr( const String& rFile, const String& rName ) const = 0; - virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler, + virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler, sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef, ScExternalRefManager* pRefMgr ) const = 0; - virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler, + virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler, sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef, ScExternalRefManager* pRefMgr ) const = 0; @@ -426,7 +426,7 @@ public: maExternalLinks = rLinks; } - void CreateStringFromXMLTokenArray( rtl::OUString& rFormula, rtl::OUString& rFormulaNmsp ); + void CreateStringFromXMLTokenArray( OUString& rFormula, OUString& rFormulaNmsp ); void SetExtendedErrorDetection( ExtendedErrorDetection eVal ) { meExtendedErrorDetection = eVal; } @@ -542,11 +542,11 @@ private: virtual bool HandleDbData(); virtual formula::FormulaTokenRef ExtendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, bool bReuseDoubleRef ); - virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, formula::FormulaToken* pTokenP); - virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); - virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); - virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); - virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); + virtual void CreateStringFromExternal(OUStringBuffer& rBuffer, formula::FormulaToken* pTokenP); + virtual void CreateStringFromSingleRef(OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); + virtual void CreateStringFromDoubleRef(OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); + virtual void CreateStringFromMatrix( OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); + virtual void CreateStringFromIndex(OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); virtual void LocalizeString( String& rName ); // modify rName - input: exact name /// Access the CharTable flags diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 832af26d9db2..bcf72c93b959 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -100,7 +100,7 @@ struct ScCondFormatData Color* pColorScale; ScDataBarInfo* pDataBar; ScIconSetInfo* pIconSet; - rtl::OUString aStyleName; + OUString aStyleName; }; class SC_DLLPUBLIC ScFormatEntry @@ -146,10 +146,10 @@ class SC_DLLPUBLIC ScConditionEntry : public ScFormatEntry sal_uInt16 nOptions; double nVal1; // input or calculated double nVal2; - rtl::OUString aStrVal1; // input or calculated - rtl::OUString aStrVal2; - rtl::OUString aStrNmsp1; // namespace to be used on (re)compilation, e.g. in XML import - rtl::OUString aStrNmsp2; // namespace to be used on (re)compilation, e.g. in XML import + OUString aStrVal1; // input or calculated + OUString aStrVal2; + OUString aStrNmsp1; // namespace to be used on (re)compilation, e.g. in XML import + OUString aStrNmsp2; // namespace to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar1; // grammar to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar2; // grammar to be used on (re)compilation, e.g. in XML import bool bIsStr1; // for recognition of empty strings @@ -158,7 +158,7 @@ class SC_DLLPUBLIC ScConditionEntry : public ScFormatEntry ScTokenArray* pFormula2; ScAddress aSrcPos; // source position for formulas // temporary data: - rtl::OUString aSrcString; // formula source position as text during XML import + OUString aSrcString; // formula source position as text during XML import ScFormulaCell* pFCell1; ScFormulaCell* pFCell2; bool bRelRef1; @@ -166,21 +166,21 @@ class SC_DLLPUBLIC ScConditionEntry : public ScFormatEntry bool bFirstRun; void MakeCells( const ScAddress& rPos ); - void Compile( const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, + void Compile( const OUString& rExpr1, const OUString& rExpr2, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, formula::FormulaGrammar::Grammar eGrammar1, formula::FormulaGrammar::Grammar eGrammar2, bool bTextToReal ); void Interpret( const ScAddress& rPos ); bool IsValid( double nArg, const ScAddress& rPos ) const; - bool IsValidStr( const rtl::OUString& rArg, const ScAddress& rPos ) const; + bool IsValidStr( const OUString& rArg, const ScAddress& rPos ) const; public: ScConditionEntry( ScConditionMode eOper, - const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, + const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, formula::FormulaGrammar::Grammar eGrammar1, formula::FormulaGrammar::Grammar eGrammar2 ); ScConditionEntry( ScConditionMode eOper, @@ -204,12 +204,12 @@ public: ScAddress GetValidSrcPos() const; // adjusted to allow textual representation of expressions - void SetSrcString( const rtl::OUString& rNew ); // for XML import + void SetSrcString( const OUString& rNew ); // for XML import void SetFormula1( const ScTokenArray& rArray ); void SetFormula2( const ScTokenArray& rArray ); - rtl::OUString GetExpression( const ScAddress& rCursor, sal_uInt16 nPos, sal_uLong nNumFmt = 0, + OUString GetExpression( const ScAddress& rCursor, sal_uInt16 nPos, sal_uLong nNumFmt = 0, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; ScTokenArray* CreateTokenArry( sal_uInt16 nPos ) const; @@ -240,7 +240,7 @@ protected: private: - bool IsDuplicate(double nArg, const rtl::OUString& rStr) const; + bool IsDuplicate(double nArg, const OUString& rStr) const; bool IsTopNElement( double nArg ) const; bool IsTopNPercent( double nArg ) const; bool IsBottomNElement( double nArg ) const; @@ -254,7 +254,7 @@ private: struct ScConditionEntryCache { - typedef std::map<rtl::OUString, sal_Int32> StringCacheType; + typedef std::map<OUString, sal_Int32> StringCacheType; StringCacheType maStrings; typedef std::map<double, sal_Int32, approx_less> ValueCacheType; ValueCacheType maValues; @@ -275,31 +275,31 @@ private: class SC_DLLPUBLIC ScCondFormatEntry : public ScConditionEntry { - rtl::OUString aStyleName; + OUString aStyleName; using ScConditionEntry::operator==; public: ScCondFormatEntry( ScConditionMode eOper, - const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, + const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rStyle, - const rtl::OUString& rExprNmsp1 = EMPTY_STRING, - const rtl::OUString& rExprNmsp2 = EMPTY_STRING, + const OUString& rStyle, + const OUString& rExprNmsp1 = EMPTY_STRING, + const OUString& rExprNmsp2 = EMPTY_STRING, formula::FormulaGrammar::Grammar eGrammar1 = formula::FormulaGrammar::GRAM_DEFAULT, formula::FormulaGrammar::Grammar eGrammar2 = formula::FormulaGrammar::GRAM_DEFAULT ); ScCondFormatEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rStyle ); + const OUString& rStyle ); ScCondFormatEntry( const ScCondFormatEntry& r ); ScCondFormatEntry( ScDocument* pDocument, const ScCondFormatEntry& r ); virtual ~ScCondFormatEntry(); int operator== ( const ScCondFormatEntry& r ) const; - const rtl::OUString& GetStyle() const { return aStyleName; } - void UpdateStyleName(const rtl::OUString& rNew) { aStyleName=rNew; } + const OUString& GetStyle() const { return aStyleName; } + void UpdateStyleName(const OUString& rNew) { aStyleName=rNew; } virtual ScFormatEntry* Clone(ScDocument* pDoc) const; protected: @@ -338,8 +338,8 @@ public: void SetDateType(condformat::ScCondFormatDateType eType); condformat::ScCondFormatDateType GetDateType() const; - const rtl::OUString& GetStyleName() const; - void SetStyleName( const rtl::OUString& rStyleName ); + const OUString& GetStyleName() const; + void SetStyleName( const OUString& rStyleName ); virtual condformat::ScFormatEntryType GetType() const { return condformat::DATE; } virtual void UpdateReference( UpdateRefMode, const ScRange&, @@ -360,7 +360,7 @@ private: mutable boost::scoped_ptr<Date> mpCache; - rtl::OUString maStyleName; + OUString maStyleName; }; // @@ -399,7 +399,7 @@ public: const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bCopyAsMove = false ); void DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - void RenameCellStyle( const rtl::OUString& rOld, const rtl::OUString& rNew ); + void RenameCellStyle( const OUString& rOld, const OUString& rNew ); void SourceChanged( const ScAddress& rAddr ); @@ -457,7 +457,7 @@ public: void CompileXML(); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void RenameCellStyle( const rtl::OUString& rOld, const rtl::OUString& rNew ); + void RenameCellStyle( const OUString& rOld, const OUString& rNew ); void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); void DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index 740fffa209d4..7116f50a1eae 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -48,7 +48,7 @@ public: 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, + 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, @@ -56,29 +56,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -86,11 +86,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx index 3bd8db474577..8b3b4344d6c5 100644 --- a/sc/inc/cursuno.hxx +++ b/sc/inc/cursuno.hxx @@ -79,15 +79,15 @@ public: ::com::sun::star::uno::RuntimeException); using ScCellRangeObj::getCellRangeByName; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getCellRangeByName( const ::rtl::OUString& aRange ) + getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 5281106b4d7a..4dbc74684c2e 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -96,7 +96,7 @@ private: SCTAB nTab; ScDataPilotTableObj* GetObjectByIndex_Impl( sal_Int32 nIndex ); - ScDataPilotTableObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDataPilotTableObj* GetObjectByName_Impl(const OUString& aName); public: ScDataPilotTablesObj(ScDocShell* pDocSh, SCTAB nT); @@ -107,22 +107,22 @@ public: // XDataPilotTables virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor > SAL_CALL createDataPilotDescriptor() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertNewByName( const OUString& aName, const ::com::sun::star::table::CellAddress& aOutputAddress, const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -142,11 +142,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -208,7 +208,7 @@ public: 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, + 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, @@ -216,29 +216,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -281,19 +281,19 @@ public: virtual void SetDPObject(ScDPObject* pDPObj); // rest of XDataPilotDescriptor (incl. XNamed) - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) + virtual OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTag( const OUString& aTag ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -324,11 +324,11 @@ public: virtual void SetDPObject(ScDPObject* pDPObj); // rest of XDataPilotDescriptor (incl. XNamed) - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) + virtual OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTag( const OUString& aTag ) throw(::com::sun::star::uno::RuntimeException); // XDataPilotTable @@ -367,24 +367,24 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; struct ScFieldIdentifier { - ::rtl::OUString maFieldName; /// Source field name. + OUString maFieldName; /// Source field name. sal_Int32 mnFieldIdx; /// Field index (if several fields with same name exist). bool mbDataLayout; /// True = data layout field collecting all data fields as items. inline explicit ScFieldIdentifier() : mnFieldIdx( 0 ), mbDataLayout( false ) {} - inline explicit ScFieldIdentifier( const ::rtl::OUString& rFieldName, sal_Int32 nFieldIdx, bool bDataLayout ) : + inline explicit ScFieldIdentifier( const OUString& rFieldName, sal_Int32 nFieldIdx, bool bDataLayout ) : maFieldName( rFieldName ), mnFieldIdx( nFieldIdx ), mbDataLayout( bDataLayout ) {} }; @@ -443,13 +443,13 @@ public: virtual ~ScDataPilotFieldsObj(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -469,16 +469,16 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: ScDataPilotFieldObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; - ScDataPilotFieldObj* GetObjectByName_Impl( const ::rtl::OUString& rName ) const; + ScDataPilotFieldObj* GetObjectByName_Impl( const OUString& rName ) const; private: ::com::sun::star::uno::Any maOrient; /// Field orientation, no value = all fields. @@ -510,15 +510,15 @@ public: virtual ~ScDataPilotFieldObj(); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // 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, + 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, @@ -526,29 +526,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -566,8 +566,8 @@ public: void setFunction(com::sun::star::sheet::GeneralFunction Function); com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction > getSubtotals() const; void setSubtotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction >& rFunctions); - rtl::OUString getCurrentPage() const; - void setCurrentPage(const rtl::OUString& sPage); + OUString getCurrentPage() const; + void setCurrentPage(const OUString& sPage); sal_Bool getUseCurrentPage() const; void setUseCurrentPage(sal_Bool bUse); const com::sun::star::sheet::DataPilotFieldAutoShowInfo* getAutoShowInfo(); @@ -586,9 +586,9 @@ public: void setGroupInfo(const com::sun::star::sheet::DataPilotFieldGroupInfo* pInfo); // XDataPilotFieldGrouping - sal_Bool HasString(const com::sun::star::uno::Sequence< ::rtl::OUString >& aItems, const ::rtl::OUString& aString); + sal_Bool HasString(const com::sun::star::uno::Sequence< OUString >& aItems, const OUString& aString); virtual com::sun::star::uno::Reference < com::sun::star::sheet::XDataPilotField > SAL_CALL - createNameGroup(const com::sun::star::uno::Sequence< ::rtl::OUString >& aItems) + createNameGroup(const com::sun::star::uno::Sequence< OUString >& aItems) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual com::sun::star::uno::Reference < com::sun::star::sheet::XDataPilotField > SAL_CALL @@ -597,11 +597,11 @@ public: ::com::sun::star::lang::IllegalArgumentException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: @@ -611,11 +611,11 @@ private: ::com::sun::star::uno::Any maOrient; }; -typedef ::std::vector< ::rtl::OUString > ScFieldGroupMembers; +typedef ::std::vector< OUString > ScFieldGroupMembers; struct ScFieldGroup { - ::rtl::OUString maName; + OUString maName; ScFieldGroupMembers maMembers; }; @@ -643,17 +643,17 @@ public: virtual ~ScDataPilotFieldGroupsObj(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + 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, @@ -661,13 +661,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + 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 ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -689,19 +689,19 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // implementation - ScFieldGroup& getFieldGroup( const ::rtl::OUString& rName ) throw(::com::sun::star::uno::RuntimeException); - void renameFieldGroup( const ::rtl::OUString& rOldName, const ::rtl::OUString& rNewName ) throw(::com::sun::star::uno::RuntimeException); + ScFieldGroup& getFieldGroup( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException); + void renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(::com::sun::star::uno::RuntimeException); private: - ScFieldGroups::iterator implFindByName( const ::rtl::OUString& rName ); + ScFieldGroups::iterator implFindByName( const OUString& rName ); private: ScFieldGroups maGroups; @@ -720,21 +720,21 @@ ScDataPilotFieldGroupObjImpl; class ScDataPilotFieldGroupObj : public ScDataPilotFieldGroupObjImpl { public: - explicit ScDataPilotFieldGroupObj( ScDataPilotFieldGroupsObj& rParent, const ::rtl::OUString& rGroupName ); + explicit ScDataPilotFieldGroupObj( ScDataPilotFieldGroupsObj& rParent, const OUString& rGroupName ); virtual ~ScDataPilotFieldGroupObj(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + 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, @@ -742,13 +742,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + 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 ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -770,21 +770,21 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: ScDataPilotFieldGroupsObj& mrParent; - ::rtl::OUString maGroupName; + OUString maGroupName; }; typedef ::cppu::WeakImplHelper2 @@ -797,25 +797,25 @@ ScDataPilotFieldGroupItemObjImpl; class ScDataPilotFieldGroupItemObj : public ScDataPilotFieldGroupItemObjImpl { public: - explicit ScDataPilotFieldGroupItemObj( ScDataPilotFieldGroupObj& rParent, const ::rtl::OUString& rName ); + explicit ScDataPilotFieldGroupItemObj( ScDataPilotFieldGroupObj& rParent, const OUString& rName ); virtual ~ScDataPilotFieldGroupItemObj(); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: ScDataPilotFieldGroupObj& mrParent; - ::rtl::OUString maName; + OUString maName; }; typedef ::cppu::WeakImplHelper4 @@ -834,13 +834,13 @@ public: virtual ~ScDataPilotItemsObj(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -860,11 +860,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: @@ -890,15 +890,15 @@ public: virtual ~ScDataPilotItemObj(); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // 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, + 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, @@ -906,29 +906,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -936,11 +936,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 29c997606b5f..2acde1871cb9 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -155,7 +155,7 @@ public: 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, + 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, @@ -163,29 +163,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -202,11 +202,11 @@ public: com::sun::star::sheet::XSubTotalDescriptor> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -272,11 +272,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -321,11 +321,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -383,7 +383,7 @@ public: 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, + 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, @@ -391,29 +391,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -421,11 +421,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -520,8 +520,8 @@ public: void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDatabaseRange @@ -555,7 +555,7 @@ public: 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, + 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, @@ -563,29 +563,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -593,11 +593,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -613,7 +613,7 @@ private: ScDocShell* pDocShell; ScDatabaseRangeObj* GetObjectByIndex_Impl(size_t nIndex); - ScDatabaseRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDatabaseRangeObj* GetObjectByName_Impl(const OUString& aName); public: ScDatabaseRangesObj(ScDocShell* pDocSh); @@ -622,10 +622,10 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDatabaseRanges - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const OUString& aName, const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess @@ -645,21 +645,21 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index a3090db29232..fcd5d492121b 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -44,8 +44,8 @@ private: boost::scoped_ptr<ScImportParam> mpImportParam; // DBParam - const ::rtl::OUString aName; - ::rtl::OUString aUpper; + const OUString aName; + OUString aUpper; SCTAB nTable; SCCOL nStartCol; SCROW nStartRow; @@ -75,20 +75,20 @@ public: bool operator() (const ScDBData& left, const ScDBData& right) const; }; - SC_DLLPUBLIC ScDBData(const ::rtl::OUString& rName, + SC_DLLPUBLIC ScDBData(const OUString& rName, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bByR = true, bool bHasH = true); ScDBData(const ScDBData& rData); - ScDBData(const ::rtl::OUString& rName, const ScDBData& rData); + ScDBData(const OUString& rName, const ScDBData& rData); ~ScDBData(); ScDBData& operator= (const ScDBData& rData); bool operator== (const ScDBData& rData) const; - const ::rtl::OUString& GetName() const { return aName; } - const ::rtl::OUString& GetUpperName() const { return aUpper; } + const OUString& GetName() const { return aName; } + const OUString& GetUpperName() const { return aUpper; } void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const; SC_DLLPUBLIC void GetArea(ScRange& rRange) const; void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); @@ -106,8 +106,8 @@ public: bool IsStripData() const { return bStripData; } void SetStripData(bool bSet) { bStripData = bSet; } - ::rtl::OUString GetSourceString() const; - ::rtl::OUString GetOperations() const; + OUString GetSourceString() const; + OUString GetOperations() const; void GetSortParam(ScSortParam& rSortParam) const; void SetSortParam(const ScSortParam& rSortParam); @@ -176,7 +176,7 @@ public: const_iterator begin() const; const_iterator end() const; ScDBData* findByIndex(sal_uInt16 nIndex); - ScDBData* findByUpperName(const ::rtl::OUString& rName); + ScDBData* findByUpperName(const OUString& rName); bool insert(ScDBData* p); void erase(iterator itr); void erase(const ScDBData& r); diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index a1e74f8ee75a..ff0fd4592a7c 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -39,7 +39,7 @@ class SC_DLLPUBLIC ScDefaultsOptions { private: SCTAB nInitTabCount; // number of Tabs for new Spreadsheet doc - ::rtl::OUString aInitTabPrefix; // The Tab prefix name in new Spreadsheet doc + OUString aInitTabPrefix; // The Tab prefix name in new Spreadsheet doc public: @@ -51,8 +51,8 @@ public: SCTAB GetInitTabCount() const { return nInitTabCount; } void SetInitTabCount( SCTAB nTabs) { nInitTabCount = nTabs; } - void SetInitTabPrefix(const rtl::OUString& aPrefix) { aInitTabPrefix = aPrefix; } - ::rtl::OUString GetInitTabPrefix() const { return aInitTabPrefix; } + void SetInitTabPrefix(const OUString& aPrefix) { aInitTabPrefix = aPrefix; } + OUString GetInitTabPrefix() const { return aInitTabPrefix; } ScDefaultsOptions& operator= ( const ScDefaultsOptions& rCpy ); bool operator== ( const ScDefaultsOptions& rOpt ) const; @@ -89,14 +89,14 @@ private: class ScDefaultsCfg : public ScDefaultsOptions, public utl::ConfigItem { - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetPropertyNames(); public: ScDefaultsCfg(); void SetOptions( const ScDefaultsOptions& rNew ); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index 65328ec253ba..faf69d33695f 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -52,7 +52,7 @@ public: 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, + 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, @@ -60,29 +60,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -91,29 +91,29 @@ public: // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( - const ::rtl::OUString& PropertyName ) + 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 ) + OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + 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 ::rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index f942745c18a8..6cf94b2815ac 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -71,7 +71,7 @@ public: // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, - const ::rtl::OUString& aTargetFrameName, + const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index c38f2001fbed..cfffb7ef2f56 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -132,7 +132,7 @@ class ScDBQueryDataIterator public: struct Value { - ::rtl::OUString maString; + OUString maString; double mfValue; sal_uInt16 mnError; bool mbIsNumber; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 8d22a6213e20..abfbe7e9a7a9 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -175,8 +175,8 @@ class ScDocCfg : public ScDocOptions DECL_LINK( CalcCommitHdl, void* ); DECL_LINK( LayoutCommitHdl, void* ); - com::sun::star::uno::Sequence<rtl::OUString> GetCalcPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetLayoutPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetCalcPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); public: ScDocCfg(); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 6346b201ca86..a6438adcb429 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -189,7 +189,7 @@ enum ScDocumentMode struct ScDocStat { - rtl::OUString aDocName; + OUString aDocName; SCTAB nTableCount; sal_uLong nCellCount; sal_uInt16 nPageCount; @@ -237,7 +237,7 @@ private: ScValidationDataList* pValidationList; // validity SvNumberFormatterIndexTable* pFormatExchangeList; // for application of number formats TableContainer maTabs; - std::vector<rtl::OUString> maTabNames; // for undo document, we need the information tab name <-> index + std::vector<OUString> maTabNames; // for undo document, we need the information tab name <-> index mutable ScRangeName* pRangeName; ScDBCollection* pDBCollection; ScDPCollection* pDPCollection; @@ -275,9 +275,9 @@ private: mutable ::std::auto_ptr< ScFormulaParserPool > mxFormulaParserPool; /// Pool for all external formula parsers used by this document. - rtl::OUString aDocName; // optional: name of document - rtl::OUString aDocCodeName; // optional: name of document (twice?) - rtl::OUString maFileURL; // file URL for copy & paste + OUString aDocName; // optional: name of document + OUString aDocCodeName; // optional: name of document (twice?) + OUString maFileURL; // file URL for copy & paste ScRangePairListRef xColNameRanges; ScRangePairListRef xRowNameRanges; @@ -424,11 +424,11 @@ public: inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > GetServiceManager() const { return xServiceManager; } - SC_DLLPUBLIC const rtl::OUString& GetName() const { return aDocName; } - void SetName( const rtl::OUString& r ) { aDocName = r; } - const rtl::OUString& GetCodeName() const { return aDocCodeName; } - void SetCodeName( const rtl::OUString& r ) { aDocCodeName = r; } - const rtl::OUString& GetFileURL() const { return maFileURL; } + SC_DLLPUBLIC const OUString& GetName() const { return aDocName; } + void SetName( const OUString& r ) { aDocName = r; } + const OUString& GetCodeName() const { return aDocCodeName; } + void SetCodeName( const OUString& r ) { aDocCodeName = r; } + const OUString& GetFileURL() const { return maFileURL; } void GetDocStat( ScDocStat& rDocStat ); @@ -464,9 +464,9 @@ public: * non-empty range name set. */ SC_DLLPUBLIC void GetAllTabRangeNames(ScRangeName::TabNameCopyMap& rRangeNames) const; - SC_DLLPUBLIC void SetAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap); - SC_DLLPUBLIC void GetTabRangeNameMap(std::map<rtl::OUString, ScRangeName*>& rRangeName); - SC_DLLPUBLIC void GetRangeNameMap(std::map<rtl::OUString, ScRangeName*>& rRangeName); + SC_DLLPUBLIC void SetAllRangeNames( const boost::ptr_map<OUString, ScRangeName>& rRangeMap); + SC_DLLPUBLIC void GetTabRangeNameMap(std::map<OUString, ScRangeName*>& rRangeName); + SC_DLLPUBLIC void GetRangeNameMap(std::map<OUString, ScRangeName*>& rRangeName); SC_DLLPUBLIC ScRangeName* GetRangeName(SCTAB nTab) const; SC_DLLPUBLIC ScRangeName* GetRangeName() const; void SetRangeName(SCTAB nTab, ScRangeName* pNew); @@ -487,7 +487,7 @@ public: const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - SC_DLLPUBLIC const ScRangeData* GetRangeAtBlock( const ScRange& rBlock, rtl::OUString* pName=NULL ) const; + SC_DLLPUBLIC const ScRangeData* GetRangeAtBlock( const ScRange& rBlock, OUString* pName=NULL ) const; bool HasPivotTable() const; SC_DLLPUBLIC ScDPCollection* GetDPCollection(); @@ -502,22 +502,22 @@ public: void EnsureGraphicNames(); SdrObject* GetObjectAtPoint( SCTAB nTab, const Point& rPos ); - bool HasChartAtPoint( SCTAB nTab, const Point& rPos, rtl::OUString& rName ); + bool HasChartAtPoint( SCTAB nTab, const Point& rPos, OUString& rName ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const rtl::OUString& rChartName ); - SC_DLLPUBLIC void GetChartRanges( const rtl::OUString& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); - void SetChartRanges( const rtl::OUString& rChartName, const ::std::vector< ScRangeList >& rRanges ); + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const OUString& rChartName ); + SC_DLLPUBLIC void GetChartRanges( const OUString& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); + void SetChartRanges( const OUString& rChartName, const ::std::vector< ScRangeList >& rRanges ); - void UpdateChartArea( const rtl::OUString& rChartName, const ScRange& rNewArea, + void UpdateChartArea( const OUString& rChartName, const ScRange& rNewArea, bool bColHeaders, bool bRowHeaders, bool bAdd ); - void UpdateChartArea( const rtl::OUString& rChartName, + void UpdateChartArea( const OUString& rChartName, const ScRangeListRef& rNewList, bool bColHeaders, bool bRowHeaders, bool bAdd ); - void GetOldChartParameters( const rtl::OUString& rName, + void GetOldChartParameters( const OUString& rName, ScRangeList& rRanges, bool& rColHeaders, bool& rRowHeaders ); ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > - FindOleObjectByName( const rtl::OUString& rName ); + FindOleObjectByName( const OUString& rName ); SC_DLLPUBLIC void MakeTable( SCTAB nTab,bool _bNeedsNameCheck = true ); @@ -525,11 +525,11 @@ public: SC_DLLPUBLIC void SetVisibleTab(SCTAB nTab) { nVisibleTab = nTab; } SC_DLLPUBLIC bool HasTable( SCTAB nTab ) const; - SC_DLLPUBLIC bool GetName( SCTAB nTab, rtl::OUString& rName ) const; - SC_DLLPUBLIC bool GetCodeName( SCTAB nTab, rtl::OUString& rName ) const; - SC_DLLPUBLIC bool SetCodeName( SCTAB nTab, const rtl::OUString& rName ); - SC_DLLPUBLIC bool GetTable( const rtl::OUString& rName, SCTAB& rTab ) const; - rtl::OUString GetCopyTabName(SCTAB nTab) const; + SC_DLLPUBLIC bool GetName( SCTAB nTab, OUString& rName ) const; + SC_DLLPUBLIC bool GetCodeName( SCTAB nTab, OUString& rName ) const; + SC_DLLPUBLIC bool SetCodeName( SCTAB nTab, const OUString& rName ); + SC_DLLPUBLIC bool GetTable( const OUString& rName, SCTAB& rTab ) const; + OUString GetCopyTabName(SCTAB nTab) const; SC_DLLPUBLIC void SetAnonymousDBData(SCTAB nTab, ScDBData* pDBData); SC_DLLPUBLIC ScDBData* GetAnonymousDBData(SCTAB nTab); @@ -567,23 +567,23 @@ public: Rectangle GetEmbeddedRect() const; // 1/100 mm void SetEmbedded( SCTAB nTab, const Rectangle& rRect ); // from VisArea (1/100 mm) - static SC_DLLPUBLIC bool ValidTabName( const rtl::OUString& rName ); + static SC_DLLPUBLIC bool ValidTabName( const OUString& rName ); - SC_DLLPUBLIC bool ValidNewTabName( const rtl::OUString& rName ) const; - SC_DLLPUBLIC void CreateValidTabName(rtl::OUString& rName) const; - SC_DLLPUBLIC void CreateValidTabNames(std::vector<rtl::OUString>& aNames, SCTAB nCount) const; + SC_DLLPUBLIC bool ValidNewTabName( const OUString& rName ) const; + SC_DLLPUBLIC void CreateValidTabName(OUString& rName) const; + SC_DLLPUBLIC void CreateValidTabNames(std::vector<OUString>& aNames, SCTAB nCount) const; - void AppendTabOnLoad(const rtl::OUString& rName); - void SetTabNameOnLoad(SCTAB nTab, const rtl::OUString& rName); + void AppendTabOnLoad(const OUString& rName); + void SetTabNameOnLoad(SCTAB nTab, const OUString& rName); void InvalidateStreamOnSave(); - SC_DLLPUBLIC bool InsertTab( SCTAB nPos, const rtl::OUString& rName, + SC_DLLPUBLIC bool InsertTab( SCTAB nPos, const OUString& rName, bool bExternalDocument = false ); - SC_DLLPUBLIC bool InsertTabs( SCTAB nPos, const std::vector<rtl::OUString>& rNames, + SC_DLLPUBLIC bool InsertTabs( SCTAB nPos, const std::vector<OUString>& rNames, bool bExternalDocument = false, bool bNamesValid = false ); SC_DLLPUBLIC bool DeleteTabs( SCTAB nTab, SCTAB nSheets, ScDocument* pRefUndoDoc = NULL ); SC_DLLPUBLIC bool DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc = NULL ); - SC_DLLPUBLIC bool RenameTab( SCTAB nTab, const rtl::OUString& rName, + SC_DLLPUBLIC bool RenameTab( SCTAB nTab, const OUString& rName, bool bUpdateRef = true, bool bExternalDocument = false ); bool MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress = NULL ); @@ -606,9 +606,9 @@ public: bool IsNegativePage( SCTAB nTab ) const; SC_DLLPUBLIC void SetScenario( SCTAB nTab, bool bFlag ); SC_DLLPUBLIC bool IsScenario( SCTAB nTab ) const; - SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, rtl::OUString& rComment, + SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const; - SC_DLLPUBLIC void SetScenarioData( SCTAB nTab, const rtl::OUString& rComment, + SC_DLLPUBLIC void SetScenarioData( SCTAB nTab, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ); SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const; SC_DLLPUBLIC void SetTabBgColor( SCTAB nTab, const Color& rColor ); @@ -621,19 +621,19 @@ public: void SetGrammar( formula::FormulaGrammar::Grammar eGram ); SC_DLLPUBLIC sal_uInt8 GetLinkMode( SCTAB nTab ) const; bool IsLinked( SCTAB nTab ) const; - SC_DLLPUBLIC const rtl::OUString GetLinkDoc( SCTAB nTab ) const; - const rtl::OUString GetLinkFlt( SCTAB nTab ) const; - const rtl::OUString GetLinkOpt( SCTAB nTab ) const; - SC_DLLPUBLIC const rtl::OUString GetLinkTab( SCTAB nTab ) const; + SC_DLLPUBLIC const OUString GetLinkDoc( SCTAB nTab ) const; + const OUString GetLinkFlt( SCTAB nTab ) const; + const OUString GetLinkOpt( SCTAB nTab ) const; + SC_DLLPUBLIC const OUString GetLinkTab( SCTAB nTab ) const; sal_uLong GetLinkRefreshDelay( SCTAB nTab ) const; - void SetLink( SCTAB nTab, sal_uInt8 nMode, const rtl::OUString& rDoc, - const rtl::OUString& rFilter, const rtl::OUString& rOptions, - const rtl::OUString& rTabName, sal_uLong nRefreshDelay ); - bool HasLink( const rtl::OUString& rDoc, - const rtl::OUString& rFilter, const rtl::OUString& rOptions ) const; - SC_DLLPUBLIC bool LinkExternalTab( SCTAB& nTab, const rtl::OUString& aDocTab, - const rtl::OUString& aFileName, - const rtl::OUString& aTabName ); + void SetLink( SCTAB nTab, sal_uInt8 nMode, const OUString& rDoc, + const OUString& rFilter, const OUString& rOptions, + const OUString& rTabName, sal_uLong nRefreshDelay ); + bool HasLink( const OUString& rDoc, + const OUString& rFilter, const OUString& rOptions ) const; + SC_DLLPUBLIC bool LinkExternalTab( SCTAB& nTab, const OUString& aDocTab, + const OUString& aFileName, + const OUString& aTabName ); bool HasExternalRefManager() const { return pExternalRefMgr.get(); } SC_DLLPUBLIC ScExternalRefManager* GetExternalRefManager() const; @@ -661,12 +661,12 @@ public: // for StarOne Api: sal_uInt16 GetDdeLinkCount() const; - bool UpdateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem ); + bool UpdateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ); /** Tries to find a DDE link with the specified connection data. @param rnDdePos (out-param) Returns the index of the DDE link (does not include other links from link manager). @return true = DDE link found, rnDdePos valid. */ - SC_DLLPUBLIC bool FindDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ); + SC_DLLPUBLIC bool FindDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ); /** Returns the connection data of the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @@ -674,7 +674,7 @@ public: @param rTopic (out-param) The DDE topic. @param rItem (out-param) The DDE item. @return true = DDE link found, out-parameters valid. */ - bool GetDdeLinkData( sal_uInt16 nDdePos, rtl::OUString& rAppl, rtl::OUString& rTopic, rtl::OUString& rItem ) const; + bool GetDdeLinkData( sal_uInt16 nDdePos, OUString& rAppl, OUString& rTopic, OUString& rItem ) const; /** Returns the link mode of the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @param rnMode (out-param) The link mode of the specified DDE link. @@ -688,7 +688,7 @@ public: /** Tries to find a DDE link or creates a new, if not extant. @param pResults If not 0, sets the matrix as as DDE link result matrix (also for existing links). @return true = DDE link found; false = Unpredictable error occurred, no DDE link created. */ - SC_DLLPUBLIC bool CreateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, ScMatrixRef pResults ); + SC_DLLPUBLIC bool CreateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, ScMatrixRef pResults ); /** Sets a result matrix for the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @param pResults The array containing all results of the DDE link (intrusive-ref-counted, do not delete). @@ -716,7 +716,7 @@ public: SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); //! only assigns the new RangeList, no ChartListener or the like - void SetChartRangeList( const rtl::OUString& rChartName, + void SetChartRangeList( const OUString& rChartName, const ScRangeListRef& rNewRangeListRef ); void StartAnimations( SCTAB nTab, Window* pWin ); @@ -749,7 +749,7 @@ public: // return TRUE = number format is set SC_DLLPUBLIC bool SetString( - SCCOL nCol, SCROW nRow, SCTAB nTab, const rtl::OUString& rString, + SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rString, ScSetStringParam* pParam = NULL ); SC_DLLPUBLIC bool SetString( const ScAddress& rPos, const OUString& rString, ScSetStringParam* pParam = NULL ); @@ -793,7 +793,7 @@ public: SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, - const rtl::OUString& rFormula, + const OUString& rFormula, const ScTokenArray* p = NULL, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, bool bDirtyFlag=true ); @@ -826,8 +826,8 @@ public: double* GetValueCell( const ScAddress& rPos ); SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); - SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rString ); - sal_uInt16 GetStringForFormula( const ScAddress& rPos, rtl::OUString& rString ); + SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rString ); + sal_uInt16 GetStringForFormula( const ScAddress& rPos, OUString& rString ); SC_DLLPUBLIC double GetValue( const ScAddress& rPos ) const; SC_DLLPUBLIC double GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { ScAddress aAdr(nCol, nRow, nTab); return GetValue(aAdr);} SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue ) const; @@ -851,7 +851,7 @@ public: const ScTokenArray* GetFormulaTokens( const ScAddress& rPos ) const; SC_DLLPUBLIC const ScFormulaCell* GetFormulaCell( const ScAddress& rPos ) const; SC_DLLPUBLIC ScFormulaCell* GetFormulaCell( const ScAddress& rPos ); - SC_DLLPUBLIC void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rFormula ) const; + SC_DLLPUBLIC void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rFormula ) const; SC_DLLPUBLIC void GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const; SC_DLLPUBLIC CellType GetCellType( const ScAddress& rPos ) const; @@ -1230,7 +1230,7 @@ public: sal_uLong nFillCount, FillDir eFillDir = FILL_TO_BOTTOM, FillCmd eFillCmd = FILL_LINEAR, FillDateCmd eFillDateCmd = FILL_DAY, double nStepValue = 1.0, double nMaxValue = 1E307 ); - rtl::OUString GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); + OUString GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); bool GetSelectionFunction( ScSubTotalFunc eFunc, const ScAddress& rCursor, const ScMarkData& rMark, @@ -1251,8 +1251,8 @@ public: const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const; SC_DLLPUBLIC const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator(); - bool HasStringWeakCharacters( const rtl::OUString& rString ); - SC_DLLPUBLIC sal_uInt8 GetStringScriptType( const rtl::OUString& rString ); + bool HasStringWeakCharacters( const OUString& rString ); + SC_DLLPUBLIC sal_uInt8 GetStringScriptType( const OUString& rString ); SC_DLLPUBLIC sal_uInt8 GetCellScriptType( const ScAddress& rPos, sal_uLong nNumberFormat ); SC_DLLPUBLIC sal_uInt8 GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab ); @@ -1352,7 +1352,7 @@ public: bool SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, SCTAB& rTab, const ScMarkData& rMark, ScRangeList& rMatchedRanges, - rtl::OUString& rUndoStr, ScDocument* pUndoDoc = NULL ); + OUString& rUndoStr, ScDocument* pUndoDoc = NULL ); // determine Col/Row of subsequent calls // (e.g. not found from the beginning, or subsequent tables) @@ -1362,7 +1362,7 @@ public: bool Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, SCCOL nVCol, SCROW nVRow, SCTAB nVTab, - const rtl::OUString& sValStr, double& nX); + const OUString& sValStr, double& nX); SC_DLLPUBLIC void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL ); @@ -1496,8 +1496,8 @@ public: SC_DLLPUBLIC ScStyleSheetPool* GetStyleSheetPool() const; // PageStyle: - SC_DLLPUBLIC const rtl::OUString GetPageStyle( SCTAB nTab ) const; - SC_DLLPUBLIC void SetPageStyle( SCTAB nTab, const rtl::OUString& rName ); + SC_DLLPUBLIC const OUString GetPageStyle( SCTAB nTab ) const; + SC_DLLPUBLIC void SetPageStyle( SCTAB nTab, const OUString& rName ); Size GetPageSize( SCTAB nTab ) const; void SetPageSize( SCTAB nTab, const Size& rSize ); void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); @@ -1506,13 +1506,13 @@ public: void RemoveManualBreaks( SCTAB nTab ); bool HasManualBreaks( SCTAB nTab ) const; - bool IsPageStyleInUse( const rtl::OUString& rStrPageStyle, SCTAB* pInTab = NULL ); - bool RemovePageStyleInUse( const rtl::OUString& rStrPageStyle ); - bool RenamePageStyleInUse( const rtl::OUString& rOld, const rtl::OUString& rNew ); + bool IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab = NULL ); + bool RemovePageStyleInUse( const OUString& rStrPageStyle ); + bool RenamePageStyleInUse( const OUString& rOld, const OUString& rNew ); void ModifyStyleSheet( SfxStyleSheetBase& rPageStyle, const SfxItemSet& rChanges ); - void PageStyleModified( SCTAB nTab, const rtl::OUString& rNewName ); + void PageStyleModified( SCTAB nTab, const OUString& rNewName ); SC_DLLPUBLIC bool NeedPageResetAfterTab( SCTAB nTab ) const; @@ -1563,7 +1563,7 @@ public: SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeepSub ); SC_DLLPUBLIC bool CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam ); - void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rStr); + void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rStr); /** * Get a list of unique strings to use in filtering criteria. The string @@ -1604,7 +1604,7 @@ public: void DoColResize( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); - void InvalidateTextWidth( const rtl::OUString& rStyleName ); + void InvalidateTextWidth( const OUString& rStyleName ); void InvalidateTextWidth( SCTAB nTab ); void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, bool bNumFormatChanged ); @@ -1655,14 +1655,14 @@ public: SC_DLLPUBLIC ScChartListenerCollection* GetChartListenerCollection() const; void SetChartListenerCollection( ScChartListenerCollection*, bool bSetChartRangeLists = false ); - void UpdateChart( const rtl::OUString& rName ); - void RestoreChartListener( const rtl::OUString& rName ); + void UpdateChart( const OUString& rName ); + void RestoreChartListener( const OUString& rName ); SC_DLLPUBLIC void UpdateChartListenerCollection(); bool IsChartListenerCollectionNeedsUpdate() const { return bChartListenerCollectionNeedsUpdate; } void SetChartListenerCollectionNeedsUpdate( bool bFlg ) { bChartListenerCollectionNeedsUpdate = bFlg; } - void AddOLEObjectToCollection(const rtl::OUString& rName); + void AddOLEObjectToCollection(const OUString& rName); ScChangeViewSettings* GetChangeViewSettings() const { return pChangeViewSettings; } SC_DLLPUBLIC void SetChangeViewSettings(const ScChangeViewSettings& rNew); diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 8659d4724cba..a8647e43bd29 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -106,7 +106,7 @@ private: com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter(); void HandleCalculateEvents(); - rtl::OUString maBuildId; + OUString maBuildId; protected: const SfxItemPropertySet& GetPropertySet() const { return aPropSet; } @@ -131,7 +131,7 @@ public: bool HasChangesListeners() const; - void NotifyChanges( const ::rtl::OUString& rOperation, const ScRangeList& rRanges, + void NotifyChanges( const OUString& rOperation, const ScRangeList& rRanges, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProperties = ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >() ); @@ -193,9 +193,9 @@ public: throw(::com::sun::star::uno::RuntimeException); // XProtectable - virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL protect( const OUString& aPassword ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL unprotect( const OUString& aPassword ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException); @@ -208,7 +208,7 @@ public: virtual ::com::sun::star::sheet::GoalResult SAL_CALL seekGoal( const ::com::sun::star::table::CellAddress& aFormulaPosition, const ::com::sun::star::table::CellAddress& aVariablePosition, - const ::rtl::OUString& aGoalValue ) + const OUString& aGoalValue ) throw(::com::sun::star::uno::RuntimeException); // XConsolidatable @@ -230,7 +230,7 @@ public: 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, + 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, @@ -238,29 +238,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -269,24 +269,24 @@ public: // XMultiServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstance( const ::rtl::OUString& aServiceSpecifier ) + createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, + createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel @@ -352,11 +352,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -373,7 +373,7 @@ private: ScDocShell* pDocShell; ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; - ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScTableSheetObj* GetObjectByName_Impl(const OUString& aName) const; public: ScTableSheetsObj(ScDocShell* pDocSh); @@ -382,19 +382,19 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XSpreadsheets - virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, sal_Int16 nPosition ) + virtual void SAL_CALL insertNewByName( const OUString& aName, sal_Int16 nPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveByName( const ::rtl::OUString& aName, sal_Int16 nDestination ) + virtual void SAL_CALL moveByName( const OUString& aName, sal_Int16 nDestination ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL copyByName( const ::rtl::OUString& aName, - const ::rtl::OUString& aCopy, sal_Int16 nDestination ) + virtual void SAL_CALL copyByName( const OUString& aName, + const OUString& aCopy, sal_Int16 nDestination ) throw(::com::sun::star::uno::RuntimeException); // XSpreadsheets2 virtual sal_Int32 SAL_CALL importSheet( const ::com::sun::star::uno::Reference < ::com::sun::star::sheet::XSpreadsheetDocument > & xDocSrc, - const rtl::OUString& srcName, + const OUString& srcName, const sal_Int32 nDestPosition) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, @@ -411,23 +411,23 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > > - SAL_CALL getCellRangesByName( const ::rtl::OUString& aRange ) + SAL_CALL getCellRangesByName( const OUString& aRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + 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 ::rtl::OUString& Name ) + 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, + 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, @@ -451,21 +451,21 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -485,7 +485,7 @@ private: SCCOL nEndCol; ScTableColumnObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; - ScTableColumnObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScTableColumnObj* GetObjectByName_Impl(const OUString& aName) const; public: ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, @@ -501,13 +501,13 @@ public: throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -530,7 +530,7 @@ public: 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, + 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, @@ -538,29 +538,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -568,11 +568,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -625,7 +625,7 @@ public: 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, + 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, @@ -633,29 +633,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -663,11 +663,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -689,7 +689,7 @@ public: 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, + 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, @@ -697,29 +697,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -727,11 +727,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -757,7 +757,7 @@ public: // XSheetAnnotations virtual void SAL_CALL insertNew( const ::com::sun::star::table::CellAddress& aPosition, - const ::rtl::OUString& aText ) + const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); @@ -779,11 +779,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -799,9 +799,9 @@ private: ScDocShell* pDocShell; SCTAB nTab; - sal_Bool GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex ); + sal_Bool GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex ); ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScTableSheetObj* GetObjectByName_Impl(const OUString& aName); public: ScScenariosObj(ScDocShell* pDocSh, SCTAB nT); @@ -810,22 +810,22 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XScenarios - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges, - const ::rtl::OUString& aComment ) + const OUString& aComment ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -845,11 +845,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index 69d11ec96bf0..5a75463314f6 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -44,12 +44,12 @@ struct ScDPNumGroupInfo; */ class SC_DLLPUBLIC ScDPCache : boost::noncopyable { - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StringSetType; + typedef boost::unordered_set<OUString, OUStringHash> StringSetType; public: typedef std::vector<ScDPItemData> ItemsType; typedef std::set<ScDPObject*> ObjectSetType; - typedef std::vector<rtl::OUString> LabelsType; + typedef std::vector<OUString> LabelsType; typedef std::vector<SCROW> IndexArrayType; struct GroupItems : boost::noncopyable @@ -93,7 +93,7 @@ public: { public: virtual long getColumnCount() const = 0; - virtual rtl::OUString getColumnLabel(long nCol) const = 0; + virtual OUString getColumnLabel(long nCol) const = 0; virtual bool first() = 0; virtual bool next() = 0; virtual void finish() = 0; @@ -126,13 +126,13 @@ private: bool mbDisposing; public: - const rtl::OUString* InternString(const rtl::OUString& rStr) const; + const OUString* InternString(const OUString& rStr) const; void AddReference(ScDPObject* pObj) const; void RemoveReference(ScDPObject* pObj) const; const ObjectSetType& GetAllReferences() const; SCROW GetIdByItemData(long nDim, const ScDPItemData& rItem) const; - rtl::OUString GetFormattedString(long nDim, const ScDPItemData& rItem) const; + OUString GetFormattedString(long nDim, const ScDPItemData& rItem) const; long AppendGroupField(); void ResetGroupItems(long nDim, const ScDPNumGroupInfo& rNumInfo, sal_Int32 nGroupType); SCROW SetGroupItem(long nDim, const ScDPItemData& rData); @@ -141,7 +141,7 @@ public: const ScDPNumGroupInfo* GetNumGroupInfo(long nDim) const; sal_Int32 GetGroupType(long nDim) const; - SCCOL GetDimensionIndex(const rtl::OUString& sName) const; + SCCOL GetDimensionIndex(const OUString& sName) const; sal_uLong GetNumberFormat( long nDim ) const; bool IsDateDimension( long nDim ) const ; long GetDimMemberCount(long nDim) const; @@ -154,7 +154,7 @@ public: SCROW GetRowCount() const; SCROW GetDataSize() const; SCROW GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) const; - rtl::OUString GetDimensionName(LabelsType::size_type nDim) const; + OUString GetDimensionName(LabelsType::size_type nDim) const; bool IsRowEmpty(SCROW nRow) const; bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam) const; @@ -173,7 +173,7 @@ public: private: void PostInit(); void Clear(); - void AddLabel(const rtl::OUString& rLabel); + void AddLabel(const OUString& rLabel); const GroupItems* GetGroupItems(long nDim) const; }; diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx index f1df1998afe6..488c08f6044a 100644 --- a/sc/inc/dpdimsave.hxx +++ b/sc/inc/dpdimsave.hxx @@ -42,26 +42,26 @@ class ScDPSaveGroupDimension; class SC_DLLPUBLIC ScDPSaveGroupItem { - rtl::OUString aGroupName; // name of group - std::vector<rtl::OUString> aElements; // names of items in original dimension + OUString aGroupName; // name of group + std::vector<OUString> aElements; // names of items in original dimension mutable std::vector<ScDPItemData> maItems; // items converted from the strings. public: - ScDPSaveGroupItem( const rtl::OUString& rName ); + ScDPSaveGroupItem( const OUString& rName ); ~ScDPSaveGroupItem(); void AddToData(ScDPGroupDimension& rDataDim) const; - void AddElement( const rtl::OUString& rName ); + void AddElement( const OUString& rName ); void AddElementsFromGroup( const ScDPSaveGroupItem& rGroup ); - const rtl::OUString& GetGroupName() const { return aGroupName; } - bool RemoveElement( const rtl::OUString& rName ); // returns true if found (removed) + const OUString& GetGroupName() const { return aGroupName; } + bool RemoveElement( const OUString& rName ); // returns true if found (removed) bool IsEmpty() const; size_t GetElementCount() const; - const rtl::OUString* GetElementByIndex(size_t nIndex) const; + const OUString* GetElementByIndex(size_t nIndex) const; - void Rename( const rtl::OUString& rNewName ); + void Rename( const OUString& rNewName ); // remove this group's elements from their groups in rDimension // (rDimension must be a different dimension from the one which contains this) @@ -79,15 +79,15 @@ typedef ::std::vector<ScDPSaveGroupItem> ScDPSaveGroupItemVec; */ class SC_DLLPUBLIC ScDPSaveGroupDimension { - rtl::OUString aSourceDim; // always the real source from the original data - rtl::OUString aGroupDimName; + OUString aSourceDim; // always the real source from the original data + OUString aGroupDimName; ScDPSaveGroupItemVec aGroups; mutable ScDPNumGroupInfo aDateInfo; sal_Int32 nDatePart; public: - ScDPSaveGroupDimension( const rtl::OUString& rSource, const rtl::OUString& rName ); - ScDPSaveGroupDimension( const rtl::OUString& rSource, const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ); + ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName ); + ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ); ~ScDPSaveGroupDimension(); void AddToData( ScDPGroupTableData& rData ) const; @@ -95,17 +95,17 @@ public: void SetDateInfo( const ScDPNumGroupInfo& rInfo, sal_Int32 nPart ); void AddGroupItem( const ScDPSaveGroupItem& rItem ); - const rtl::OUString& GetGroupDimName() const { return aGroupDimName; } - const rtl::OUString& GetSourceDimName() const { return aSourceDim; } + const OUString& GetGroupDimName() const { return aGroupDimName; } + const OUString& GetSourceDimName() const { return aSourceDim; } sal_Int32 GetDatePart() const { return nDatePart; } const ScDPNumGroupInfo& GetDateInfo() const { return aDateInfo; } - rtl::OUString CreateGroupName( const rtl::OUString& rPrefix ); - const ScDPSaveGroupItem* GetNamedGroup( const rtl::OUString& rGroupName ) const; - ScDPSaveGroupItem* GetNamedGroupAcc( const rtl::OUString& rGroupName ); - void RemoveFromGroups( const rtl::OUString& rItemName ); - void RemoveGroup(const rtl::OUString& rGroupName); + OUString CreateGroupName( const OUString& rPrefix ); + const ScDPSaveGroupItem* GetNamedGroup( const OUString& rGroupName ) const; + ScDPSaveGroupItem* GetNamedGroupAcc( const OUString& rGroupName ); + void RemoveFromGroups( const OUString& rItemName ); + void RemoveGroup(const OUString& rGroupName); bool IsEmpty() const; bool HasOnlyHidden(const ScDPUniqueStringSet& rVisible); @@ -113,7 +113,7 @@ public: const ScDPSaveGroupItem* GetGroupByIndex( long nIndex ) const; ScDPSaveGroupItem* GetGroupAccByIndex( long nIndex ); - void Rename( const rtl::OUString& rNewName ); + void Rename( const OUString& rNewName ); private: bool IsInGroup(const ScDPItemData& rItem) const; @@ -126,20 +126,20 @@ private: */ class SC_DLLPUBLIC ScDPSaveNumGroupDimension { - rtl::OUString aDimensionName; + OUString aDimensionName; mutable ScDPNumGroupInfo aGroupInfo; mutable ScDPNumGroupInfo aDateInfo; sal_Int32 nDatePart; public: - ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rInfo ); - ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ); + ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rInfo ); + ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ); ~ScDPSaveNumGroupDimension(); void AddToData( ScDPGroupTableData& rData ) const; void AddToCache(ScDPCache& rCache) const; - const rtl::OUString& GetDimensionName() const { return aDimensionName; } + const OUString& GetDimensionName() const { return aDimensionName; } const ScDPNumGroupInfo& GetInfo() const { return aGroupInfo; } sal_Int32 GetDatePart() const { return nDatePart; } @@ -165,42 +165,42 @@ public: void WriteToCache(ScDPCache& rCache) const; - rtl::OUString CreateGroupDimName( - const rtl::OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource, - const ::std::vector<rtl::OUString>* pDeletedNames ); + OUString CreateGroupDimName( + const OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource, + const ::std::vector<OUString>* pDeletedNames ); - rtl::OUString CreateDateGroupDimName( + OUString CreateDateGroupDimName( sal_Int32 nDatePart, const ScDPObject& rObject, bool bAllowSource, - const ::std::vector<rtl::OUString>* pDeletedNames ); + const ::std::vector<OUString>* pDeletedNames ); void AddGroupDimension( const ScDPSaveGroupDimension& rGroupDim ); void ReplaceGroupDimension( const ScDPSaveGroupDimension& rGroupDim ); - void RemoveGroupDimension( const rtl::OUString& rGroupDimName ); + void RemoveGroupDimension( const OUString& rGroupDimName ); void AddNumGroupDimension( const ScDPSaveNumGroupDimension& rGroupDim ); void ReplaceNumGroupDimension( const ScDPSaveNumGroupDimension& rGroupDim ); - void RemoveNumGroupDimension( const rtl::OUString& rGroupDimName ); + void RemoveNumGroupDimension( const OUString& rGroupDimName ); - const ScDPSaveGroupDimension* GetGroupDimForBase( const rtl::OUString& rBaseDimName ) const; - const ScDPSaveGroupDimension* GetNamedGroupDim( const rtl::OUString& rGroupDimName ) const; - const ScDPSaveGroupDimension* GetFirstNamedGroupDim( const rtl::OUString& rBaseDimName ) const; - const ScDPSaveGroupDimension* GetNextNamedGroupDim( const rtl::OUString& rGroupDimName ) const; - const ScDPSaveNumGroupDimension* GetNumGroupDim( const rtl::OUString& rGroupDimName ) const; + const ScDPSaveGroupDimension* GetGroupDimForBase( const OUString& rBaseDimName ) const; + const ScDPSaveGroupDimension* GetNamedGroupDim( const OUString& rGroupDimName ) const; + const ScDPSaveGroupDimension* GetFirstNamedGroupDim( const OUString& rBaseDimName ) const; + const ScDPSaveGroupDimension* GetNextNamedGroupDim( const OUString& rGroupDimName ) const; + const ScDPSaveNumGroupDimension* GetNumGroupDim( const OUString& rGroupDimName ) const; - ScDPSaveGroupDimension* GetGroupDimAccForBase( const rtl::OUString& rBaseDimName ); - ScDPSaveGroupDimension* GetNamedGroupDimAcc( const rtl::OUString& rGroupDimName ); - ScDPSaveGroupDimension* GetFirstNamedGroupDimAcc( const rtl::OUString& rBaseDimName ); - ScDPSaveGroupDimension* GetNextNamedGroupDimAcc( const rtl::OUString& rGroupDimName ); + ScDPSaveGroupDimension* GetGroupDimAccForBase( const OUString& rBaseDimName ); + ScDPSaveGroupDimension* GetNamedGroupDimAcc( const OUString& rGroupDimName ); + ScDPSaveGroupDimension* GetFirstNamedGroupDimAcc( const OUString& rBaseDimName ); + ScDPSaveGroupDimension* GetNextNamedGroupDimAcc( const OUString& rGroupDimName ); - ScDPSaveNumGroupDimension* GetNumGroupDimAcc( const rtl::OUString& rGroupDimName ); + ScDPSaveNumGroupDimension* GetNumGroupDimAcc( const OUString& rGroupDimName ); bool HasGroupDimensions() const; - sal_Int32 CollectDateParts( const rtl::OUString& rBaseDimName ) const; + sal_Int32 CollectDateParts( const OUString& rBaseDimName ) const; private: typedef ::std::vector< ScDPSaveGroupDimension > ScDPSaveGroupDimVec; - typedef ::std::map<rtl::OUString, ScDPSaveNumGroupDimension> ScDPSaveNumGroupDimMap; + typedef ::std::map<OUString, ScDPSaveNumGroupDimension> ScDPSaveNumGroupDimMap; ScDPDimensionSaveData& operator=( const ScDPDimensionSaveData& ); diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index 206b6bab31f4..c65b95c85900 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -124,7 +124,7 @@ public: returned object! */ const ScDPItemData* getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const; void getValue( ScDPValue& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const; - rtl::OUString getFieldName(SCCOL nIndex) const; + OUString getFieldName(SCCOL nIndex) const; /** Get the unique entries for a field specified by index. The caller must make sure that the table is filled before calling function, or it will diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index d5a6964c4ffd..4a21a9b4244a 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -57,7 +57,7 @@ class ScDPGroupDimension { long nSourceDim; long nGroupDim; - rtl::OUString aGroupName; + OUString aGroupName; ScDPGroupItemVec aItems; mutable std::vector<SCROW> maMemberEntries; bool mbDateDimension; @@ -73,7 +73,7 @@ public: long GetSourceDim() const { return nSourceDim; } long GetGroupDim() const { return nGroupDim; } - const rtl::OUString& GetName() const { return aGroupName; } + const OUString& GetName() const { return aGroupName; } const std::vector< SCROW >& GetColumnEntries( const ScDPFilteredCache& rCacheTable ) const; const ScDPGroupItem* GetGroupForData( const ScDPItemData& rData ) const; // rData = entry in original dim. @@ -121,7 +121,7 @@ public: class ScDPGroupTableData : public ScDPTableData { - typedef ::boost::unordered_set< ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringHashSet; + typedef ::boost::unordered_set< OUString, OUStringHash, ::std::equal_to< OUString > > StringHashSet; ::boost::shared_ptr<ScDPTableData> pSourceData; long nSourceCount; @@ -147,7 +147,7 @@ public: void AddGroupDimension( const ScDPGroupDimension& rGroup ); void SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup ); - long GetDimensionIndex( const rtl::OUString& rName ); + long GetDimensionIndex( const OUString& rName ); ScDocument* GetDocument() { return pDoc; } @@ -157,7 +157,7 @@ public: virtual const ScDPItemData* GetMemberById( long nDim, long nId); virtual long Compare( long nDim, long nDataId1, long nDataId2); - virtual rtl::OUString getDimensionName(long nColumn); + virtual OUString getDimensionName(long nColumn); virtual sal_Bool getIsDataLayoutDimension(long nColumn); virtual sal_Bool IsDateDimension(long nDim); virtual sal_uLong GetNumberFormat(long nDim); diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx index e064d25ce797..eeb79b7d4a74 100644 --- a/sc/inc/dpitemdata.hxx +++ b/sc/inc/dpitemdata.hxx @@ -65,7 +65,7 @@ public: private: union { - const rtl::OUString* mpString; + const OUString* mpString; GroupValueAttr maGroupValue; double mfValue; }; @@ -81,19 +81,19 @@ public: ScDPItemData(); ScDPItemData(const ScDPItemData& r); - ScDPItemData(const rtl::OUString& rStr); + ScDPItemData(const OUString& rStr); ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue); ~ScDPItemData(); Type GetType() const; void SetEmpty(); - void SetString(const rtl::OUString& rS); - void SetString(const rtl::OUString* pS); + void SetString(const OUString& rS); + void SetString(const OUString* pS); void SetValue(double fVal); void SetRangeStart(double fVal); void SetRangeFirst(); void SetRangeLast(); - void SetErrorString(const rtl::OUString* pS); + void SetErrorString(const OUString* pS); bool IsCaseInsEqual(const ScDPItemData& r) const; // exact equality @@ -105,7 +105,7 @@ public: bool IsEmpty() const; bool IsValue() const; - rtl::OUString GetString() const; + OUString GetString() const; double GetValue() const; GroupValueAttr GetGroupValue() const; bool HasStringData() const ; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 2c09436f377a..c2c07f5b8741 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -68,14 +68,14 @@ class ScRangeList; struct ScDPServiceDesc { - ::rtl::OUString aServiceName; - ::rtl::OUString aParSource; - ::rtl::OUString aParName; - ::rtl::OUString aParUser; - ::rtl::OUString aParPass; + OUString aServiceName; + OUString aParSource; + OUString aParName; + OUString aParUser; + OUString aParPass; - ScDPServiceDesc( const ::rtl::OUString& rServ, const ::rtl::OUString& rSrc, const ::rtl::OUString& rNam, - const ::rtl::OUString& rUser, const ::rtl::OUString& rPass ); + ScDPServiceDesc( const OUString& rServ, const OUString& rSrc, const OUString& rNam, + const OUString& rUser, const OUString& rPass ); bool operator== ( const ScDPServiceDesc& rOther ) const; }; @@ -87,8 +87,8 @@ private: ScDocument* pDoc; // settings ScDPSaveData* pSaveData; - ::rtl::OUString aTableName; - ::rtl::OUString aTableTag; + OUString aTableName; + OUString aTableTag; ScRange aOutRange; ScSheetSourceDesc* pSheetDesc; // for sheet data ScImportSourceDesc* pImpDesc; // for database data @@ -156,10 +156,10 @@ public: bool IsImportData() const { return(pImpDesc != NULL); } bool IsServiceData() const { return(pServDesc != NULL); } - void SetName(const ::rtl::OUString& rNew); - const ::rtl::OUString& GetName() const { return aTableName; } - void SetTag(const ::rtl::OUString& rNew); - const ::rtl::OUString& GetTag() const { return aTableTag; } + void SetName(const OUString& rNew); + const OUString& GetName() const { return aTableName; } + void SetTag(const OUString& rNew); + const OUString& GetTag() const { return aTableTag; } /** * Data description cell displays the description of a data dimension if @@ -168,8 +168,8 @@ public: */ bool IsDataDescriptionCell(const ScAddress& rPos); - bool IsDimNameInUse(const ::rtl::OUString& rName) const; - ::rtl::OUString GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFlags = NULL ); + bool IsDimNameInUse(const OUString& rName) const; + OUString GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFlags = NULL ); bool IsDuplicated( long nDim ); long GetDimCount(); void GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData); @@ -183,7 +183,7 @@ public: const std::vector< ScDPGetPivotDataField >& rFilters ); bool ParseFilters( ScDPGetPivotDataField& rTarget, std::vector< ScDPGetPivotDataField >& rFilters, - const ::rtl::OUString& rFilterList ); + const OUString& rFilterList ); void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); @@ -194,14 +194,14 @@ public: bool FillLabelData(ScPivotParam& rParam); bool GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers ); - bool GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers ); + bool GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< OUString >& rHiers ); sal_Int32 GetUsedHierarchy( sal_Int32 nDim ); bool GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); bool GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); - bool GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); + bool GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< OUString >& rNames ); bool GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers ); void UpdateReference( UpdateRefMode eUpdateRefMode, @@ -233,7 +233,7 @@ public: bool SyncAllDimensionMembers(); static bool HasRegisteredSources(); - static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources(); + static com::sun::star::uno::Sequence<OUString> GetRegisteredSources(); static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> CreateSource( const ScDPServiceDesc& rDesc ); @@ -293,20 +293,20 @@ public: class NameCaches { friend class ScDPCollection; - typedef ::boost::ptr_map<rtl::OUString, ScDPCache> CachesType; + typedef ::boost::ptr_map<OUString, ScDPCache> CachesType; CachesType maCaches; ScDocument* mpDoc; public: NameCaches(ScDocument* pDoc); - bool hasCache(const rtl::OUString& rName) const; + bool hasCache(const OUString& rName) const; const ScDPCache* getCache( - const ::rtl::OUString& rName, const ScRange& rRange, const ScDPDimensionSaveData* pDimData); + const OUString& rName, const ScRange& rRange, const ScDPDimensionSaveData* pDimData); size_t size() const; private: - ScDPCache* getExistingCache(const rtl::OUString& rName); + ScDPCache* getExistingCache(const OUString& rName); void updateCache( - const rtl::OUString& rName, const ScRange& rRange, + const OUString& rName, const ScRange& rRange, const ScDPDimensionSaveData* pDimData, std::set<ScDPObject*>& rRefs); bool remove(const ScDPCache* p); }; @@ -318,9 +318,9 @@ public: struct DBType { sal_Int32 mnSdbType; - ::rtl::OUString maDBName; - ::rtl::OUString maCommand; - DBType(sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand); + OUString maDBName; + OUString maCommand; + DBType(sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand); struct less : public ::std::binary_function<DBType, DBType, bool> { @@ -339,19 +339,19 @@ public: ScDocument* mpDoc; public: DBCaches(ScDocument* pDoc); - bool hasCache(sal_Int32 nSdbType, const rtl::OUString& rDBName, const rtl::OUString& rCommand) const; + bool hasCache(sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand) const; const ScDPCache* getCache( - sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand, + sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand, const ScDPDimensionSaveData* pDimData); private: ScDPCache* getExistingCache( - sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand); + sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand); com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> createRowSet( - sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand); + sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand); - void updateCache(sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand, + void updateCache(sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand, const ScDPDimensionSaveData* pDimData, std::set<ScDPObject*>& rRefs); bool remove(const ScDPCache* p); }; @@ -367,7 +367,7 @@ public: SC_DLLPUBLIC ScDPObject* operator[](size_t nIndex); SC_DLLPUBLIC const ScDPObject* operator[](size_t nIndex) const; - const ScDPObject* GetByName(const ::rtl::OUString& rName) const; + const ScDPObject* GetByName(const OUString& rName) const; void DeleteOnTab( SCTAB nTab ); void UpdateReference( UpdateRefMode eUpdateRefMode, @@ -385,7 +385,7 @@ public: * * @return new name for data pilot object. */ - ::rtl::OUString CreateNewName( sal_uInt16 nMin = 1 ) const; + OUString CreateNewName( sal_uInt16 nMin = 1 ) const; void FreeTable(ScDPObject* pDPObj); SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj); @@ -404,9 +404,9 @@ private: void RemoveCache(const ScDPCache* pCache); void GetAllTables(const ScRange& rSrcRange, std::set<ScDPObject*>& rRefs) const; - void GetAllTables(const rtl::OUString& rSrcName, std::set<ScDPObject*>& rRefs) const; + void GetAllTables(const OUString& rSrcName, std::set<ScDPObject*>& rRefs) const; void GetAllTables( - sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand, + sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand, std::set<ScDPObject*>& rRefs) const; private: diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 34e116c7c606..49b9643c131b 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -47,11 +47,11 @@ struct ScDPOutLevelData; struct ScDPGetPivotDataField { - rtl::OUString maFieldName; + OUString maFieldName; com::sun::star::sheet::GeneralFunction meFunction; bool mbValIsStr; - rtl::OUString maValStr; + OUString maValStr; double mnValNum; ScDPGetPivotDataField() : @@ -80,7 +80,7 @@ private: com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::sheet::DataResult> > aData; - rtl::OUString aDataDescription; + OUString aDataDescription; // Number format related parameters sal_uInt32* pColNumFmt; @@ -161,7 +161,7 @@ public: bool GetHeaderLayout() const; static void GetDataDimensionNames( - rtl::OUString& rSourceName, rtl::OUString& rGivenName, + OUString& rSourceName, OUString& rGivenName, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xDim ); }; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index ef27b170d25b..099f4cb763c1 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -52,19 +52,19 @@ class ScDPTableData; class ScDPSaveMember { private: - ::rtl::OUString aName; - boost::scoped_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table. + OUString aName; + boost::scoped_ptr<OUString> mpLayoutName; // custom name to be displayed in the table. sal_uInt16 nVisibleMode; sal_uInt16 nShowDetailsMode; public: - ScDPSaveMember(const ::rtl::OUString& rName); + ScDPSaveMember(const OUString& rName); ScDPSaveMember(const ScDPSaveMember& r); ~ScDPSaveMember(); bool operator== ( const ScDPSaveMember& r ) const; - const ::rtl::OUString& GetName() const + const OUString& GetName() const { return aName; } SC_DLLPUBLIC bool HasIsVisible() const; @@ -77,10 +77,10 @@ public: bool GetShowDetails() const { return bool(nShowDetailsMode); } - void SetName( const ::rtl::OUString& rNew ); // used if the source member was renamed (groups) + void SetName( const OUString& rNew ); // used if the source member was renamed (groups) - SC_DLLPUBLIC void SetLayoutName( const ::rtl::OUString& rName ); - SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const; + SC_DLLPUBLIC void SetLayoutName( const OUString& rName ); + SC_DLLPUBLIC const OUString* GetLayoutName() const; void RemoveLayoutName(); void WriteToSource( const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& xMember, @@ -95,9 +95,9 @@ bool operator == (const ::com::sun::star::sheet::DataPilotFieldReference &l, con class SC_DLLPUBLIC ScDPSaveDimension { private: - ::rtl::OUString aName; - boost::scoped_ptr<rtl::OUString> mpLayoutName; - boost::scoped_ptr<rtl::OUString> mpSubtotalName; + OUString aName; + boost::scoped_ptr<OUString> mpLayoutName; + boost::scoped_ptr<OUString> mpSubtotalName; bool bIsDataLayout; bool bDupFlag; sal_uInt16 nOrientation; @@ -113,8 +113,8 @@ private: ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level) public: - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> MemberSetType; - typedef boost::unordered_map <rtl::OUString, ScDPSaveMember*, rtl::OUStringHash> MemberHash; + typedef boost::unordered_set<OUString, OUStringHash> MemberSetType; + typedef boost::unordered_map <OUString, ScDPSaveMember*, OUStringHash> MemberHash; typedef std::list <ScDPSaveMember*> MemberList; private: @@ -122,7 +122,7 @@ private: MemberList maMemberList; public: - ScDPSaveDimension(const ::rtl::OUString& rName, bool bDataLayout); + ScDPSaveDimension(const OUString& rName, bool bDataLayout); ScDPSaveDimension(const ScDPSaveDimension& r); ~ScDPSaveDimension(); @@ -139,13 +139,13 @@ public: bool GetDupFlag() const { return bDupFlag; } - const ::rtl::OUString& GetName() const + const OUString& GetName() const { return aName; } bool IsDataLayout() const { return bIsDataLayout; } - void SetName( const ::rtl::OUString& rNew ); // used if the source dim was renamed (groups) + void SetName( const OUString& rNew ); // used if the source dim was renamed (groups) void SetOrientation(sal_uInt16 nNew); void SetSubTotals(long nCount, const sal_uInt16* pFuncs); @@ -168,14 +168,14 @@ public: long GetUsedHierarchy() const { return nUsedHierarchy; } - void SetLayoutName(const ::rtl::OUString& rName); - const ::rtl::OUString* GetLayoutName() const; + void SetLayoutName(const OUString& rName); + const OUString* GetLayoutName() const; void RemoveLayoutName(); - void SetSubtotalName(const ::rtl::OUString& rName); - const ::rtl::OUString* GetSubtotalName() const; + void SetSubtotalName(const OUString& rName); + const OUString* GetSubtotalName() const; void RemoveSubtotalName(); - bool IsMemberNameInUse(const ::rtl::OUString& rName) const; + bool IsMemberNameInUse(const OUString& rName) const; const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; } @@ -195,12 +195,12 @@ public: void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew); - void SetCurrentPage( const ::rtl::OUString* pPage ); // NULL = no selection (all) + void SetCurrentPage( const OUString* pPage ); // NULL = no selection (all) sal_uInt16 GetOrientation() const { return nOrientation; } - ScDPSaveMember* GetExistingMemberByName(const ::rtl::OUString& rName); + ScDPSaveMember* GetExistingMemberByName(const OUString& rName); /** * Get a member object by its name. If one doesn't exist, creat a new @@ -211,13 +211,13 @@ public: * * @return pointer to the member object. */ - ScDPSaveMember* GetMemberByName(const ::rtl::OUString& rName); + ScDPSaveMember* GetMemberByName(const OUString& rName); - void SetMemberPosition( const ::rtl::OUString& rName, sal_Int32 nNewPos ); + void SetMemberPosition( const OUString& rName, sal_Int32 nNewPos ); void WriteToSource( const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& xDim ); - void UpdateMemberVisibility(const ::boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData); + void UpdateMemberVisibility(const ::boost::unordered_map< OUString, bool, OUStringHash>& rData); bool HasInvisibleMember() const; @@ -227,7 +227,7 @@ public: class ScDPSaveData { - typedef boost::unordered_map<rtl::OUString, size_t, rtl::OUStringHash> DupNameCountType; + typedef boost::unordered_map<OUString, size_t, OUStringHash> DupNameCountType; public: typedef boost::ptr_vector<ScDPSaveDimension> DimsType; @@ -246,7 +246,7 @@ private: * created. */ bool mbDimensionMembersBuilt; - boost::scoped_ptr<rtl::OUString> mpGrandTotalName; + boost::scoped_ptr<OUString> mpGrandTotalName; public: SC_DLLPUBLIC ScDPSaveData(); @@ -257,8 +257,8 @@ public: bool operator== ( const ScDPSaveData& r ) const; - SC_DLLPUBLIC void SetGrandTotalName(const ::rtl::OUString& rName); - SC_DLLPUBLIC const ::rtl::OUString* GetGrandTotalName() const; + SC_DLLPUBLIC void SetGrandTotalName(const OUString& rName); + SC_DLLPUBLIC const OUString* GetGrandTotalName() const; SC_DLLPUBLIC const DimsType& GetDimensions() const; @@ -286,17 +286,17 @@ public: * manages its life cycle; hence the caller must * <i>not</i> delete this object. */ - SC_DLLPUBLIC ScDPSaveDimension* GetDimensionByName(const ::rtl::OUString& rName); + SC_DLLPUBLIC ScDPSaveDimension* GetDimensionByName(const OUString& rName); SC_DLLPUBLIC ScDPSaveDimension* GetDataLayoutDimension(); SC_DLLPUBLIC ScDPSaveDimension* GetExistingDataLayoutDimension() const; - ScDPSaveDimension* DuplicateDimension(const ::rtl::OUString& rName); + ScDPSaveDimension* DuplicateDimension(const OUString& rName); SC_DLLPUBLIC ScDPSaveDimension& DuplicateDimension(const ScDPSaveDimension& rDim); - SC_DLLPUBLIC ScDPSaveDimension* GetExistingDimensionByName(const ::rtl::OUString& rName) const; - SC_DLLPUBLIC ScDPSaveDimension* GetNewDimensionByName(const ::rtl::OUString& rName); + SC_DLLPUBLIC ScDPSaveDimension* GetExistingDimensionByName(const OUString& rName) const; + SC_DLLPUBLIC ScDPSaveDimension* GetNewDimensionByName(const OUString& rName); - void RemoveDimensionByName(const ::rtl::OUString& rName); + void RemoveDimensionByName(const OUString& rName); ScDPSaveDimension* GetInnermostDimension(sal_uInt16 nOrientation); ScDPSaveDimension* GetFirstDimension(::com::sun::star::sheet::DataPilotFieldOrientation eOrientation); @@ -333,7 +333,7 @@ public: const ScDPDimensionSaveData* GetExistingDimensionData() const { return pDimensionData; } - void RemoveAllGroupDimensions( const rtl::OUString& rSrcDimName, std::vector<rtl::OUString>* pDeletedNames = NULL ); + void RemoveAllGroupDimensions( const OUString& rSrcDimName, std::vector<OUString>* pDeletedNames = NULL ); SC_DLLPUBLIC ScDPDimensionSaveData* GetDimensionData(); // create if not there void SetDimensionData( const ScDPDimensionSaveData* pNew ); // copied @@ -345,11 +345,11 @@ public: * * @param rDimName dimension name */ - SC_DLLPUBLIC bool HasInvisibleMember(const ::rtl::OUString& rDimName) const; + SC_DLLPUBLIC bool HasInvisibleMember(const OUString& rDimName) const; private: void CheckDuplicateName(ScDPSaveDimension& rDim); - void RemoveDuplicateNameCount(const rtl::OUString& rName); + void RemoveDuplicateNameCount(const OUString& rName); /** * Append a new original dimension. Not to be called to insert a duplicate @@ -362,7 +362,7 @@ private: * * @return pointer to the new dimension just inserted. */ - ScDPSaveDimension* AppendNewDimension(const rtl::OUString& rName, bool bDataLayout); + ScDPSaveDimension* AppendNewDimension(const OUString& rName, bool bDataLayout); }; #endif diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 6c626102b181..bc30600018f1 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -34,8 +34,8 @@ class ScDPDimensionSaveData; struct ScImportSourceDesc { - ::rtl::OUString aDBName; - ::rtl::OUString aObject; + OUString aDBName; + OUString aObject; sal_uInt16 nType; // enum DataImportMode bool bNative; ScDocument* mpDoc; @@ -65,7 +65,7 @@ public: virtual ~ScDatabaseDPData(); virtual long GetColumnCount(); - virtual rtl::OUString getDimensionName(long nColumn); + virtual OUString getDimensionName(long nColumn); virtual sal_Bool getIsDataLayoutDimension(long nColumn); virtual sal_Bool IsDateDimension(long nDim); virtual void DisposeData(); diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index dd79c7451b03..bbb239a9442f 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -61,8 +61,8 @@ public: * @return source range. */ SC_DLLPUBLIC const ScRange& GetSourceRange() const; - SC_DLLPUBLIC void SetRangeName(const ::rtl::OUString& rName); - SC_DLLPUBLIC const ::rtl::OUString& GetRangeName() const; + SC_DLLPUBLIC void SetRangeName(const OUString& rName); + SC_DLLPUBLIC const OUString& GetRangeName() const; bool HasRangeName() const; void SetQueryParam(const ScQueryParam& rParam); const ScQueryParam& GetQueryParam() const; @@ -80,7 +80,7 @@ public: private: mutable ScRange maSourceRange; - ::rtl::OUString maRangeName; + OUString maRangeName; ScQueryParam maQueryParam; ScDocument* mpDoc; }; @@ -102,7 +102,7 @@ public: virtual ~ScSheetDPData(); virtual long GetColumnCount(); - virtual rtl::OUString getDimensionName(long nColumn); + virtual OUString getDimensionName(long nColumn); virtual sal_Bool getIsDataLayoutDimension(long nColumn); virtual sal_Bool IsDateDimension(long nDim); virtual sal_uLong GetNumberFormat(long nDim); diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 8a6c617a44fd..22a8ffb828fa 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -101,7 +101,7 @@ public: ScDPTableData(ScDocument* pDoc); virtual ~ScDPTableData(); - rtl::OUString GetFormattedString(long nDim, const ScDPItemData& rItem) const; + OUString GetFormattedString(long nDim, const ScDPItemData& rItem) const; long GetDatePart( long nDateVal, long nHierarchy, long nLevel ); @@ -110,7 +110,7 @@ public: virtual long GetColumnCount() = 0; virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ; - virtual rtl::OUString getDimensionName(long nColumn) = 0; + virtual OUString getDimensionName(long nColumn) = 0; virtual sal_Bool getIsDataLayoutDimension(long nColumn) = 0; virtual sal_Bool IsDateDimension(long nDim) = 0; virtual sal_uLong GetNumberFormat(long nDim); diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 90a7f3690acf..96ebe53c2e0f 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -318,8 +318,8 @@ public: long GetMeasureCount() const { return maMeasureFuncs.size(); } ScSubTotalFunc GetMeasureFunction(long nMeasure) const; - rtl::OUString GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; - rtl::OUString GetMeasureDimensionName(long nMeasure) const; + OUString GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; + OUString GetMeasureDimensionName(long nMeasure) const; const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const; sal_uInt16 GetMeasureRefOrient(long nMeasure) const; @@ -511,7 +511,7 @@ private: const ScDPResultData* pResultData; MemberArray maMemberArray; MemberHash maMemberHash; - rtl::OUString aDimensionName; //! or ptr to IntDimension? + OUString aDimensionName; //! or ptr to IntDimension? long nSortMeasure; ScMemberSortOrder aMemberOrder; // used when sorted by measure bool bIsDataLayout:1; //! or ptr to IntDimension? diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 06ed2f0fc3b5..e98b6516f6bb 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -123,7 +123,7 @@ private: bool bPageFiltered; // set if page field filters have been applied to cache table SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<rtl::OUString> mpGrandTotalName; + ::std::auto_ptr<OUString> mpGrandTotalName; SAL_WNODEPRECATED_DECLARATIONS_POP void CreateRes_Impl(); @@ -145,7 +145,7 @@ private: void SetDupCount( long nNew ); - rtl::OUString getDataDescription(); //! ??? + OUString getDataDescription(); //! ??? void setIgnoreEmptyRows(bool bSet); void setRepeatIfEmpty(bool bSet); @@ -159,7 +159,7 @@ public: ScDPTableData* GetData() { return pData; } const ScDPTableData* GetData() const { return pData; } - const ::rtl::OUString* GetGrandTotalName() const; + const OUString* GetGrandTotalName() const; sal_uInt16 GetOrientation(long nColumn); void SetOrientation(long nColumn, sal_uInt16 nNew); @@ -167,7 +167,7 @@ public: long GetDataDimensionCount(); ScDPDimension* GetDataDimension(long nIndex); - rtl::OUString GetDataDimName(long nIndex); + OUString GetDataDimName(long nIndex); const ScDPCache* GetCache(); const ScDPItemData* GetItemDataById( long nDim, long nId ); long GetDataLayoutDim(){ return pData->GetColumnCount(); } @@ -179,7 +179,7 @@ public: sal_Bool SubTotalAllowed(long nColumn); //! move to ScDPResultData - ScDPDimension* AddDuplicated(long nSource, const rtl::OUString& rNewName); + ScDPDimension* AddDuplicated(long nSource, const OUString& rNewName); long GetDupCount() const { return nDupCount; } long GetSourceDim(long nDim); @@ -218,7 +218,7 @@ public: 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, + 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, @@ -226,29 +226,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -256,11 +256,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); #if DEBUG_PIVOT_TABLE @@ -284,13 +284,13 @@ public: void CountChanged(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -299,11 +299,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); virtual long getCount() const; @@ -322,14 +322,14 @@ class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper5< ScDPHierarchies* pHierarchies; long nUsedHier; sal_uInt16 nFunction; // enum GeneralFunction - rtl::OUString aName; // if empty, take from source - boost::scoped_ptr<rtl::OUString> mpLayoutName; - boost::scoped_ptr<rtl::OUString> mpSubtotalName; + OUString aName; // if empty, take from source + boost::scoped_ptr<OUString> mpLayoutName; + boost::scoped_ptr<OUString> mpSubtotalName; long nSourceDim; // >=0 if dup'ed ::com::sun::star::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" bool bHasSelectedPage; - rtl::OUString aSelectedPage; + OUString aSelectedPage; ScDPItemData* pSelectedData; // internal, temporary, created from aSelectedPage bool mbHasHiddenMember; @@ -343,12 +343,12 @@ public: ScDPDimension* CreateCloneObject(); ScDPHierarchies* GetHierarchiesObject(); - SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const; - const ::rtl::OUString* GetSubtotalName() const; + SC_DLLPUBLIC const OUString* GetLayoutName() const; + const OUString* GetSubtotalName() const; // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XHierarchiesSupplier @@ -363,7 +363,7 @@ public: 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, + 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, @@ -371,29 +371,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -401,11 +401,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); sal_uInt16 getOrientation() const; @@ -438,13 +438,13 @@ public: virtual ~ScDPHierarchies(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -453,11 +453,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); virtual long getCount() const; @@ -482,8 +482,8 @@ public: ScDPLevels* GetLevelsObject(); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XLevelsSupplier @@ -491,11 +491,11 @@ public: getLevels() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -515,13 +515,13 @@ public: virtual ~ScDPLevels(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -530,11 +530,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); virtual long getCount() const; @@ -572,8 +572,8 @@ public: ScDPMembers* GetMembersObject(); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XMembersSupplier @@ -588,7 +588,7 @@ public: 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, + 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, @@ -596,29 +596,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -626,11 +626,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> getSubTotals() const; @@ -670,7 +670,7 @@ public: }; // hash map from name to index in the member array, for fast name access -typedef ::boost::unordered_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > ScDPMembersHashMap; +typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > ScDPMembersHashMap; class ScDPMembers : public cppu::WeakImplHelper2< com::sun::star::container::XNameAccess, @@ -691,13 +691,13 @@ public: virtual ~ScDPMembers(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -706,11 +706,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); long getCount() const; @@ -718,7 +718,7 @@ public: long getMinMembers() const; - sal_Int32 GetIndexFromName( const ::rtl::OUString& rName ) const; // <0 if not found + sal_Int32 GetIndexFromName( const OUString& rName ) const; // <0 if not found const std::vector<sal_Int32>& GetGlobalOrder(); const ScDPItemData* GetSrcItemDataByIndex( SCROW nIndex); SCROW GetSrcItemsCount(); @@ -736,7 +736,7 @@ private: long nLev; SCROW mnDataId; - boost::scoped_ptr<rtl::OUString> mpLayoutName; + boost::scoped_ptr<OUString> mpLayoutName; sal_Int32 nPosition; // manual sorting bool bVisible; @@ -746,27 +746,27 @@ public: ScDPMember(ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex); virtual ~ScDPMember(); - rtl::OUString GetNameStr() const; + OUString GetNameStr() const; void FillItemData( ScDPItemData& rData ) const; const ScDPItemData* GetItemData() const; SCROW GetItemDataId() const { return mnDataId; } bool IsNamedItem(SCROW nIndex) const; - SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const; + SC_DLLPUBLIC const OUString* GetLayoutName() const; long GetDim() const; sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // 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, + 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, @@ -774,29 +774,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -804,11 +804,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); bool isVisible() const; diff --git a/sc/inc/dptypes.hxx b/sc/inc/dptypes.hxx index da49c9ac0fb2..2d90ea30dc62 100644 --- a/sc/inc/dptypes.hxx +++ b/sc/inc/dptypes.hxx @@ -33,7 +33,7 @@ #include <boost/unordered_set.hpp> -typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> ScDPUniqueStringSet; +typedef boost::unordered_set<OUString, OUStringHash> ScDPUniqueStringSet; #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx index 4ed4e5c679ea..1ed2efe76dd0 100644 --- a/sc/inc/dputil.hxx +++ b/sc/inc/dputil.hxx @@ -38,19 +38,19 @@ struct ScDPNumGroupInfo; class ScDPUtil { public: - static bool isDuplicateDimension(const rtl::OUString& rName); + static bool isDuplicateDimension(const OUString& rName); - SC_DLLPUBLIC static rtl::OUString getSourceDimensionName(const rtl::OUString& rName); + SC_DLLPUBLIC static OUString getSourceDimensionName(const OUString& rName); - static rtl::OUString createDuplicateDimensionName(const rtl::OUString& rOriginal, size_t nDupCount); + static OUString createDuplicateDimensionName(const OUString& rOriginal, size_t nDupCount); - static rtl::OUString getDateGroupName( + static OUString getDateGroupName( sal_Int32 nDatePart, sal_Int32 nValue, SvNumberFormatter* pFormatter, double fStart, double fEnd); static double getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rInfo); - static rtl::OUString getNumGroupName( + static OUString getNumGroupName( double fValue, const ScDPNumGroupInfo& rInfo, sal_Unicode cDecSep, SvNumberFormatter* pFormatter); diff --git a/sc/inc/dragdata.hxx b/sc/inc/dragdata.hxx index 76232cb1fd2f..1808bff4fbaa 100644 --- a/sc/inc/dragdata.hxx +++ b/sc/inc/dragdata.hxx @@ -41,11 +41,11 @@ struct ScDragData ScDrawTransferObj* pDrawTransfer; ScDocument* pJumpLocalDoc; - rtl::OUString aLinkDoc; - rtl::OUString aLinkTable; - rtl::OUString aLinkArea; - rtl::OUString aJumpTarget; - rtl::OUString aJumpText; + OUString aLinkDoc; + OUString aLinkTable; + OUString aLinkArea; + OUString aJumpTarget; + OUString aJumpText; }; #endif diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx index 5b79a0892269..26fd4e6693e2 100644 --- a/sc/inc/eventuno.hxx +++ b/sc/inc/eventuno.hxx @@ -45,7 +45,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + 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, @@ -53,13 +53,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -68,11 +68,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index c49ec900a3e3..0a115c057bf3 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -86,10 +86,10 @@ public: struct TableName { - ::rtl::OUString maUpperName; - ::rtl::OUString maRealName; + OUString maUpperName; + OUString maRealName; - explicit TableName(const ::rtl::OUString& rUppper, const ::rtl::OUString& rReal); + explicit TableName(const OUString& rUppper, const OUString& rReal); }; struct CellFormat @@ -193,14 +193,14 @@ public: }; typedef ::boost::shared_ptr<Table> TableTypeRef; - typedef ::boost::unordered_map< ::rtl::OUString, size_t, ::rtl::OUStringHash> + typedef ::boost::unordered_map< OUString, size_t, OUStringHash> TableNameIndexMap; ScExternalRefCache(); ~ScExternalRefCache(); - const ::rtl::OUString* getRealTableName(sal_uInt16 nFileId, const ::rtl::OUString& rTabName) const; - const ::rtl::OUString* getRealRangeName(sal_uInt16 nFileId, const ::rtl::OUString& rRangeName) const; + const OUString* getRealTableName(sal_uInt16 nFileId, const OUString& rTabName) const; + const OUString* getRealRangeName(sal_uInt16 nFileId, const OUString& rRangeName) const; /** * Get a cached cell data at specified cell location. @@ -213,7 +213,7 @@ public: * @return pointer to the token instance in the cache. */ ScExternalRefCache::TokenRef getCellData( - sal_uInt16 nFileId, const ::rtl::OUString& rTabName, SCCOL nCol, SCROW nRow, sal_uInt32* pnFmtIndex); + sal_uInt16 nFileId, const OUString& rTabName, SCCOL nCol, SCROW nRow, sal_uInt32* pnFmtIndex); /** * Get a cached cell range data. @@ -223,28 +223,28 @@ public: * guaranteed if the TokenArrayRef is properly used.. */ ScExternalRefCache::TokenArrayRef getCellRangeData( - sal_uInt16 nFileId, const ::rtl::OUString& rTabName, const ScRange& rRange); + sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange); - ScExternalRefCache::TokenArrayRef getRangeNameTokens(sal_uInt16 nFileId, const ::rtl::OUString& rName); - void setRangeNameTokens(sal_uInt16 nFileId, const ::rtl::OUString& rName, TokenArrayRef pArray); + ScExternalRefCache::TokenArrayRef getRangeNameTokens(sal_uInt16 nFileId, const OUString& rName); + void setRangeNameTokens(sal_uInt16 nFileId, const OUString& rName, TokenArrayRef pArray); - void setCellData(sal_uInt16 nFileId, const ::rtl::OUString& rTabName, + void setCellData(sal_uInt16 nFileId, const OUString& rTabName, SCCOL nCol, SCROW nRow, TokenRef pToken, sal_uLong nFmtIndex); struct SingleRangeData { /** This name must be in upper-case. */ - ::rtl::OUString maTableName; + OUString maTableName; ScMatrixRef mpRangeData; }; void setCellRangeData(sal_uInt16 nFileId, const ScRange& rRange, const ::std::vector<SingleRangeData>& rData, const TokenArrayRef& pArray); bool isDocInitialized(sal_uInt16 nFileId); - void initializeDoc(sal_uInt16 nFileId, const ::std::vector<rtl::OUString>& rTabNames); + void initializeDoc(sal_uInt16 nFileId, const ::std::vector<OUString>& rTabNames); String getTableName(sal_uInt16 nFileId, size_t nCacheId) const; - void getAllTableNames(sal_uInt16 nFileId, ::std::vector<rtl::OUString>& rTabNames) const; - SCsTAB getTabSpan( sal_uInt16 nFileId, const ::rtl::OUString& rStartTabName, const ::rtl::OUString& rEndTabName ) const; + void getAllTableNames(sal_uInt16 nFileId, ::std::vector<OUString>& rTabNames) const; + SCsTAB getTabSpan( sal_uInt16 nFileId, const OUString& rStartTabName, const OUString& rEndTabName ) const; void getAllNumberFormats(::std::vector<sal_uInt32>& rNumFmts) const; /** @@ -258,7 +258,7 @@ public: * Set a table as referenced, used only during store-to-file. * @returns <TRUE/> if ALL tables of ALL documents are marked. */ - bool setCacheTableReferenced( sal_uInt16 nFileId, const ::rtl::OUString& rTabName, size_t nSheets, bool bPermanent ); + bool setCacheTableReferenced( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets, bool bPermanent ); void setAllCacheTableReferencedStati( bool bReferenced ); bool areAllCacheTablesReferenced() const; @@ -287,7 +287,7 @@ private: public: ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, size_t nTabIndex) const; - ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const ::rtl::OUString& rTabName, bool bCreateNew, size_t* pnIndex); + ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const OUString& rTabName, bool bCreateNew, size_t* pnIndex); void clearCache(sal_uInt16 nFileId); @@ -302,9 +302,9 @@ private: } }; - typedef ::boost::unordered_map<rtl::OUString, TokenArrayRef, rtl::OUStringHash> RangeNameMap; + typedef ::boost::unordered_map<OUString, TokenArrayRef, OUStringHash> RangeNameMap; typedef ::boost::unordered_map<ScRange, TokenArrayRef, RangeHash> RangeArrayMap; - typedef ::boost::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash> NamePairMap; + typedef ::boost::unordered_map<OUString, OUString, OUStringHash> NamePairMap; // SUNWS needs a forward declared friend, otherwise types and members // of the outer class are not accessible. @@ -406,11 +406,11 @@ public: /** Source document meta-data container. */ struct SrcFileData { - ::rtl::OUString maFileName; /// original file name as loaded from the file. - ::rtl::OUString maRealFileName; /// file name created from the relative name. - ::rtl::OUString maRelativeName; - ::rtl::OUString maFilterName; - ::rtl::OUString maFilterOptions; + OUString maFileName; /// original file name as loaded from the file. + OUString maRealFileName; /// file name created from the relative name. + OUString maRelativeName; + OUString maFilterName; + OUString maFilterOptions; bool bUnsaved; void maybeCreateRealFileName(const String& rOwnDocName); @@ -420,7 +420,7 @@ public: explicit ScExternalRefManager(ScDocument* pDoc); virtual ~ScExternalRefManager(); - virtual ::rtl::OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const; + virtual OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const; /** * Get a cache table instance for specified table and table index. Unlike @@ -454,7 +454,7 @@ public: * * @return shared_ptr to the cache table instance */ - ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const ::rtl::OUString& rTabName, bool bCreateNew, size_t* pnIndex = 0); + ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const OUString& rTabName, bool bCreateNew, size_t* pnIndex = 0); /** Returns a vector containing all (real) table names and cache tables of the specified file. @@ -462,7 +462,7 @@ public: The index in the returned vector corresponds to the table index used to access the cache table, e.g. in getCacheTable(). */ - void getAllCachedTableNames(sal_uInt16 nFileId, ::std::vector<rtl::OUString>& rTabNames) const; + void getAllCachedTableNames(sal_uInt16 nFileId, ::std::vector<OUString>& rTabNames) const; /** * Get the span (distance+sign(distance)) of two sheets of a specified @@ -480,7 +480,7 @@ public: * 0 if rEndTabName not found */ SCsTAB getCachedTabSpan( - sal_uInt16 nFileId, const ::rtl::OUString& rStartTabName, const ::rtl::OUString& rEndTabName) const; + sal_uInt16 nFileId, const OUString& rStartTabName, const OUString& rEndTabName) const; /** * Get all unique number format indices that are used in the cache tables. @@ -505,7 +505,7 @@ public: * Set a table as referenced, used only during store-to-file. * @returns <TRUE/> if ALL tables of ALL external documents are marked. */ - bool setCacheTableReferenced( sal_uInt16 nFileId, const ::rtl::OUString& rTabName, size_t nSheets ); + bool setCacheTableReferenced( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets ); void setAllCacheTableReferencedStati( bool bReferenced ); /** @@ -514,10 +514,10 @@ public: */ bool isInReferenceMarking() const { return mbInReferenceMarking; } - void storeRangeNameTokens(sal_uInt16 nFileId, const ::rtl::OUString& rName, const ScTokenArray& rArray); + void storeRangeNameTokens(sal_uInt16 nFileId, const OUString& rName, const ScTokenArray& rArray); ScExternalRefCache::TokenRef getSingleRefToken( - sal_uInt16 nFileId, const ::rtl::OUString& rTabName, const ScAddress& rCell, + sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rCell, const ScAddress* pCurPos, SCTAB* pTab, ScExternalRefCache::CellFormat* pFmt = NULL); /** @@ -534,7 +534,7 @@ public: * delete the instance returned by this method.</i> */ ScExternalRefCache::TokenArrayRef getDoubleRefTokens( - sal_uInt16 nFileId, const ::rtl::OUString& rTabName, const ScRange& rRange, const ScAddress* pCurPos); + sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange, const ScAddress* pCurPos); /** * Get an array of tokens corresponding with a specified name in a @@ -548,10 +548,10 @@ public: * @return shared_ptr to array of tokens composing the name */ ScExternalRefCache::TokenArrayRef getRangeNameTokens( - sal_uInt16 nFileId, const ::rtl::OUString& rName, const ScAddress* pCurPos = NULL); + sal_uInt16 nFileId, const OUString& rName, const ScAddress* pCurPos = NULL); - ::rtl::OUString getOwnDocumentName() const; - bool isOwnDocument(const ::rtl::OUString& rFile) const; + OUString getOwnDocumentName() const; + bool isOwnDocument(const OUString& rFile) const; /** * Takes a flat file name, and convert it to an absolute URL path. An @@ -559,8 +559,8 @@ public: * * @param rFile file name to convert */ - void convertToAbsName(::rtl::OUString& rFile) const; - sal_uInt16 getExternalFileId(const ::rtl::OUString& rFile); + void convertToAbsName(OUString& rFile) const; + sal_uInt16 getExternalFileId(const OUString& rFile); /** * It returns a pointer to the name of the URI associated with a given @@ -575,17 +575,17 @@ public: * * @return const String* external document URI. */ - const ::rtl::OUString* getExternalFileName(sal_uInt16 nFileId, bool bForceOriginal = false); + const OUString* getExternalFileName(sal_uInt16 nFileId, bool bForceOriginal = false); bool hasExternalFile(sal_uInt16 nFileId) const; - bool hasExternalFile(const ::rtl::OUString& rFile) const; + bool hasExternalFile(const OUString& rFile) const; const SrcFileData* getExternalFileData(sal_uInt16 nFileId) const; - const ::rtl::OUString* getRealTableName(sal_uInt16 nFileId, const ::rtl::OUString& rTabName) const; - const ::rtl::OUString* getRealRangeName(sal_uInt16 nFileId, const ::rtl::OUString& rRangeName) const; + const OUString* getRealTableName(sal_uInt16 nFileId, const OUString& rTabName) const; + const OUString* getRealRangeName(sal_uInt16 nFileId, const OUString& rRangeName) const; void clearCache(sal_uInt16 nFileId); void refreshNames(sal_uInt16 nFileId); void breakLink(sal_uInt16 nFileId); - void switchSrcFile(sal_uInt16 nFileId, const ::rtl::OUString& rNewFile, const ::rtl::OUString& rNewFilter); + void switchSrcFile(sal_uInt16 nFileId, const OUString& rNewFile, const OUString& rNewFilter); /** * Set a relative file path for the specified file ID. Note that the @@ -594,7 +594,7 @@ public: * @param nFileId file ID for an external document * @param rRelUrl relative URL */ - void setRelativeFileName(sal_uInt16 nFileId, const ::rtl::OUString& rRelUrl); + void setRelativeFileName(sal_uInt16 nFileId, const OUString& rRelUrl); /** * Set the filter name and options if any for a given source document. @@ -604,7 +604,7 @@ public: * @param rFilterName * @param rOptions */ - void setFilterData(sal_uInt16 nFileId, const ::rtl::OUString& rFilterName, const ::rtl::OUString& rOptions); + void setFilterData(sal_uInt16 nFileId, const OUString& rFilterName, const OUString& rOptions); void clear(); @@ -618,7 +618,7 @@ public: * @param rBaseFileUrl Absolute URL of the content.xml fragment of the * document being exported. */ - void resetSrcFileData(const ::rtl::OUString& rBaseFileUrl); + void resetSrcFileData(const OUString& rBaseFileUrl); /** * Replace the original URL wirh the real URL that was generated from the relative URL. @@ -660,7 +660,7 @@ public: * Check if the file specified by the path is a legitimate file that * exists & can be loaded. */ - bool isFileLoadable(const ::rtl::OUString& rFile) const; + bool isFileLoadable(const OUString& rFile) const; /** * If in maUnsavedDocShells move it to maDocShells and create a correct @@ -708,7 +708,7 @@ private: * @return range token array */ ScExternalRefCache::TokenArrayRef getDoubleRefTokensFromSrcDoc( - ScDocument* pSrcDoc, const ::rtl::OUString& rTabName, ScRange& rRange, + ScDocument* pSrcDoc, const OUString& rTabName, ScRange& rRange, ::std::vector<ScExternalRefCache::SingleRangeData>& rCacheData); /** @@ -724,11 +724,11 @@ private: * @return range name token array */ ScExternalRefCache::TokenArrayRef getRangeNameTokensFromSrcDoc( - sal_uInt16 nFileId, ScDocument* pSrcDoc, ::rtl::OUString& rName); + sal_uInt16 nFileId, ScDocument* pSrcDoc, OUString& rName); ScDocument* getInMemorySrcDocument(sal_uInt16 nFileId); ScDocument* getSrcDocument(sal_uInt16 nFileId); - SfxObjectShellRef loadSrcDocument(sal_uInt16 nFileId, ::rtl::OUString& rFilter); + SfxObjectShellRef loadSrcDocument(sal_uInt16 nFileId, OUString& rFilter); void maybeLinkExternalFile(sal_uInt16 nFileId); diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index d7a3f37cd728..d4d580d0b197 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -115,11 +115,11 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -182,11 +182,11 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -221,16 +221,16 @@ private: SvxFieldData* getData(); - void setPropertyValueURL(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueURL(const rtl::OUString& rName); + void setPropertyValueURL(const OUString& rName, const com::sun::star::uno::Any& rVal); + com::sun::star::uno::Any getPropertyValueURL(const OUString& rName); - void setPropertyValueFile(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueFile(const rtl::OUString& rName); + void setPropertyValueFile(const OUString& rName, const com::sun::star::uno::Any& rVal); + com::sun::star::uno::Any getPropertyValueFile(const OUString& rName); - void setPropertyValueDateTime(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueDateTime(const rtl::OUString& rName); + void setPropertyValueDateTime(const OUString& rName, const com::sun::star::uno::Any& rVal); + com::sun::star::uno::Any getPropertyValueDateTime(const OUString& rName); - void setPropertyValueSheet(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal); + void setPropertyValueSheet(const OUString& rName, const com::sun::star::uno::Any& rVal); public: static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); @@ -250,7 +250,7 @@ public: ScEditSource* pEditSrc, const ESelection& rSel); // XTextField - virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) + virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); // XTextContent @@ -274,7 +274,7 @@ public: 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, + 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, @@ -282,29 +282,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -317,11 +317,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index 2f1c3f82645d..4956d1e98f6d 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -34,12 +34,12 @@ class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem double fExcelColScale; double fExcelRowScale; - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetPropertyNames(); public: ScFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ); virtual void Commit(); sal_Bool GetWK3Flag() const { return bWK3Flag; } diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index bd38bd70e3f1..587a23e8d598 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -47,9 +47,9 @@ class ScFilterOptionsObj : public ::cppu::WeakImplHelper5< ::com::sun::star::lang::XServiceInfo > { private: - ::rtl::OUString aFileName; - ::rtl::OUString aFilterName; - ::rtl::OUString aFilterOptions; + OUString aFileName; + OUString aFilterName; + OUString aFilterOptions; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream; sal_Bool bExport; @@ -58,8 +58,8 @@ public: ScFilterOptionsObj(); virtual ~ScFilterOptionsObj(); - 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(); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > @@ -73,7 +73,7 @@ public: ::com::sun::star::uno::RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); @@ -90,11 +90,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 264846adcf44..fbda9111ea3c 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -107,13 +107,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess @@ -135,11 +135,11 @@ public: com::sun::star::sheet::XSheetConditionalEntries> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -169,11 +169,11 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) + virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) + virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() throw(::com::sun::star::uno::RuntimeException); @@ -181,16 +181,16 @@ public: throw(::com::sun::star::uno::RuntimeException); // XSheetConditionalEntry - virtual ::rtl::OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStyleName( const ::rtl::OUString& aStyleName ) + virtual OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setStyleName( const OUString& aStyleName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -247,11 +247,11 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) + virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) + virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() throw(::com::sun::star::uno::RuntimeException); @@ -271,7 +271,7 @@ public: 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, + 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, @@ -279,29 +279,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -318,11 +318,11 @@ public: com::sun::star::beans::XPropertySet> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 45a708dd1fc1..469495a91f11 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -122,7 +122,7 @@ public: also includes formula::FormulaGrammar::CONV_UNSPECIFIED, therefor uses the address convention associated with rPos::nTab by default. */ ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, - const rtl::OUString& rFormula, + const OUString& rFormula, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, sal_uInt8 cMatInd = MM_NONE ); @@ -132,9 +132,9 @@ public: ScFormulaVectorState GetVectorState() const; - void GetFormula( rtl::OUString& rFormula, + void GetFormula( OUString& rFormula, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void GetFormula( rtl::OUStringBuffer& rBuffer, + void GetFormula( OUStringBuffer& rBuffer, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; void SetDirty( bool bDirtyFlag=true ); @@ -148,7 +148,7 @@ public: void ResetDirty() { bDirty = false; } bool NeedsListening() const { return bNeedListening; } void SetNeedsListening( bool bVar ) { bNeedListening = bVar; } - void Compile(const rtl::OUString& rFormula, + void Compile(const OUString& rFormula, bool bNoListening = false, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); void CompileTokenArray( bool bNoListening = false ); @@ -188,7 +188,7 @@ public: void UpdateInsertTabAbs(SCTAB nTable); bool UpdateDeleteTab(SCTAB nTable, bool bIsMove = false, SCTAB nSheets = 1); void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); - void UpdateRenameTab(SCTAB nTable, const rtl::OUString& rName); + void UpdateRenameTab(SCTAB nTable, const OUString& rName); bool TestTabRefAbs(SCTAB nTable); void UpdateCompile( bool bForceIfNameInUse = false ); void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const; @@ -202,7 +202,7 @@ public: bool IsHybridValueCell(); // for cells after import to deal with inherited number formats double GetValue(); double GetValueAlways(); // ignore errors - rtl::OUString GetString(); + OUString GetString(); const ScMatrix* GetMatrix(); bool GetMatrixOrigin( ScAddress& rPos ) const; void GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ); @@ -253,13 +253,13 @@ public: If for whatever reason you have to use both, SetHybridDouble() and SetHybridString() or SetHybridFormula(), use SetHybridDouble() first for performance reasons.*/ - void SetHybridString( const rtl::OUString& r ) + void SetHybridString( const OUString& r ) { aResult.SetHybridString( r); } /** For import only: set a temporary formula string to be compiled later. If for whatever reason you have to use both, SetHybridDouble() and SetHybridString() or SetHybridFormula(), use SetHybridDouble() first for performance reasons.*/ - void SetHybridFormula( const rtl::OUString& r, + void SetHybridFormula( const OUString& r, const formula::FormulaGrammar::Grammar eGrammar ) { aResult.SetHybridFormula( r); eTempGrammar = eGrammar; } diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index ff560961ef4a..38f89d77eb44 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -44,9 +44,9 @@ private: formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax ScCalcConfig aCalcConfig; - ::rtl::OUString aFormulaSepArg; - ::rtl::OUString aFormulaSepArrayRow; - ::rtl::OUString aFormulaSepArrayCol; + OUString aFormulaSepArg; + OUString aFormulaSepArrayRow; + OUString aFormulaSepArrayCol; ScRecalcOptions meOOXMLRecalc; ScRecalcOptions meODFRecalc; @@ -68,14 +68,14 @@ public: void SetUseEnglishFuncName( bool bVal ) { bUseEnglishFuncName = bVal; } bool GetUseEnglishFuncName() const { return bUseEnglishFuncName; } - void SetFormulaSepArg(const ::rtl::OUString& rSep) { aFormulaSepArg = rSep; } - ::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; } + void SetFormulaSepArg(const OUString& rSep) { aFormulaSepArg = rSep; } + OUString GetFormulaSepArg() const { return aFormulaSepArg; } - void SetFormulaSepArrayRow(const ::rtl::OUString& rSep) { aFormulaSepArrayRow = rSep; } - ::rtl::OUString GetFormulaSepArrayRow() const { return aFormulaSepArrayRow; } + void SetFormulaSepArrayRow(const OUString& rSep) { aFormulaSepArrayRow = rSep; } + OUString GetFormulaSepArrayRow() const { return aFormulaSepArrayRow; } - void SetFormulaSepArrayCol(const ::rtl::OUString& rSep) { aFormulaSepArrayCol = rSep; } - ::rtl::OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; } + void SetFormulaSepArrayCol(const OUString& rSep) { aFormulaSepArrayCol = rSep; } + OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; } void SetOOXMLRecalcOptions( ScRecalcOptions eOpt ) { meOOXMLRecalc = eOpt; } ScRecalcOptions GetOOXMLRecalcOptions() const { return meOOXMLRecalc; } @@ -85,7 +85,7 @@ public: void ResetFormulaSeparators(); - static void GetDefaultFormulaSeparators(rtl::OUString& rSepArg, rtl::OUString& rSepArrayCol, rtl::OUString& rSepArrayRow); + static void GetDefaultFormulaSeparators(OUString& rSepArg, OUString& rSepArrayCol, OUString& rSepArrayRow); static const LocaleDataWrapper& GetLocaleDataWrapper(); @@ -123,14 +123,14 @@ private: class ScFormulaCfg : public ScFormulaOptions, public utl::ConfigItem { - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetPropertyNames(); public: ScFormulaCfg(); void SetOptions( const ScFormulaOptions& rNew ); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx index 861fec495770..337fef59de5b 100644 --- a/sc/inc/formulaparserpool.hxx +++ b/sc/inc/formulaparserpool.hxx @@ -36,18 +36,18 @@ public: ~ScFormulaParserPool(); /** Returns true, if a formula parser is registered for the passed namespace. */ - bool hasFormulaParser( const ::rtl::OUString& rNamespace ); + bool hasFormulaParser( const OUString& rNamespace ); /** Returns the formula parser that is registered for the passed namespace. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser > - getFormulaParser( const ::rtl::OUString& rNamespace ); + getFormulaParser( const OUString& rNamespace ); private: typedef ::boost::unordered_map< - ::rtl::OUString, + OUString, ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ParserMap; + OUStringHash, + ::std::equal_to< OUString > > ParserMap; const ScDocument& mrDoc; ParserMap maParsers; diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index 673bcdbf84bc..4e6fd393168e 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -172,7 +172,7 @@ public: /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only SetHybridFormula() for formula string to be compiled later. */ - SC_DLLPUBLIC void SetHybridString( const rtl::OUString & rStr ); + SC_DLLPUBLIC void SetHybridString( const OUString & rStr ); /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index 2c2c3f26de71..a507962df6d3 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -78,28 +78,28 @@ public: @return the description of the function, or an empty OUString if there is no description */ - virtual ::rtl::OUString getDescription() const ; + virtual OUString getDescription() const ; /** Returns the function signature with parameters from the passed string array. @return function signature with parameters */ - virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const ; + virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const ; /** Returns the name of the function @return the name of the function, or an empty OUString if there is no name */ - virtual ::rtl::OUString getFunctionName() const ; + virtual OUString getFunctionName() const ; /** Returns the help id of the function @return help id of the function */ - virtual ::rtl::OString getHelpId() const ; + virtual OString getHelpId() const ; /** Returns number of arguments @@ -116,7 +116,7 @@ public: @return OUString description of the parameter */ - virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ; + virtual OUString getParameterDescription(sal_uInt32 _nPos) const ; /** Returns name of parameter at given position @@ -126,21 +126,21 @@ public: @return OUString name of the parameter */ - virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ; + virtual OUString getParameterName(sal_uInt32 _nPos) const ; /** Returns list of all parameter names @return OUString containing separated list of all parameter names */ - ::rtl::OUString GetParamList() const; + OUString GetParamList() const; /** Returns the full function signature @return OUString of the form "FUNCTIONNAME( parameter list )" */ - virtual ::rtl::OUString getSignature() const ; + virtual OUString getSignature() const ; /** Returns the number of non-suppressed arguments @@ -198,15 +198,15 @@ public: - ::rtl::OUString *pFuncName; /**< Function name */ - ::rtl::OUString *pFuncDesc; /**< Description of function */ - ::rtl::OUString **ppDefArgNames; /**< Parameter name(s) */ - ::rtl::OUString **ppDefArgDescs; /**< Description(s) of parameter(s) */ + OUString *pFuncName; /**< Function name */ + OUString *pFuncDesc; /**< Description of function */ + OUString **ppDefArgNames; /**< Parameter name(s) */ + OUString **ppDefArgDescs; /**< Description(s) of parameter(s) */ ParameterFlags *pDefArgFlags; /**< Flags for each parameter */ sal_uInt16 nFIndex; /**< Unique function index */ sal_uInt16 nCategory; /**< Function category */ sal_uInt16 nArgCount; /**< All parameter count, suppressed and unsuppressed */ - rtl::OString sHelpId; /**< HelpId of function */ + OString sHelpId; /**< HelpId of function */ bool bIncomplete :1; /**< Incomplete argument info (set for add-in info from configuration) */ bool bHasSuppressedArgs :1; /**< Whether there is any suppressed parameter. */ }; @@ -278,12 +278,12 @@ public: @return index number of this category. */ virtual sal_uInt32 getNumber() const; - virtual ::rtl::OUString getName() const; + virtual OUString getName() const; private: ScFunctionMgr* m_pMgr; /**< function manager for this category */ ::std::vector<const ScFuncDesc*>* m_pCategory; /**< list of functions in this category */ - mutable ::rtl::OUString m_sName; /**< name of this category */ + mutable OUString m_sName; /**< name of this category */ sal_uInt32 m_nCategory; /**< index number of this category */ }; @@ -310,7 +310,7 @@ public: @return name of the category specified by _nCategoryNumber, empty string if _nCategoryNumber out of bounds */ - static ::rtl::OUString GetCategoryName(sal_uInt32 _nCategoryNumber ); + static OUString GetCategoryName(sal_uInt32 _nCategoryNumber ); /** Returns function by name. @@ -322,7 +322,7 @@ public: @return pointer to function with the name rFName, null if no such function was found. */ - const ScFuncDesc* Get( const ::rtl::OUString& rFName ) const; + const ScFuncDesc* Get( const OUString& rFName ) const; /** Returns function by index. @@ -383,9 +383,9 @@ public: virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const; /** - Implemented because of inheritance \see ScFunctionMgr::Get(const ::rtl::OUString&) const + Implemented because of inheritance \see ScFunctionMgr::Get(const OUString&) const */ - virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const; + virtual const formula::IFunctionDescription* getFunctionByName(const OUString& _sFunctionName) const; /** Maps Etoken to character diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 578f50c3b339..0a8423fa7f2c 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -71,14 +71,14 @@ public: ScFunctionAccess(); virtual ~ScFunctionAccess(); - 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(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XFunctionAccess virtual ::com::sun::star::uno::Any SAL_CALL callFunction( - const ::rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::container::NoSuchElementException, @@ -89,7 +89,7 @@ public: 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, + 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, @@ -97,29 +97,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -127,11 +127,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 3bdb51f18b3d..44bd67a3007c 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -443,8 +443,8 @@ struct ScImportParam SCCOL nCol2; SCROW nRow2; bool bImport; - ::rtl::OUString aDBName; // alias of data base - ::rtl::OUString aStatement; + OUString aDBName; // alias of data base + OUString aStatement; bool bNative; bool bSql; // statement or name? sal_uInt8 nType; // enum DBObject @@ -513,7 +513,7 @@ class ScGlobal static OUString** ppRscString; static String* pStrScDoc; static String* pEmptyString; - static ::rtl::OUString* pEmptyOUString; + static OUString* pEmptyOUString; static String* pStrClipDocName; static SvxBrushItem* pEmptyBrushItem; static SvxBrushItem* pButtonBrushItem; @@ -603,7 +603,7 @@ public: static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; } static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; } SC_DLLPUBLIC static const String& GetEmptyString(); - SC_DLLPUBLIC static const ::rtl::OUString& GetEmptyOUString(); + SC_DLLPUBLIC static const OUString& GetEmptyOUString(); static const String& GetScDocString(); /** Returns the specified image list with outline symbols. */ diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index c19ca7354aed..be5095a9a2a5 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -78,7 +78,7 @@ public: class ScInputCfg : public ScInputOptions, public utl::ConfigItem { - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetPropertyNames(); public: ScInputCfg(); @@ -86,7 +86,7 @@ public: void SetOptions( const ScInputOptions& rNew ); void OptionsChanged(); // after direct access to SetOptions base class - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ); virtual void Commit(); }; diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 07d3386fc4e2..61c0bc355683 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -80,8 +80,8 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XRefreshable @@ -97,7 +97,7 @@ public: 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, + 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, @@ -105,29 +105,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -135,21 +135,21 @@ public: ::com::sun::star::uno::RuntimeException); // aus get/setPropertyValue gerufen: - ::rtl::OUString getFileName(void) const; - void setFileName(const ::rtl::OUString& FileName); - ::rtl::OUString getFilter(void) const; - void setFilter(const ::rtl::OUString& Filter); - ::rtl::OUString getFilterOptions(void) const; - void setFilterOptions(const ::rtl::OUString& FilterOptions); + OUString getFileName(void) const; + void setFileName(const OUString& FileName); + OUString getFilter(void) const; + void setFilter(const OUString& Filter); + OUString getFilterOptions(void) const; + void setFilterOptions(const OUString& FilterOptions); sal_Int32 getRefreshDelay(void) const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -165,7 +165,7 @@ private: ScDocShell* pDocShell; ScSheetLinkObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScSheetLinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScSheetLinkObj* GetObjectByName_Impl(const OUString& aName); public: ScSheetLinksObj(ScDocShell* pDocSh); @@ -174,13 +174,13 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -200,11 +200,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -222,8 +222,8 @@ private: sal_uInt16 nPos; XRefreshListenerArr_Impl aRefreshListeners; - void Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::OUString* pNewFilter, - const ::rtl::OUString* pNewOptions, const ::rtl::OUString* pNewSource, + void Modify_Impl( const OUString* pNewFile, const OUString* pNewFilter, + const OUString* pNewOptions, const OUString* pNewSource, const com::sun::star::table::CellRangeAddress* pNewDest ); void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); void Refreshed_Impl(); @@ -247,7 +247,7 @@ public: 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, + 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, @@ -255,29 +255,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -285,18 +285,18 @@ public: ::com::sun::star::uno::RuntimeException); // called from get/setPropertyValue: - ::rtl::OUString getFileName(void) const; - void setFileName(const ::rtl::OUString& FileName); - ::rtl::OUString getFilter(void) const; - void setFilter(const ::rtl::OUString& Filter); - ::rtl::OUString getFilterOptions(void) const; - void setFilterOptions(const ::rtl::OUString& FilterOptions); + OUString getFileName(void) const; + void setFileName(const OUString& FileName); + OUString getFilter(void) const; + void setFilter(const OUString& Filter); + OUString getFilterOptions(void) const; + void setFilterOptions(const OUString& FilterOptions); sal_Int32 getRefreshDelay(void) const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink - virtual ::rtl::OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSourceArea( const ::rtl::OUString& aSourceArea ) + virtual OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSourceArea( const OUString& aSourceArea ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDestArea() throw(::com::sun::star::uno::RuntimeException); @@ -304,11 +304,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -332,10 +332,10 @@ public: // XAreaLinks virtual void SAL_CALL insertAtPosition( const ::com::sun::star::table::CellAddress& aDestPos, - const ::rtl::OUString& aFileName, - const ::rtl::OUString& aSourceArea, - const ::rtl::OUString& aFilter, - const ::rtl::OUString& aFilterOptions ) + const OUString& aFileName, + const OUString& aSourceArea, + const OUString& aFilter, + const OUString& aFilterOptions ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); @@ -357,11 +357,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -393,14 +393,14 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDDELink - virtual ::rtl::OUString SAL_CALL getApplication() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTopic() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getApplication() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTopic() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException); // XRefreshable virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); @@ -420,11 +420,11 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -440,7 +440,7 @@ private: ScDocShell* pDocShell; ScDDELinkObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScDDELinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDDELinkObj* GetObjectByName_Impl(const OUString& aName); public: ScDDELinksObj(ScDocShell* pDocSh); @@ -449,13 +449,13 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -476,16 +476,16 @@ public: // XDDELinks virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink > SAL_CALL addDDELink( - const ::rtl::OUString& aApplication, const ::rtl::OUString& aTopic, - const ::rtl::OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) + const OUString& aApplication, const OUString& aTopic, + const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -530,17 +530,17 @@ public: // XExternalDocLink virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache > - SAL_CALL addSheetCache( const ::rtl::OUString& aSheetName, sal_Bool bDynamicCache ) + SAL_CALL addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -577,17 +577,17 @@ public: // XExternalDocLinks virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > - SAL_CALL addDocLink( const ::rtl::OUString& aDocName ) + SAL_CALL addDocLink( const OUString& aDocName ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx index 57cced3aa708..f2229dd89522 100644 --- a/sc/inc/macromgr.hxx +++ b/sc/inc/macromgr.hxx @@ -30,15 +30,15 @@ public: ~ScMacroManager(); SC_DLLPUBLIC void InitUserFuncData(); - SC_DLLPUBLIC void SetUserFuncVolatile( const rtl::OUString& sName, bool isVolatile ); - SC_DLLPUBLIC bool GetUserFuncVolatile( const rtl::OUString& sName ); + SC_DLLPUBLIC void SetUserFuncVolatile( const OUString& sName, bool isVolatile ); + SC_DLLPUBLIC bool GetUserFuncVolatile( const OUString& sName ); - void AddDependentCell(const ::rtl::OUString& aModuleName, ScFormulaCell* pCell); + void AddDependentCell(const OUString& aModuleName, ScFormulaCell* pCell); void RemoveDependentCell(ScFormulaCell* pCell); - void BroadcastModuleUpdate(const ::rtl::OUString& aModuleName); + void BroadcastModuleUpdate(const OUString& aModuleName); private: - typedef boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameBoolMap; + typedef boost::unordered_map< OUString, bool, OUStringHash, ::std::equal_to< OUString > > NameBoolMap; NameBoolMap mhFuncToVolatile; com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > mxContainerListener; diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 646d2613d294..0023a9ac2678 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -30,43 +30,43 @@ #include "scdllapi.h" #define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ -::rtl::OUString SAL_CALL ClassName::getImplementationName() \ +OUString SAL_CALL ClassName::getImplementationName() \ throw(::com::sun::star::uno::RuntimeException) \ { \ - return ::rtl::OUString::createFromAscii(ClassNameAscii); \ + return OUString::createFromAscii(ClassNameAscii); \ } \ -sal_Bool SAL_CALL ClassName::supportsService( const ::rtl::OUString& ServiceName ) \ +sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ throw(::com::sun::star::uno::RuntimeException) \ { \ return !ServiceName.compareToAscii(ServiceAscii); \ } \ -::com::sun::star::uno::Sequence< ::rtl::OUString > \ +::com::sun::star::uno::Sequence< OUString > \ SAL_CALL ClassName::getSupportedServiceNames(void) \ throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); \ - ::rtl::OUString* pArray = aRet.getArray(); \ - pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii); \ + ::com::sun::star::uno::Sequence< OUString > aRet(1); \ + OUString* pArray = aRet.getArray(); \ + pArray[0] = OUString::createFromAscii(ServiceAscii); \ return aRet; \ } #define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName ) \ - void SAL_CALL ClassName::addPropertyChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::addPropertyChangeListener( const OUString&, \ const uno::Reference<beans::XPropertyChangeListener>&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { OSL_FAIL("not implemented"); } \ - void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::removePropertyChangeListener( const OUString&, \ const uno::Reference<beans::XPropertyChangeListener>&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { OSL_FAIL("not implemented"); } \ - void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::addVetoableChangeListener( const OUString&, \ const uno::Reference<beans::XVetoableChangeListener>&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { OSL_FAIL("not implemented"); } \ - void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::removeVetoableChangeListener( const OUString&, \ const uno::Reference<beans::XVetoableChangeListener>&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ @@ -91,12 +91,12 @@ class ScIndexEnumeration : public cppu::WeakImplHelper2< { private: com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> xIndex; - rtl::OUString sServiceName; + OUString sServiceName; sal_Int32 nPos; public: ScIndexEnumeration(const com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess>& rInd, const rtl::OUString& rServiceName); + com::sun::star::container::XIndexAccess>& rInd, const OUString& rServiceName); virtual ~ScIndexEnumeration(); // XEnumeration @@ -107,11 +107,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; @@ -122,7 +122,7 @@ class ScNameToIndexAccess : public cppu::WeakImplHelper2< { private: com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xNameAccess; - com::sun::star::uno::Sequence<rtl::OUString> aNames; + com::sun::star::uno::Sequence<OUString> aNames; public: ScNameToIndexAccess( @@ -143,11 +143,11 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; @@ -158,16 +158,16 @@ public: AnyToInterface( const com::sun::star::uno::Any& rAny ); static sal_Bool GetBoolProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, - const ::rtl::OUString& rName, sal_Bool bDefault = false ); + const OUString& rName, sal_Bool bDefault = false ); static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, - const ::rtl::OUString& rName, long nDefault = 0 ); + const OUString& rName, long nDefault = 0 ); static sal_Int32 GetEnumProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, - const ::rtl::OUString& rName, long nDefault ); - static ::rtl::OUString GetStringProperty( + const OUString& rName, long nDefault ); + static OUString GetStringProperty( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xProp, - const ::rtl::OUString& rName, const ::rtl::OUString& rDefault ); + const OUString& rName, const OUString& rDefault ); static sal_Bool GetBoolFromAny( const com::sun::star::uno::Any& aAny ); static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny ); diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 02cf724be6e5..61be7bb7b0e9 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -79,8 +79,8 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamedRange - virtual ::rtl::OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setContent( const ::rtl::OUString& aContent ) + virtual OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setContent( const OUString& aContent ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getReferencePosition() throw(::com::sun::star::uno::RuntimeException); @@ -98,8 +98,8 @@ public: throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XCellRangeReferrer @@ -110,7 +110,7 @@ public: 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, + 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, @@ -118,29 +118,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -155,11 +155,11 @@ public: static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -181,7 +181,7 @@ private: sal_Bool mbModifyAndBroadcast; virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) = 0; - virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName) = 0; + virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName) = 0; virtual ScRangeName* GetRangeName_Impl() = 0; virtual SCTAB GetTab_Impl() = 0; @@ -204,25 +204,25 @@ public: bool IsModifyAndBroadcast() const; // XNamedRanges - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::rtl::OUString& aContent, + virtual void SAL_CALL addNewByName( const OUString& aName, const OUString& aContent, const ::com::sun::star::table::CellAddress& aPosition, sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource, ::com::sun::star::sheet::Border aBorder ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL outputList( const ::com::sun::star::table::CellAddress& aOutputPosition ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -245,7 +245,7 @@ public: 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, + 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, @@ -253,29 +253,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -290,11 +290,11 @@ public: virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -303,7 +303,7 @@ class ScGlobalNamedRangesObj: public ScNamedRangesObj private: virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName); virtual ScRangeName* GetRangeName_Impl(); virtual SCTAB GetTab_Impl(); @@ -318,7 +318,7 @@ class ScLocalNamedRangesObj: public ScNamedRangesObj private: virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName); virtual ScRangeName* GetRangeName_Impl(); virtual SCTAB GetTab_Impl(); @@ -361,11 +361,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -412,11 +412,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index 1143ccfe89d5..68d3afcfb7fc 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -65,7 +65,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, - const ::rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, @@ -80,15 +80,15 @@ public: getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XSheetAnnotation virtual ::com::sun::star::table::CellAddress SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAuthor() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDate() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAuthor() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDate() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getIsVisible() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setIsVisible( sal_Bool bIsVisible ) throw(::com::sun::star::uno::RuntimeException); @@ -99,11 +99,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index ea60c77d1ef0..6da94a1df2f0 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -44,12 +44,12 @@ public: static sal_Bool setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ); static ::com::sun::star::uno::Any getPropertyValue( const ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const ::rtl::OUString& PropertyName ); + const OUString& PropertyName ); }; @@ -66,7 +66,7 @@ public: // get/setPropertyValue overloaded to used stored options instead of document - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + 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, @@ -74,7 +74,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index d38995589b9c..151c0c06b2ae 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -42,18 +42,18 @@ class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem Link aCommitLink; public: - ScLinkConfigItem( const rtl::OUString& rSubTree ); - ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ); + ScLinkConfigItem( const OUString& rSubTree ); + ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode ); void SetCommitLink( const Link& rLink ); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ); virtual void Commit(); void SetModified() { ConfigItem::SetModified(); } com::sun::star::uno::Sequence< com::sun::star::uno::Any> - GetProperties(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) + GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } - sal_Bool PutProperties( const com::sun::star::uno::Sequence< rtl::OUString >& rNames, + sal_Bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues) { return ConfigItem::PutProperties( rNames, rValues ); } diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx index 22e9cc914ce6..ef88795432f3 100644 --- a/sc/inc/orcusfilters.hxx +++ b/sc/inc/orcusfilters.hxx @@ -26,9 +26,9 @@ class ScOrcusFilters public: virtual ~ScOrcusFilters() {} - virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; + virtual bool importCSV(ScDocument& rDoc, const OUString& rPath) const = 0; - virtual bool importGnumeric(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; + virtual bool importGnumeric(ScDocument& rDoc, const OUString& rPath) const = 0; /** * Create a context for XML file. The context object stores session @@ -39,7 +39,7 @@ public: * The caller is responsible for deleting the instance returned from this * method when it's done. */ - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const = 0; }; class ScOrcusXMLContext diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx index 36c41dd9eb9f..c8d7fdf2f0b1 100644 --- a/sc/inc/orcusxml.hxx +++ b/sc/inc/orcusxml.hxx @@ -59,15 +59,15 @@ struct ScOrcusImportXMLParam struct CellLink { ScAddress maPos; - rtl::OString maPath; + OString maPath; - CellLink(const ScAddress& rPos, const rtl::OString& rPath); + CellLink(const ScAddress& rPos, const OString& rPath); }; struct RangeLink { ScAddress maPos; - std::vector<rtl::OString> maFieldPaths; + std::vector<OString> maFieldPaths; }; typedef std::vector<CellLink> CellLinksType; diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index 4a77b7e3e2ce..a0540d37a675 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -36,11 +36,11 @@ public: _CreateShape( SdrObject *pObj ) const throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index ba877412cdbb..85e19e0fdf18 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -55,19 +55,19 @@ struct ScDPName { - ::rtl::OUString maName; /// Original name of the dimension. - ::rtl::OUString maLayoutName; /// Layout name (display name) + OUString maName; /// Original name of the dimension. + OUString maLayoutName; /// Layout name (display name) - explicit ScDPName(const ::rtl::OUString& rName, const ::rtl::OUString& rLayoutName); + explicit ScDPName(const OUString& rName, const OUString& rLayoutName); }; // ============================================================================ struct ScDPLabelData { - rtl::OUString maName; /// Original name of the dimension. - rtl::OUString maLayoutName; /// Layout name (display name) - rtl::OUString maSubtotalName; + OUString maName; /// Original name of the dimension. + OUString maLayoutName; /// Layout name (display name) + OUString maSubtotalName; SCCOL mnCol; /// 0-based field index (not the source column index) long mnOriginalDim; /// original dimension index (>= 0 for duplicated dimension) sal_uInt16 mnFuncMask; /// Page/Column/Row subtotal function. @@ -79,8 +79,8 @@ struct ScDPLabelData struct Member { - ::rtl::OUString maName; - ::rtl::OUString maLayoutName; + OUString maName; + OUString maLayoutName; bool mbVisible; bool mbShowDetails; @@ -91,10 +91,10 @@ struct ScDPLabelData * when the layout name is present, use it, or else use the original * name. */ - ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; + OUString SC_DLLPUBLIC getDisplayName() const; }; ::std::vector<Member> maMembers; - ::com::sun::star::uno::Sequence< ::rtl::OUString > maHiers; /// Hierarchies. + ::com::sun::star::uno::Sequence< OUString > maHiers; /// Hierarchies. ::com::sun::star::sheet::DataPilotFieldSortInfo maSortInfo; /// Sorting info. ::com::sun::star::sheet::DataPilotFieldLayoutInfo maLayoutInfo; /// Layout info. ::com::sun::star::sheet::DataPilotFieldAutoShowInfo maShowInfo; /// AutoShow info. @@ -105,7 +105,7 @@ struct ScDPLabelData * return the name that should be displayed in the dp dialogs i.e. when * the layout name is present, use it, or else use the original name. */ - ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; + OUString SC_DLLPUBLIC getDisplayName() const; }; typedef boost::ptr_vector<ScDPLabelData> ScDPLabelDataVector; diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 88ae564d5b20..c6907dca39c4 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -43,8 +43,8 @@ struct SC_DLLPUBLIC ScNoteData { typedef ::boost::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef; - ::rtl::OUString maDate; /// Creation date of the note. - ::rtl::OUString maAuthor; /// Author of the note. + OUString maDate; /// Creation date of the note. + OUString maAuthor; /// Author of the note. ScCaptionInitDataRef mxInitData; /// Initial data for invisible notes without SdrObject. SdrCaptionObj* mpCaption; /// Drawing object representing the cell note. bool mbShown; /// True = note is visible. @@ -102,14 +102,14 @@ public: inline const ScNoteData& GetNoteData() const { return maNoteData; } /** Returns the creation date of this note. */ - inline const ::rtl::OUString& GetDate() const { return maNoteData.maDate; } + inline const OUString& GetDate() const { return maNoteData.maDate; } /** Sets a new creation date for this note. */ - inline void SetDate( const ::rtl::OUString& rDate ) { maNoteData.maDate = rDate; } + inline void SetDate( const OUString& rDate ) { maNoteData.maDate = rDate; } /** Returns the author date of this note. */ - inline const ::rtl::OUString& GetAuthor() const { return maNoteData.maAuthor; } + inline const OUString& GetAuthor() const { return maNoteData.maAuthor; } /** Sets a new author date for this note. */ - inline void SetAuthor( const ::rtl::OUString& rAuthor ) { maNoteData.maAuthor = rAuthor; } + inline void SetAuthor( const OUString& rAuthor ) { maNoteData.maAuthor = rAuthor; } /** Sets date and author from system settings. */ void AutoStamp(); @@ -120,9 +120,9 @@ public: const EditTextObject* GetEditTextObject() const; /** Returns the caption text of this note. */ - ::rtl::OUString GetText() const; + OUString GetText() const; /** Changes the caption text of this note. All text formatting will be lost. */ - void SetText( const ScAddress& rPos, const ::rtl::OUString& rText ); + void SetText( const ScAddress& rPos, const OUString& rText ); /** Returns an existing note caption object. returns null, if the note contains initial caption data needed to construct a caption object. */ @@ -170,7 +170,7 @@ public: /** Creates and returns a caption object for a temporary caption. */ static SdrCaptionObj* CreateTempCaption( ScDocument& rDoc, const ScAddress& rPos, - SdrPage& rDrawPage, const ::rtl::OUString& rUserText, + SdrPage& rDrawPage, const OUString& rUserText, const Rectangle& rVisRect, bool bTailFront ); /** Creates a cell note using the passed caption drawing object. @@ -246,7 +246,7 @@ public: */ static ScPostIt* CreateNoteFromString( ScDocument& rDoc, const ScAddress& rPos, - const ::rtl::OUString& rNoteText, bool bShown, + const OUString& rNoteText, bool bShown, bool bAlwaysCreateCaption ); }; diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index c2e7b4d58320..d84539d4649e 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -76,7 +76,7 @@ private: class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem { - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetPropertyNames(); public: ScPrintCfg(); @@ -84,7 +84,7 @@ public: void SetOptions( const ScPrintOptions& rNew ); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx index b3c7c3c415f7..08a2f811fd77 100644 --- a/sc/inc/queryentry.hxx +++ b/sc/inc/queryentry.hxx @@ -41,7 +41,7 @@ struct SC_DLLPUBLIC ScQueryEntry { QueryType meType; double mfVal; - rtl::OUString maString; + OUString maString; Item() : meType(ByValue), mfVal(0.0) {} diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 4bfe5a860590..26d2d1b2a087 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -48,7 +48,7 @@ struct ScQueryParamBase ScQueryEntry* FindEntryByField(SCCOLROW nField, bool bNew); SC_DLLPUBLIC void RemoveEntryByField(SCCOLROW nField); void Resize(size_t nNew); - void FillInExcelSyntax(const rtl::OUString& aCellStr, SCSIZE nIndex); + void FillInExcelSyntax(const OUString& aCellStr, SCSIZE nIndex); protected: typedef boost::ptr_vector<ScQueryEntry> EntriesType; diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index b67445be5fa2..2a20f45108e9 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -46,7 +46,7 @@ public: void Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ) const; - void Format( rtl::OUString&, sal_uInt16 nFlags = 0, ScDocument* = NULL, + void Format( OUString&, sal_uInt16 nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ) const; diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 27b9262194b7..8d2e6acc5f37 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -62,8 +62,8 @@ class ScTokenArray; class ScRangeData { private: - rtl::OUString aName; - rtl::OUString aUpperName; // #i62977# for faster searching (aName is never modified after ctor) + OUString aName; + OUString aUpperName; // #i62977# for faster searching (aName is never modified after ctor) ScTokenArray* pCode; ScAddress aPos; RangeType eType; @@ -83,18 +83,18 @@ public: typedef ::std::map<sal_uInt16, sal_uInt16> IndexMap; SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, - const rtl::OUString& rName, + const OUString& rName, const String& rSymbol, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, - const rtl::OUString& rName, + const OUString& rName, const ScTokenArray& rArr, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME ); SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, - const rtl::OUString& rName, + const OUString& rName, const ScAddress& rTarget ); // rTarget is ABSPOS jump label ScRangeData(const ScRangeData& rScRangeData, ScDocument* pDocument = NULL); @@ -103,9 +103,9 @@ public: bool operator== (const ScRangeData& rData) const; - void GetName( rtl::OUString& rName ) const { rName = aName; } - const rtl::OUString& GetName( void ) const { return aName; } - const rtl::OUString& GetUpperName( void ) const { return aUpperName; } + void GetName( OUString& rName ) const { rName = aName; } + const OUString& GetName( void ) const { return aName; } + const OUString& GetUpperName( void ) const { return aUpperName; } ScAddress GetPos() const { return aPos; } // The index has to be unique. If index=0 a new index value is assigned. void SetIndex( sal_uInt16 nInd ) { nIndex = nInd; } @@ -123,9 +123,9 @@ public: bool HasType( RangeType nType ) const; sal_uInt32 GetUnoType() const; SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - SC_DLLPUBLIC void GetSymbol( rtl::OUString& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - SC_DLLPUBLIC void GetSymbol( rtl::OUString& rSymbol, const ScAddress& rPos, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&, + SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; + SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const ScAddress& rPos, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; + void UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress&, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, @@ -170,7 +170,7 @@ class ScRangeName { private: typedef std::vector<ScRangeData*> IndexDataType; - typedef ::boost::ptr_map<rtl::OUString, ScRangeData> DataType; + typedef ::boost::ptr_map<OUString, ScRangeData> DataType; DataType maData; IndexDataType maIndexToData; @@ -187,8 +187,8 @@ public: SC_DLLPUBLIC ScRangeName(const ScRangeName& r); SC_DLLPUBLIC const ScRangeData* findByRange(const ScRange& rRange) const; - SC_DLLPUBLIC ScRangeData* findByUpperName(const rtl::OUString& rName); - SC_DLLPUBLIC const ScRangeData* findByUpperName(const rtl::OUString& rName) const; + SC_DLLPUBLIC ScRangeData* findByUpperName(const OUString& rName); + SC_DLLPUBLIC const ScRangeData* findByUpperName(const OUString& rName) const; SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i) const; void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bLocal = false); @@ -216,7 +216,7 @@ public: SC_DLLPUBLIC bool insert(ScRangeData* p); void erase(const ScRangeData& r); - void erase(const rtl::OUString& rName); + void erase(const OUString& rName); /** * Erase by iterator position. Note that this method doesn't check for diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index deaf34cec858..678bdb41c521 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -104,43 +104,43 @@ public: // helper methods static void AssignString( - ::rtl::OUString& rString, - const ::rtl::OUString& rNewStr, + OUString& rString, + const OUString& rNewStr, sal_Bool bAppendStr, sal_Unicode cSeperator = ' '); static sal_Int32 IndexOf( - const ::rtl::OUString& rString, + const OUString& rString, sal_Unicode cSearchChar, sal_Int32 nOffset, sal_Unicode cQuote = '\''); static sal_Int32 IndexOfDifferent( - const ::rtl::OUString& rString, + const OUString& rString, sal_Unicode cSearchChar, sal_Int32 nOffset ); static sal_Int32 GetTokenCount( - const ::rtl::OUString& rString, + const OUString& rString, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); static void GetTokenByOffset( - ::rtl::OUString& rToken, - const ::rtl::OUString& rString, + OUString& rToken, + const OUString& rString, sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); static void AppendTableName( - ::rtl::OUStringBuffer& rBuf, - const ::rtl::OUString& rTabName, + OUStringBuffer& rBuf, + const OUString& rTabName, sal_Unicode cQuote = '\''); // String to Range core static sal_Bool GetAddressFromString( ScAddress& rAddress, - const ::rtl::OUString& rAddressStr, + const OUString& rAddressStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -148,7 +148,7 @@ public: sal_Unicode cQuote = '\''); static sal_Bool GetRangeFromString( ScRange& rRange, - const ::rtl::OUString& rRangeStr, + const OUString& rRangeStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -156,7 +156,7 @@ public: sal_Unicode cQuote = '\''); static sal_Bool GetRangeListFromString( ScRangeList& rRangeList, - const ::rtl::OUString& rRangeListStr, + const OUString& rRangeListStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeperator = ' ', @@ -164,7 +164,7 @@ public: static sal_Bool GetAreaFromString( ScArea& rArea, - const ::rtl::OUString& rRangeStr, + const OUString& rRangeStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -174,7 +174,7 @@ public: // String to Range API static sal_Bool GetAddressFromString( ::com::sun::star::table::CellAddress& rAddress, - const ::rtl::OUString& rAddressStr, + const OUString& rAddressStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -182,7 +182,7 @@ public: sal_Unicode cQuote = '\''); static sal_Bool GetRangeFromString( ::com::sun::star::table::CellRangeAddress& rRange, - const ::rtl::OUString& rRangeStr, + const OUString& rRangeStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -190,7 +190,7 @@ public: sal_Unicode cQuote = '\''); static sal_Bool GetRangeListFromString( ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, - const ::rtl::OUString& rRangeListStr, + const OUString& rRangeListStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeperator = ' ', @@ -198,7 +198,7 @@ public: // Range to String core static void GetStringFromAddress( - ::rtl::OUString& rString, + OUString& rString, const ScAddress& rAddress, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -206,7 +206,7 @@ public: sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRange( - ::rtl::OUString& rString, + OUString& rString, const ScRange& rRange, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -214,7 +214,7 @@ public: sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRangeList( - ::rtl::OUString& rString, + OUString& rString, const ScRangeList* pRangeList, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -222,7 +222,7 @@ public: sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D)); static void GetStringFromArea( - ::rtl::OUString& rString, + OUString& rString, const ScArea& rArea, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -232,7 +232,7 @@ public: // Range to String API static void GetStringFromAddress( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::table::CellAddress& rAddress, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -240,7 +240,7 @@ public: sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRange( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::table::CellRangeAddress& rRange, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -248,7 +248,7 @@ public: sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRangeList( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -257,12 +257,12 @@ public: // XML Range to Calc Range static void GetStringFromXMLRangeString( - ::rtl::OUString& rString, - const ::rtl::OUString& rXMLRange, + OUString& rString, + const OUString& rXMLRange, ScDocument* pDoc ); // String to RangeData core - static ScRangeData* GetRangeDataFromString(const rtl::OUString& rString, const SCTAB nTab, const ScDocument* pDoc); + static ScRangeData* GetRangeDataFromString(const OUString& rString, const SCTAB nTab, const ScDocument* pDoc); }; //------------------------------------------------------------------------ @@ -309,7 +309,7 @@ public: ScAreaNameIterator( ScDocument* pDoc ); ~ScAreaNameIterator() {} - bool Next( rtl::OUString& rName, ScRange& rRange ); + bool Next( OUString& rName, ScRange& rRange ); bool Next( String& rName, ScRange& rRange ); bool WasDBName() const { return !bFirstPass; } }; diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx index d4fc698eeb38..6cc24aafbe62 100644 --- a/sc/inc/reftokenhelper.hxx +++ b/sc/inc/reftokenhelper.hxx @@ -45,7 +45,7 @@ public: * The source range may consist of multiple ranges separated by ';'s. */ static void compileRangeRepresentation( - ::std::vector<ScTokenRef>& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc, + ::std::vector<ScTokenRef>& rRefTokens, const OUString& rRangeStr, ScDocument* pDoc, const sal_Unicode cSep, ::formula::FormulaGrammar::Grammar eGrammar, bool bOnly3DRef = false); static bool getRangeFromToken(ScRange& rRange, const ScTokenRef& pToken, bool bExternal = false); diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index b5cf97e53097..50f3aa08f344 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -96,8 +96,8 @@ public: virtual bool IsDatabase() const = 0; virtual bool IsExternal() const = 0; virtual bool IsNamedRange() const = 0; - virtual rtl::OUString GetSelectedNamedRange() const = 0; - virtual void AppendNamedRange(const ::rtl::OUString& rName) = 0; + virtual OUString GetSelectedNamedRange() const = 0; + virtual void AppendNamedRange(const OUString& rName) = 0; }; class AbstractScDataPilotServiceDlg : public VclAbstractDialog //add for ScDataPilotServiceDlg @@ -214,7 +214,7 @@ public: virtual sal_uInt16 GetSelectedTable () const = 0; virtual bool GetCopyTable () const = 0; virtual bool GetRenameTable () const = 0; - virtual void GetTabNameString( rtl::OUString& rString ) const = 0; + virtual void GetTabNameString( OUString& rString ) const = 0; virtual void SetForceCopyTable () = 0; virtual void EnableCopyTable (sal_Bool bFlag=true) = 0; virtual void EnableRenameTable (sal_Bool bFlag=true) = 0; @@ -229,7 +229,7 @@ public: class AbstractScNamePasteDlg : public VclAbstractDialog //add for ScNamePasteDlg { public: - virtual std::vector<rtl::OUString> GetSelectedNames() const = 0; + virtual std::vector<OUString> GetSelectedNames() const = 0; virtual bool IsAllSelected() const = 0; }; @@ -276,10 +276,10 @@ class AbstractScNewScenarioDlg : public VclAbstractDialog //add for ScNewScenar { public: - virtual void SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment, + virtual void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) = 0; - virtual void GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, + virtual void GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const = 0; }; @@ -288,7 +288,7 @@ class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg public: virtual void Insert( const String& rString, sal_Bool bSelected ) = 0; virtual sal_uInt16 GetSelectEntryCount() const = 0; - virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ) = 0; + virtual void SetDescription(const String& rTitle, const String& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0; virtual String GetSelectEntry(sal_uInt16 nPos) const = 0; virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0; }; @@ -296,7 +296,7 @@ public: class AbstractScStringInputDlg : public VclAbstractDialog //add for ScStringInputDlg { public: - virtual void GetInputString( rtl::OUString& rString ) const = 0; + virtual void GetInputString( OUString& rString ) const = 0; }; class AbstractScTabBgColorDlg : public VclAbstractDialog //add for ScTabBgColorDlg @@ -355,7 +355,7 @@ public: virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg - const com::sun::star::uno::Sequence<rtl::OUString>& rServices, + const com::sun::star::uno::Sequence<OUString>& rServices, int nId ) = 0; virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, sal_Bool bDisallowCellMove = false ) = 0 ; //add for ScDeleteCellDlg @@ -460,14 +460,14 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, + const OString& sHelpId, const OString& sEditHelpId, int nId ) = 0; virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScTabBgColorDlg const String& rTitle, //Dialog Title const String& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color - const rtl::OString& , + const OString& , int nId ) = 0; virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index bf1f15f18b45..c91b0ca8bdb9 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -47,11 +47,11 @@ const ScMatValType SC_MATVAL_NONVALUE = SC_MATVAL_EMPTYPATH; // mask of all struct ScMatrixValue { double fVal; - rtl::OUString aStr; + OUString aStr; ScMatValType nType; /// Only valid if ScMatrix methods indicate so! - const ::rtl::OUString& GetString() const { return aStr; } + const OUString& GetString() const { return aStr; } /// Only valid if ScMatrix methods indicate that this is no string! sal_uInt16 GetError() const { return GetDoubleErrorValue( fVal); } @@ -254,9 +254,9 @@ public: void PutDouble( double fVal, SCSIZE nIndex); void PutDouble(const double* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); - void PutString( const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR); - void PutString( const ::rtl::OUString& rStr, SCSIZE nIndex); - void PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); + void PutString( const OUString& rStr, SCSIZE nC, SCSIZE nR); + void PutString( const OUString& rStr, SCSIZE nIndex); + void PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); void PutEmpty( SCSIZE nC, SCSIZE nR); @@ -286,15 +286,15 @@ public: double GetDouble( SCSIZE nIndex) const; /// @return empty string if empty or empty path, else string content. - rtl::OUString GetString( SCSIZE nC, SCSIZE nR) const; + OUString GetString( SCSIZE nC, SCSIZE nR) const; /// @return empty string if empty or empty path, else string content. - rtl::OUString GetString( SCSIZE nIndex) const; + OUString GetString( SCSIZE nIndex) const; /** @returns the matrix element's string if one is present, otherwise the numerical value formatted as string, or in case of an error the error string is returned; an empty string for empty, a "FALSE" string for empty path. */ - ::rtl::OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; + OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; /// @ATTENTION: If bString the ScMatrixValue->pS may still be NULL to indicate /// an empty string! diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index acc0e17f0aaf..bb2462fc733a 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -145,9 +145,9 @@ public: void SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); void ResetDragObject(); void SetDragLink( - const rtl::OUString& rDoc, const rtl::OUString& rTab, const rtl::OUString& rArea ); + const OUString& rDoc, const OUString& rTab, const OUString& rArea ); void SetDragJump( - ScDocument* pLocalDoc, const rtl::OUString& rTarget, const rtl::OUString& rText ); + ScDocument* pLocalDoc, const OUString& rTarget, const OUString& rText ); // clipboard: const ScClipData& GetClipData() const; diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index a95b6abce5c7..f17e50134991 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -101,7 +101,7 @@ public: // pDocShell is not needed for all Services static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); - static ::com::sun::star::uno::Sequence<rtl::OUString> GetAllServiceNames(); + static ::com::sun::star::uno::Sequence<OUString> GetAllServiceNames(); static sal_uInt16 GetProviderType(const String& rServiceName); }; diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 5ddae06dd33a..5173c3523144 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -104,7 +104,7 @@ public: 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, + 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, @@ -112,29 +112,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -143,19 +143,19 @@ public: // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( - const ::rtl::OUString& PropertyName ) + 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 ) + OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + 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 ::rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -199,7 +199,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, - const ::rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, @@ -214,8 +214,8 @@ public: getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XChild @@ -235,11 +235,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx index 07ba888dd0c6..2f5c8cf89ccc 100644 --- a/sc/inc/sheetdata.hxx +++ b/sc/inc/sheetdata.hxx @@ -51,10 +51,10 @@ struct ScStreamEntry struct ScCellStyleEntry { - rtl::OUString maName; + OUString maName; ScAddress maCellPos; - ScCellStyleEntry( const rtl::OUString& rName, const ScAddress& rPos ) : + ScCellStyleEntry( const OUString& rName, const ScAddress& rPos ) : maName(rName), maCellPos(rPos) { @@ -63,11 +63,11 @@ struct ScCellStyleEntry struct ScNoteStyleEntry { - rtl::OUString maStyleName; - rtl::OUString maTextStyle; + OUString maStyleName; + OUString maTextStyle; ScAddress maCellPos; - ScNoteStyleEntry( const rtl::OUString& rStyle, const rtl::OUString& rText, const ScAddress& rPos ) : + ScNoteStyleEntry( const OUString& rStyle, const OUString& rText, const ScAddress& rPos ) : maStyleName(rStyle), maTextStyle(rText), maCellPos(rPos) @@ -77,11 +77,11 @@ struct ScNoteStyleEntry struct ScTextStyleEntry { - rtl::OUString maName; + OUString maName; ScAddress maCellPos; ESelection maSelection; - ScTextStyleEntry( const rtl::OUString& rName, const ScAddress& rPos, const ESelection& rSel ) : + ScTextStyleEntry( const OUString& rName, const ScAddress& rPos, const ESelection& rSel ) : maName(rName), maCellPos(rPos), maSelection(rSel) @@ -91,11 +91,11 @@ struct ScTextStyleEntry struct ScLoadedNamespaceEntry { - rtl::OUString maPrefix; - rtl::OUString maName; + OUString maPrefix; + OUString maName; sal_uInt16 mnKey; - ScLoadedNamespaceEntry( const rtl::OUString& rPrefix, const rtl::OUString& rName, sal_uInt16 nKey ) : + ScLoadedNamespaceEntry( const OUString& rPrefix, const OUString& rName, sal_uInt16 nKey ) : maPrefix(rPrefix), maName(rName), mnKey(nKey) @@ -105,7 +105,7 @@ struct ScLoadedNamespaceEntry class ScSheetSaveData { - boost::unordered_set<rtl::OUString, rtl::OUStringHash> maInitialPrefixes; + boost::unordered_set<OUString, OUStringHash> maInitialPrefixes; std::vector<ScLoadedNamespaceEntry> maLoadedNamespaces; std::vector<ScCellStyleEntry> maCellStyles; @@ -130,15 +130,15 @@ public: ScSheetSaveData(); ~ScSheetSaveData(); - void AddCellStyle( const rtl::OUString& rName, const ScAddress& rCellPos ); - void AddColumnStyle( const rtl::OUString& rName, const ScAddress& rCellPos ); - void AddRowStyle( const rtl::OUString& rName, const ScAddress& rCellPos ); - void AddTableStyle( const rtl::OUString& rName, const ScAddress& rCellPos ); + void AddCellStyle( const OUString& rName, const ScAddress& rCellPos ); + void AddColumnStyle( const OUString& rName, const ScAddress& rCellPos ); + void AddRowStyle( const OUString& rName, const ScAddress& rCellPos ); + void AddTableStyle( const OUString& rName, const ScAddress& rCellPos ); - void HandleNoteStyles( const rtl::OUString& rStyleName, const rtl::OUString& rTextName, const ScAddress& rCellPos ); - void AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ); + void HandleNoteStyles( const OUString& rStyleName, const OUString& rTextName, const ScAddress& rCellPos ); + void AddNoteContentStyle( sal_uInt16 nFamily, const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ); - void AddTextStyle( const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ); + void AddTextStyle( const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ); void BlockSheet( SCTAB nTab ); bool IsSheetBlocked( SCTAB nTab ) const; diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx index 55073fb87fa8..e10fda07a90a 100644 --- a/sc/inc/sheetevents.hxx +++ b/sc/inc/sheetevents.hxx @@ -33,7 +33,7 @@ class ScSheetEvents { - rtl::OUString** mpScriptNames; + OUString** mpScriptNames; void Clear(); @@ -44,10 +44,10 @@ public: const ScSheetEvents& operator= (const ScSheetEvents& rOther); - const rtl::OUString* GetScript(sal_Int32 nEvent) const; - void SetScript(sal_Int32 nEvent, const rtl::OUString* pNew); + const OUString* GetScript(sal_Int32 nEvent) const; + void SetScript(sal_Int32 nEvent, const OUString* pNew); - static rtl::OUString GetEventName(sal_Int32 nEvent); + static OUString GetEventName(sal_Int32 nEvent); static sal_Int32 GetVbaSheetEventId(sal_Int32 nEvent); static sal_Int32 GetVbaDocumentEventId(sal_Int32 nEvent); }; diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index 8d40f3b206c2..a4c6f65e2493 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -60,7 +60,7 @@ struct SC_DLLPUBLIC ScSortParam SCROW nDestRow; ScSortKeyStateVec maKeyState; ::com::sun::star::lang::Locale aCollatorLocale; - ::rtl::OUString aCollatorAlgorithm; + OUString aCollatorAlgorithm; sal_uInt16 nCompatHeader; diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index f2889ccabce2..e30a893f6c05 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -46,13 +46,13 @@ public: SvxSearchItem* GetSearchItem() const { return pSearchItem; } // XReplaceDescriptor - virtual ::rtl::OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReplaceString( const ::rtl::OUString& aReplaceString ) + virtual OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException); // XSearchDescriptor - virtual ::rtl::OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // search/replace should be called from outside (from XSearchable)... @@ -61,7 +61,7 @@ public: 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, + 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, @@ -69,29 +69,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -108,11 +108,11 @@ public: com::sun::star::util::XSearchDescriptor> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index 58eda3a63f43..68670b9e6867 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -127,7 +127,7 @@ public: * @return true if the string is a valid number, false otherwise. */ static bool parseSimpleNumber( - const ::rtl::OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal); + const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal); static sal_Int32 SC_DLLPUBLIC GetQuotedTokenCount(const OUString &rIn, const OUString& rQuotedPairs, sal_Unicode cTok = ';' ); static OUString SC_DLLPUBLIC GetQuotedToken(const OUString &rIn, sal_Int32 nToken, const OUString& rQuotedPairs, diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index 21f3d380bdc4..bd7d8a42d1e6 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -64,7 +64,7 @@ private: ScStyleFamilyObj* GetObjectByType_Impl(sal_uInt16 Type) const; ScStyleFamilyObj* GetObjectByIndex_Impl(sal_uInt32 nIndex) const; - ScStyleFamilyObj* GetObjectByName_Impl(const rtl::OUString& aName) const; + ScStyleFamilyObj* GetObjectByName_Impl(const OUString& aName) const; public: ScStyleFamiliesObj(ScDocShell* pDocSh); @@ -80,13 +80,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -95,7 +95,7 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XStyleLoader - virtual void SAL_CALL loadStylesFromURL( const ::rtl::OUString& URL, + virtual void SAL_CALL loadStylesFromURL( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions ) throw(::com::sun::star::io::IOException, @@ -104,11 +104,11 @@ public: getStyleLoaderOptions() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -125,7 +125,7 @@ private: SfxStyleFamily eFamily; // Family ScStyleObj* GetObjectByIndex_Impl(sal_uInt32 nIndex); - ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); + ScStyleObj* GetObjectByName_Impl(const OUString& Name); public: ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam); @@ -134,19 +134,19 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + 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 ::rtl::OUString& Name ) + 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, + 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, @@ -154,13 +154,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + 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< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -178,25 +178,25 @@ 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 ) + 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 ::rtl::OUString& PropertyName ) + 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 ) + 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 ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + 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 ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + 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 ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + 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); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -218,8 +218,8 @@ private: OUString aStyleName; SfxStyleSheetBase* GetStyle_Impl(); - const SfxItemSet* GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); - void SetOnePropertyValue( const ::rtl::OUString& rPropertyName, + const SfxItemSet* GetStyleItemSet_Impl( const OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); + void SetOnePropertyValue( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -243,21 +243,21 @@ public: // XStyle virtual sal_Bool SAL_CALL isUserDefined() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isInUse() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) + virtual OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // 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, + 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, @@ -265,29 +265,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -295,39 +295,39 @@ public: ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + 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< ::rtl::OUString >& aPropertyNames ) + 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< ::rtl::OUString >& aPropertyNames, + 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, + 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 ) + 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 ) + OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + 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 ::rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -336,22 +336,22 @@ public: // getPropertyStates already defined for 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 ) + 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 ) + OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 316c7f24084d..10785cf7bfdd 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -90,19 +90,19 @@ private: ScColumn aCol[MAXCOLCOUNT]; - rtl::OUString aName; - rtl::OUString aCodeName; - rtl::OUString aComment; - - rtl::OUString aLinkDoc; - rtl::OUString aLinkFlt; - rtl::OUString aLinkOpt; - rtl::OUString aLinkTab; + OUString aName; + OUString aCodeName; + OUString aComment; + + OUString aLinkDoc; + OUString aLinkFlt; + OUString aLinkOpt; + OUString aLinkTab; sal_uLong nLinkRefreshDelay; sal_uInt8 nLinkMode; // page style template - rtl::OUString aPageStyle; + OUString aPageStyle; Size aPageSizeTwips; // size of the print-page SCCOL nRepeatStartX; // repeating rows/columns SCCOL nRepeatEndX; // REPEAT_NONE, if not used @@ -137,7 +137,7 @@ private: ScDocument* pDocument; utl::TextSearch* pSearchText; - mutable rtl::OUString aUpperName; // #i62977# filled only on demand, reset in SetName + mutable OUString aUpperName; // #i62977# filled only on demand, reset in SetName boost::scoped_ptr<ScAddress2DVec> mxUninitNotes; @@ -191,7 +191,7 @@ friend class ScAttrRectIterator; friend class ScColumnTextWidthIterator; public: - ScTable( ScDocument* pDoc, SCTAB nNewTab, const rtl::OUString& rNewName, + ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, bool bColInfo = true, bool bRowInfo = true ); ~ScTable(); @@ -236,8 +236,8 @@ public: bool IsScenario() const { return bScenario; } void SetScenario( bool bFlag ); - void GetScenarioComment( rtl::OUString& rComment) const { rComment = aComment; } - void SetScenarioComment( const rtl::OUString& rComment ) { aComment = rComment; } + void GetScenarioComment( OUString& rComment) const { rComment = aComment; } + void SetScenarioComment( const OUString& rComment ) { aComment = rComment; } const Color& GetScenarioColor() const { return aScenarioColor; } void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } const Color& GetTabBgColor() const; @@ -249,28 +249,28 @@ public: sal_uInt8 GetLinkMode() const { return nLinkMode; } bool IsLinked() const { return nLinkMode != SC_LINK_NONE; } - const rtl::OUString& GetLinkDoc() const { return aLinkDoc; } - const rtl::OUString& GetLinkFlt() const { return aLinkFlt; } - const rtl::OUString& GetLinkOpt() const { return aLinkOpt; } - const rtl::OUString& GetLinkTab() const { return aLinkTab; } + const OUString& GetLinkDoc() const { return aLinkDoc; } + const OUString& GetLinkFlt() const { return aLinkFlt; } + const OUString& GetLinkOpt() const { return aLinkOpt; } + const OUString& GetLinkTab() const { return aLinkTab; } sal_uLong GetLinkRefreshDelay() const { return nLinkRefreshDelay; } void SetLink( sal_uInt8 nMode, const String& rDoc, const String& rFlt, const String& rOpt, const String& rTab, sal_uLong nRefreshDelay ); - void GetName( rtl::OUString& rName ) const; - void SetName( const rtl::OUString& rNewName ); + void GetName( OUString& rName ) const; + void SetName( const OUString& rNewName ); void SetAnonymousDBData(ScDBData* pDBData); ScDBData* GetAnonymousDBData(); - void GetCodeName( rtl::OUString& rName ) const { rName = aCodeName; } - void SetCodeName( const rtl::OUString& rNewName ) { aCodeName = rNewName; } + void GetCodeName( OUString& rName ) const { rName = aCodeName; } + void SetCodeName( const OUString& rNewName ) { aCodeName = rNewName; } - const rtl::OUString& GetUpperName() const; + const OUString& GetUpperName() const; - const rtl::OUString& GetPageStyle() const { return aPageStyle; } - void SetPageStyle( const rtl::OUString& rName ); + const OUString& GetPageStyle() const { return aPageStyle; } + void SetPageStyle( const OUString& rName ); void PageStyleModified( const String& rNewName ); bool IsProtected() const; @@ -317,10 +317,10 @@ public: void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError); - void GetString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const; + void GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const; const OUString* GetStringCell( SCCOL nCol, SCROW nRow ) const; double* GetValueCell( SCCOL nCol, SCROW nRow ); - void GetInputString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const; + void GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const; double GetValue( const ScAddress& rPos ) const { return ValidColRow(rPos.Col(),rPos.Row()) ? @@ -330,7 +330,7 @@ public: double GetValue( SCCOL nCol, SCROW nRow ) const; const EditTextObject* GetEditText( SCCOL nCol, SCROW nRow ) const; void RemoveEditTextCharAttribs( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); - void GetFormula( SCCOL nCol, SCROW nRow, rtl::OUString& rFormula ) const; + void GetFormula( SCCOL nCol, SCROW nRow, OUString& rFormula ) const; const ScTokenArray* GetFormulaTokens( SCCOL nCol, SCROW nRow ) const; const ScFormulaCell* GetFormulaCell( SCCOL nCol, SCROW nRow ) const; ScFormulaCell* GetFormulaCell( SCCOL nCol, SCROW nRow ); @@ -508,7 +508,7 @@ public: void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // from sw bool SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc); void FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ); @@ -841,16 +841,16 @@ private: void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, ScAutoFormatData& rData); void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, sal_uInt16 nIndex, ScAutoFormatData& rData); bool SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc); bool Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc); bool SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc); bool Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc); bool ReplaceAll( const SvxSearchItem& rSearchItem, const ScMarkData& rMark, ScRangeList& rMatchedRanges, - rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + OUString& rUndoStr, ScDocument* pUndoDoc); bool SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark); @@ -864,13 +864,13 @@ private: bool SearchAndReplaceEmptyCells( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, ScRangeList& rMatchedRanges, - rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + OUString& rUndoStr, ScDocument* pUndoDoc); bool SearchRangeForEmptyCell(const ScRange& rRange, const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - rtl::OUString& rUndoStr); + OUString& rUndoStr); bool SearchRangeForAllEmptyCells( const ScRange& rRange, const SvxSearchItem& rSearchItem, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc); // use the global sort parameter: bool IsSorted(SCCOLROW nStart, SCCOLROW nEnd) const; @@ -888,7 +888,7 @@ private: bool CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); bool CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); - void GetUpperCellString(SCCOL nCol, SCROW nRow, rtl::OUString& rStr); + void GetUpperCellString(SCCOL nCol, SCROW nRow, OUString& rStr); bool RefVisible(ScFormulaCell* pCell); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index de4eb9df926c..068d87f550bc 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -33,9 +33,9 @@ class ScTableLink : public ::sfx2::SvBaseLink, public ScRefreshTimer { private: TableLink_Impl* pImpl; - rtl::OUString aFileName; - rtl::OUString aFilterName; - rtl::OUString aOptions; + OUString aFileName; + OUString aFilterName; + OUString aOptions; bool bInCreate:1; bool bInEdit:1; bool bAddUndo:1; @@ -60,9 +60,9 @@ public: void SetAddUndo(bool bSet) { bAddUndo = bSet; } void SetPaint(bool bSet) { bDoPaint = bSet; } - const rtl::OUString& GetFileName() const { return aFileName; } - const rtl::OUString& GetFilterName() const { return aFilterName; } - const rtl::OUString& GetOptions() const { return aOptions; } + const OUString& GetFileName() const { return aFileName; } + const OUString& GetFilterName() const { return aFilterName; } + const OUString& GetOptions() const { return aOptions; } sal_Bool IsUsed() const; @@ -85,18 +85,18 @@ private: bool bWithContent, bool bWithInteraction ); public: - ScDocumentLoader( const rtl::OUString& rFileName, - rtl::OUString& rFilterName, rtl::OUString& rOptions, + ScDocumentLoader( const OUString& rFileName, + OUString& rFilterName, OUString& rOptions, sal_uInt32 nRekCnt = 0, bool bWithInteraction = false ); ~ScDocumentLoader(); ScDocument* GetDocument(); ScDocShell* GetDocShell() { return pDocShell; } bool IsError() const; - rtl::OUString GetTitle() const; + OUString GetTitle() const; void ReleaseDocRef(); // without calling DoClose - static rtl::OUString GetOptions( SfxMedium& rMedium ); + static OUString GetOptions( SfxMedium& rMedium ); /** Returns the filter name and options from a file name. @param bWithContent @@ -104,11 +104,11 @@ public: false = Detects filter by file name extension only (should be used in filter code only). @return sal_True if a filter could be found, sal_False otherwise. */ - static bool GetFilterName( const ::rtl::OUString& rFileName, - ::rtl::OUString& rFilter, ::rtl::OUString& rOptions, + static bool GetFilterName( const OUString& rFileName, + OUString& rFilter, OUString& rOptions, bool bWithContent, bool bWithInteraction ); - static void RemoveAppPrefix( rtl::OUString& rFilterName ); + static void RemoveAppPrefix( OUString& rFilterName ); }; #endif diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index b8db018336eb..f95f3126853e 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -45,9 +45,9 @@ public: returns false. */ static bool needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED); - static ::rtl::OUString getHashURI(ScPasswordHash eHash); + static OUString getHashURI(ScPasswordHash eHash); - static ScPasswordHash getHashTypeFromURI(const ::rtl::OUString& rURI); + static ScPasswordHash getHashTypeFromURI(const OUString& rURI); private: ScPassHashHelper(); diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 4badca478d44..9ef1c9494a1e 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -83,21 +83,21 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) + 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< ::rtl::OUString> SAL_CALL getElementNames(void) 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::Sequence< OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -122,33 +122,33 @@ public: // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -158,9 +158,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -176,21 +176,21 @@ public: virtual ~ScLinkTargetsObj(); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) + 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< ::rtl::OUString> SAL_CALL getElementNames(void) 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::Sequence< OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index accd92f6dfd0..19f9effa4e0d 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -99,11 +99,11 @@ public: com::sun::star::sheet::XHeaderFooterContent> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -188,7 +188,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, - const ::rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, @@ -203,8 +203,8 @@ public: getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XTextRangeMover @@ -229,11 +229,11 @@ public: getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index aec822c207ab..75b503138c74 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -78,10 +78,10 @@ public: // XFormulaParser virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL parseFormula( - const ::rtl::OUString& aFormula, + const OUString& aFormula, const ::com::sun::star::table::CellAddress& rReferencePos ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< + virtual OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens, const ::com::sun::star::table::CellAddress& rReferencePos ) throw (::com::sun::star::uno::RuntimeException); @@ -90,7 +90,7 @@ public: 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, + 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, @@ -98,29 +98,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -128,11 +128,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index 15098451e125..d608441c0760 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -45,13 +45,13 @@ public: Header = 4 }; - ScTypedStrData( const rtl::OUString& rStr, double nVal = 0.0, + ScTypedStrData( const OUString& rStr, double nVal = 0.0, StringType eType = Standard ); ScTypedStrData( const ScTypedStrData& rCpy ); bool IsStrData() const; - SC_DLLPUBLIC const rtl::OUString& GetString() const; + SC_DLLPUBLIC const OUString& GetString() const; StringType GetStringType() const; struct LessCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool> @@ -78,7 +78,7 @@ public: bool operator< (const ScTypedStrData& r) const; private: - rtl::OUString maStrValue; + OUString maStrValue; double mfValue; StringType meStrType; }; diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx index 4f962dd66594..c04c0f93dd88 100644 --- a/sc/inc/undorangename.hxx +++ b/sc/inc/undorangename.hxx @@ -42,8 +42,8 @@ class ScUndoAllRangeNames : public ScSimpleUndo { public: ScUndoAllRangeNames(ScDocShell* pDocSh, - const std::map<rtl::OUString, ScRangeName*>& rOldNames, - const boost::ptr_map<rtl::OUString, ScRangeName>& rNewNames); + const std::map<OUString, ScRangeName*>& rOldNames, + const boost::ptr_map<OUString, ScRangeName>& rNewNames); virtual ~ScUndoAllRangeNames(); @@ -51,14 +51,14 @@ public: virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: - void DoChange(const boost::ptr_map<rtl::OUString, ScRangeName>& rNames); + void DoChange(const boost::ptr_map<OUString, ScRangeName>& rNames); private: - boost::ptr_map<rtl::OUString, ScRangeName> maOldNames; - boost::ptr_map<rtl::OUString, ScRangeName> maNewNames; + boost::ptr_map<OUString, ScRangeName> maOldNames; + boost::ptr_map<OUString, ScRangeName> maNewNames; }; class ScUndoAddRangeData : public ScSimpleUndo @@ -73,7 +73,7 @@ public: virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRangeData* mpRangeData; diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index 6409f32eb292..56394cb82dbc 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -25,28 +25,28 @@ class ScUnitConverterData { - rtl::OUString maIndexString; + OUString maIndexString; double mfValue; // not implemented ScUnitConverterData& operator=( const ScUnitConverterData& ); public: - ScUnitConverterData( const rtl::OUString& rFromUnit, - const rtl::OUString& rToUnit, double fValue = 1.0 ); + ScUnitConverterData( const OUString& rFromUnit, + const OUString& rToUnit, double fValue = 1.0 ); ScUnitConverterData( const ScUnitConverterData& ); ~ScUnitConverterData(); double GetValue() const; - const rtl::OUString& GetIndexString() const; + const OUString& GetIndexString() const; - static rtl::OUString BuildIndexString( - const rtl::OUString& rFromUnit, const rtl::OUString& rToUnit ); + static OUString BuildIndexString( + const OUString& rFromUnit, const OUString& rToUnit ); }; class ScUnitConverter : public boost::noncopyable { - typedef boost::ptr_map<rtl::OUString, ScUnitConverterData> MapType; + typedef boost::ptr_map<OUString, ScUnitConverterData> MapType; MapType maData; public: @@ -54,7 +54,7 @@ public: ~ScUnitConverter(); bool GetValue( - double& fValue, const rtl::OUString& rFromUnit, const rtl::OUString& rToUnit ) const; + double& fValue, const OUString& rFromUnit, const OUString& rToUnit ) const; }; diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index 537e3ae99d17..a13759f55a3d 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -94,15 +94,15 @@ public: virtual SdrObjUserData* Clone( SdrObject* pObj ) const; - void SetMacro( const rtl::OUString& rMacro ) { maMacro = rMacro; } - const rtl::OUString& GetMacro() const { return maMacro; } + void SetMacro( const OUString& rMacro ) { maMacro = rMacro; } + const OUString& GetMacro() const { return maMacro; } - void SetHlink( const rtl::OUString& rHlink ) { maHlink = rHlink; } - const rtl::OUString& GetHlink() const { return maHlink; } + void SetHlink( const OUString& rHlink ) { maHlink = rHlink; } + const OUString& GetHlink() const { return maHlink; } private: - rtl::OUString maMacro; - rtl::OUString maHlink; + OUString maMacro; + OUString maHlink; }; //------------------------------------------------------------------------- diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index bc883e2afcd1..0adb00519047 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -33,29 +33,29 @@ class SC_DLLPUBLIC ScUserListData public: struct SubStr { - ::rtl::OUString maReal; - ::rtl::OUString maUpper; - SubStr(const ::rtl::OUString& rReal, const ::rtl::OUString& rUpper); + OUString maReal; + OUString maUpper; + SubStr(const OUString& rReal, const OUString& rUpper); }; private: typedef ::boost::ptr_vector<SubStr> SubStringsType; SubStringsType maSubStrings; - ::rtl::OUString aStr; + OUString aStr; SC_DLLPRIVATE void InitTokens(); public: - ScUserListData(const ::rtl::OUString& rStr); + ScUserListData(const OUString& rStr); ScUserListData(const ScUserListData& rData); ~ScUserListData(); - const ::rtl::OUString& GetString() const { return aStr; } - void SetString(const ::rtl::OUString& rStr); + const OUString& GetString() const { return aStr; } + void SetString(const OUString& rStr); size_t GetSubCount() const; - bool GetSubIndex(const ::rtl::OUString& rSubStr, sal_uInt16& rIndex) const; - ::rtl::OUString GetSubStr(sal_uInt16 nIndex) const; - StringCompare Compare(const ::rtl::OUString& rSubStr1, const ::rtl::OUString& rSubStr2) const; - StringCompare ICompare(const ::rtl::OUString& rSubStr1, const ::rtl::OUString& rSubStr2) const; + bool GetSubIndex(const OUString& rSubStr, sal_uInt16& rIndex) const; + OUString GetSubStr(sal_uInt16 nIndex) const; + StringCompare Compare(const OUString& rSubStr1, const OUString& rSubStr2) const; + StringCompare ICompare(const OUString& rSubStr1, const OUString& rSubStr2) const; }; /** @@ -72,9 +72,9 @@ public: ScUserList(); ScUserList(const ScUserList& r); - const ScUserListData* GetData( const ::rtl::OUString& rSubStr ) const; + const ScUserListData* GetData( const OUString& rSubStr ) const; /// If the list in rStr is already inserted - bool HasEntry( const ::rtl::OUString& rStr ) const; + bool HasEntry( const OUString& rStr ) const; const ScUserListData* operator[](size_t nIndex) const; ScUserListData* operator[](size_t nIndex); diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 07e8c04a35fc..10af8e7d7d35 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -143,9 +143,9 @@ class ScViewCfg : public ScViewOptions DECL_LINK( DisplayCommitHdl, void* ); DECL_LINK( GridCommitHdl, void* ); - com::sun::star::uno::Sequence<rtl::OUString> GetLayoutPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetDisplayPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetGridPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetDisplayPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetGridPropertyNames(); public: ScViewCfg(); diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 64119793ee77..1b70ef098738 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -110,11 +110,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider @@ -249,7 +249,7 @@ public: 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, + 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, @@ -257,29 +257,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + 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, + 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 ::rtl::OUString& aPropertyName, + 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 ::rtl::OUString& PropertyName, + 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 ::rtl::OUString& PropertyName, + 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, @@ -360,11 +360,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index b4b505cb3bbb..5a94c52701ca 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -54,7 +54,7 @@ class ScXMLImportWrapper com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xModel, com::sun::star::uno::Reference<com::sun::star::xml::sax::XParser>& xParser, com::sun::star::xml::sax::InputSource& aParserInput, - const rtl::OUString& sComponentName, const rtl::OUString& sDocName, const rtl::OUString& sOldDocName, + const OUString& sComponentName, const OUString& sDocName, const OUString& sOldDocName, com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArgs, sal_Bool bMustBeSuccessfull); @@ -62,7 +62,7 @@ class ScXMLImportWrapper com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xModel, com::sun::star::uno::Reference<com::sun::star::xml::sax::XWriter>& xWriter, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aDescriptor, - const rtl::OUString& sName, const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, + const OUString& sName, const OUString& sMediaType, const OUString& sComponentName, com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArgs, ScMySharedData*& pSharedData); |