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 | |
| 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')
913 files changed, 9418 insertions, 9701 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); diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 5190e48ec484..d78809ea4b42 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -77,14 +77,14 @@ private: void ScMacrosTest::testStarBasic() { const OUString aFileNameBase("StarBasic.ods"); - rtl::OUString aFileName; + OUString aFileName; createFileURL(aFileNameBase, aFileName); std::cout << "StarBasic test" << std::endl; uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); - rtl::OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); + OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); String sUrl = aURL; Any aRet; Sequence< sal_Int16 > aOutParamIndex; @@ -109,97 +109,97 @@ void ScMacrosTest::testVba() { TestMacroInfo testInfo[] = { { - rtl::OUString("TestAddress."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestAddress."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("vba."), - rtl::OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"), + OUString("vba."), + OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"), }, { - rtl::OUString("MiscRangeTests."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("MiscRangeTests."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("bytearraystring."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document") + OUString("bytearraystring."), + OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document") }, { - rtl::OUString("AutoFilter."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("AutoFilter."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("CalcFont."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("CalcFont."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("TestIntersection."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestIntersection."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("TestUnion."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestUnion."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("range-4."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("range-4."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("Ranges-3."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Ranges-3."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("TestCalc_Rangetest."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestCalc_Rangetest."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("TestCalc_Rangetest2."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestCalc_Rangetest2."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #if defined FIXRANGEADDRESSING //ScVbaRange::getRangeForName()/getScRangeListForAddress() seems to get confused //about the addressing mode of the document vs the addressing mode of a named //range ( need to fix that ) { - rtl::OUString("Ranges-2."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Ranges-2."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #endif { - rtl::OUString("pagesetup."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("pagesetup."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("Window."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Window."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("window2."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("window2."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("PageBreaks."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("PageBreaks."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("Shapes."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Shapes."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #if defined VBA_TEST_WORKING { - rtl::OUString("Ranges."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Ranges."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #endif }; for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( testInfo ); ++i ) { - rtl::OUString aFileName; + OUString aFileName; createFileURL(testInfo[i].sFileBaseName + "xls", aFileName); uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); - rtl::OUString sMsg( "Failed to load " + aFileName ); - CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); + OUString sMsg( "Failed to load " + aFileName ); + CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); String sUrl = testInfo[i].sMacroUrl; Any aRet; @@ -210,12 +210,12 @@ void ScMacrosTest::testVba() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); - std::cout << "about to invoke vba test in " << rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cout << "about to invoke vba test in " << OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); - rtl::OUString aStringRes; + OUString aStringRes; aRet >>= aStringRes; - std::cout << "value of Ret " << rtl::OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cout << "value of Ret " << OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; CPPUNIT_ASSERT_MESSAGE( "script reported failure",aStringRes == "OK" ); pFoundShell->DoClose(); } diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index 771f7e33296b..1114840479a9 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -65,14 +65,14 @@ using namespace ::com::sun::star::uno; namespace { -bool checkDumpAgainstFile( const rtl::OUString& rDump, const rtl::OUString aFilePath, const rtl::OUString& rToleranceFile) +bool checkDumpAgainstFile( const OUString& rDump, const OUString aFilePath, const OUString& rToleranceFile) { - rtl::OString aOFile = rtl::OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8); - rtl::OString aToleranceFile = rtl::OUStringToOString(rToleranceFile, RTL_TEXTENCODING_UTF8); + OString aOFile = OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8); + OString aToleranceFile = OUStringToOString(rToleranceFile, RTL_TEXTENCODING_UTF8); CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.isEmpty()); - rtl::OString aDump = rtl::OUStringToOString(rDump, RTL_TEXTENCODING_UTF8); + OString aDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8); return doXMLDiff(aOFile.getStr(), aDump.getStr(), static_cast<int>(rDump.getLength()), aToleranceFile.getStr()); } @@ -84,7 +84,7 @@ class ScChartRegressionTest : public test::BootstrapFixture, public unotest::Mac public: ScChartRegressionTest(); - void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -97,14 +97,14 @@ public: private: uno::Reference<uno::XInterface> m_xCalcComponent; - rtl::OUString m_aBaseString; + OUString m_aBaseString; }; -void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) +void ScChartRegressionTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - rtl::OUString aSep("/"); - rtl::OUStringBuffer aBuffer( getSrcRootURL() ); + OUString aSep("/"); + OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); rFilePath = aBuffer.makeStringAndClear(); @@ -112,7 +112,7 @@ void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const void ScChartRegressionTest::test() { - rtl::OUString aFileName; + OUString aFileName; createFileURL( "testChart.", "ods", aFileName); uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); @@ -146,7 +146,7 @@ void ScChartRegressionTest::test() uno::Reference< qa::XDumper > xDumper( xChartDoc, UNO_QUERY_THROW ); CPPUNIT_ASSERT(xDumper.is()); - rtl::OUString aDump = xDumper->dump(); + OUString aDump = xDumper->dump(); std::cout << aDump; bool bCompare = checkDumpAgainstFile( aDump, getPathFromSrc("/chart2/qa/unit/data/reference/testChart.xml"), getPathFromSrc("/chart2/qa/unit/data/tolerance.xml") ); CPPUNIT_ASSERT(bCompare); @@ -164,7 +164,7 @@ void ScChartRegressionTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); } diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index d5971c0033a2..0f9134ffb6e1 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -97,8 +97,8 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init() { // get the test file - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScAnnotationObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index 62d662672352..9e137ceb6b8e 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -86,8 +86,8 @@ uno::Reference< sheet::XSheetAnnotations> ScAnnontationsObj::getAnnotations() uno::Reference< uno::XInterface > ScAnnontationsObj::init() { // get the test file - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScAnnotationObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index a3e925a17f12..8eb1727d0b4c 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -80,17 +80,17 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent; ScCellRangeObj::ScCellRangeObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(rtl::OUString("15"), 1), - apitest::XReplaceable(rtl::OUString("15"), rtl::OUString("35")) + apitest::XSearchable(OUString("15"), 1), + apitest::XReplaceable(OUString("15"), OUString("35")) { } uno::Reference< uno::XInterface > ScCellRangeObj::init() { - rtl::OUString aFileURL; - const rtl::OUString aFileBase("xcellrangesquery.ods"); + OUString aFileURL; + const OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); - std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW); @@ -107,10 +107,10 @@ uno::Reference< uno::XInterface > ScCellRangeObj::init() uno::Reference< uno::XInterface > ScCellRangeObj::getXCellRangeData() { - rtl::OUString aFileURL; - const rtl::OUString aFileBase("xcellrangesquery.ods"); + OUString aFileURL; + const OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); - std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index a54716720883..b769f78a2499 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -45,7 +45,7 @@ public: virtual void setUp(); virtual void tearDown(); - virtual uno::Reference< uno::XInterface > init( const rtl::OUString& rDBName ); + virtual uno::Reference< uno::XInterface > init( const OUString& rDBName ); ScDatabaseRangeObj(); @@ -70,9 +70,9 @@ ScDatabaseRangeObj::ScDatabaseRangeObj() { } -uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& rDBName ) +uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString& rDBName ) { - rtl::OUString aFileURL; + OUString aFileURL; createFileURL("ScDatabaseRangeObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); @@ -80,7 +80,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString("DatabaseRanges")), UNO_QUERY_THROW); + uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(OUString("DatabaseRanges")), UNO_QUERY_THROW); uno::Reference< sheet::XDatabaseRange > xDBRange( xNameAccess->getByName(rDBName), UNO_QUERY_THROW); CPPUNIT_ASSERT(xDBRange.is()); return xDBRange; diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index c52952eeff4f..05b2cec35ef9 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -75,8 +75,8 @@ ScDataPilotFieldObj::ScDataPilotFieldObj() uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("scdatapilotfieldobj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("scdatapilotfieldobj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -90,9 +90,9 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() CPPUNIT_ASSERT(xDPTS.is()); uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Sequence<rtl::OUString> aElementNames = xDPT->getElementNames(); + uno::Sequence<OUString> aElementNames = xDPT->getElementNames(); - uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString("DataPilot1")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(OUString("DataPilot1")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPDsc.is()); uno::Reference< container::XIndexAccess > xIA( xDPDsc->getDataPilotFields(), UNO_QUERY_THROW); uno::Reference< uno::XInterface > xReturnValue( xIA->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 05a7572d411c..05150db20b3f 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -84,13 +84,13 @@ uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent; ScDataPilotTableObj::ScDataPilotTableObj() : UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNamed(rtl::OUString("DataPilotTable")) + apitest::XNamed(OUString("DataPilotTable")) { } uno::Reference< uno::XInterface > ScDataPilotTableObj::init() { - rtl::OUString aFileURL; + OUString aFileURL; createFileURL("ScDataPilotTableObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); @@ -112,7 +112,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(OUString("DataPilotTable")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; @@ -127,8 +127,8 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::getSheets() uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScDataPilotTableObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScDataPilotTableObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -149,7 +149,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable2")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(OUString("DataPilotTable2")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx index 78d0ac1e46da..5f08e06630e6 100644 --- a/sc/qa/extras/sceditfieldobj-cell.cxx +++ b/sc/qa/extras/sceditfieldobj-cell.cxx @@ -115,8 +115,8 @@ uno::Reference<text::XTextField> getNewField(const uno::Reference<lang::XMultiSe uno::Reference<text::XTextField> xField( xSM->createInstance("com.sun.star.text.TextField.URL"), UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropSet(xField, UNO_QUERY_THROW); - xPropSet->setPropertyValue("Representation", uno::makeAny(rtl::OUString("LibreOffice"))); - xPropSet->setPropertyValue("URL", uno::makeAny(rtl::OUString("http://www.libreoffice.org/"))); + xPropSet->setPropertyValue("Representation", uno::makeAny(OUString("LibreOffice"))); + xPropSet->setPropertyValue("URL", uno::makeAny(OUString("http://www.libreoffice.org/"))); return xField; } diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index 13384e83bd39..3b8faf493996 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -43,8 +43,8 @@ uno::Reference< lang::XComponent > ScModelObj::mxComponent; uno::Reference< uno::XInterface > ScModelObj::init() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScModelObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScModelObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 892db8e1ec64..466e91368255 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -49,7 +49,7 @@ public: virtual void tearDown(); virtual uno::Reference< uno::XInterface > init(); - virtual uno::Reference< sheet::XNamedRange > getNamedRange(const rtl::OUString& rRangeName); + virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName); CPPUNIT_TEST_SUITE(ScNamedRangeObj); CPPUNIT_TEST(testGetContent); @@ -74,28 +74,28 @@ uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent; ScNamedRangeObj::ScNamedRangeObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNamed(rtl::OUString("NamedRange")), + apitest::XNamed(OUString("NamedRange")), apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7)) { } uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScNamedRangeObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString("NamedRanges"); + OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamedRanges.is()); return xNamedRanges; } -uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OUString& rRangeName) +uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const OUString& rRangeName) { uno::Reference< container::XNameAccess > xNamedAccess(init_impl(), UNO_QUERY_THROW); uno::Reference< sheet::XNamedRange > xNamedRange(xNamedAccess->getByName(rRangeName), UNO_QUERY_THROW); @@ -106,7 +106,7 @@ uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OU uno::Reference< uno::XInterface > ScNamedRangeObj::init() { - return getNamedRange(rtl::OUString("NamedRange")); + return getNamedRange(OUString("NamedRange")); } void ScNamedRangeObj::setUp() diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index 05424366c59d..3852a77cfe2a 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -69,14 +69,14 @@ ScNamedRangesObj::ScNamedRangesObj() uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScNamedRangeObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString("NamedRanges"); + OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); //set value from xnamedranges.hxx diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index 4e7f1540c528..b9c80f535ac1 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -72,8 +72,8 @@ ScOutlineObj::ScOutlineObj() uno::Reference< uno::XInterface > ScOutlineObj::init() { // get the test file - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScOutlineObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScOutlineObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index f41d2ac3d83e..3a8164f31f67 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -65,16 +65,16 @@ uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent; ScTableSheetObj::ScTableSheetObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(rtl::OUString("test"), 4), - apitest::XReplaceable(rtl::OUString("searchReplaceString"), rtl::OUString("replaceReplaceString")) + apitest::XSearchable(OUString("test"), 4), + apitest::XReplaceable(OUString("searchReplaceString"), OUString("replaceReplaceString")) { } uno::Reference< uno::XInterface > ScTableSheetObj::init() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScTableSheetObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScTableSheetObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index cfc771c7b0a9..4b88077eb05b 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -62,8 +62,8 @@ public: CPPUNIT_TEST_SUITE_END(); virtual uno::Reference< lang::XComponent > getComponent(); - virtual void createFileURL(const rtl::OUString& rFileBase, rtl::OUString& rFileURL); - virtual uno::Reference< lang::XComponent > loadFromDesktop(const rtl::OUString& rString); + virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL); + virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString); virtual uno::Reference< uno::XInterface > init(); protected: static uno::Reference< lang::XComponent > mxComponent; @@ -75,7 +75,7 @@ sal_Int32 ScTableSheetsObj::nTest = 0; ScTableSheetsObj::ScTableSheetsObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNameContainer(rtl::OUString("Sheet2")) + apitest::XNameContainer(OUString("Sheet2")) { } @@ -85,20 +85,20 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::getComponent() return mxComponent; } -void ScTableSheetsObj::createFileURL(const rtl::OUString& rFileBase, rtl::OUString& rFileURL) +void ScTableSheetsObj::createFileURL(const OUString& rFileBase, OUString& rFileURL) { UnoApiTest::createFileURL(rFileBase, rFileURL); } -uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const rtl::OUString& rString) +uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const OUString& rString) { return UnoApiTest::loadFromDesktop(rString); } uno::Reference< uno::XInterface > ScTableSheetsObj::init() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("rangenamessrc.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("rangenamessrc.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx index 41589f18310d..35d9139b6bfe 100644 --- a/sc/qa/unit/helper/csv_handler.hxx +++ b/sc/qa/unit/helper/csv_handler.hxx @@ -40,9 +40,9 @@ namespace { -rtl::OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) +OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) { - rtl::OUString aString; + OUString aString; Color* pColor; ScRefCellValue aCell; aCell.assign(*pDoc, ScAddress(nCol, nRow, nTab)); @@ -57,9 +57,9 @@ rtl::OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRo return aString; } -rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab) +OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab) { - rtl::OStringBuffer aString("Error in Table: "); + OStringBuffer aString("Error in Table: "); aString.append(static_cast<sal_Int32>(nTab)); aString.append(" Column: "); aString.append(static_cast<sal_Int32>(nCol)); @@ -68,20 +68,20 @@ rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab) return aString.makeStringAndClear(); } -rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const rtl::OUString& rExpectedString, const rtl::OUString& rString) +OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rExpectedString, const OUString& rString) { - rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab)); + OStringBuffer aString(createErrorMessage(nCol, nRow, nTab)); aString.append("; Expected: '"); - aString.append(rtl::OUStringToOString(rExpectedString, RTL_TEXTENCODING_UTF8)); + aString.append(OUStringToOString(rExpectedString, RTL_TEXTENCODING_UTF8)); aString.append("' Found: '"); - aString.append(rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); + aString.append(OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); aString.append("'"); return aString.makeStringAndClear(); } -rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue) +OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue) { - rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab)); + OStringBuffer aString(createErrorMessage(nCol, nRow, nTab)); aString.append("; Expected: '"); aString.append(aExpected); aString.append("' Found: '"); @@ -133,12 +133,12 @@ public: } else if (meStringType == PureString) { - rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); - rtl::OUString aString = mpDoc->GetString(mnCol, mnRow, mnTab); + OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); + OUString aString = mpDoc->GetString(mnCol, mnRow, mnTab); #if DEBUG_CSV_HANDLER - std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; std::cout << "result: " << (int)(aCSVString == aString) << std::endl; #endif //DEBUG_CSV_HANDLER @@ -151,7 +151,7 @@ public: double nValue = strtod(&aStr[0], &pRemainingChars); if (*pRemainingChars) { - rtl::OUString aString; + OUString aString; switch (meStringType) { case StringValue: @@ -163,10 +163,10 @@ public: default: break; } - rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); + OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); #if DEBUG_CSV_HANDLER - std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; std::cout << "result: " << (int)(aCSVString == aString) << std::endl; #endif //DEBUG_CSV_HANDLER @@ -222,11 +222,11 @@ public: #if DEBUG_CSV_HANDLER std::cout << "Col: " << mnCol << " Row: " << mnRow << std::endl; #endif //DEBUG_CSV_HANDLER - rtl::OUString aString = getConditionalFormatString(mpDoc, mnCol, mnRow, mnTab); - rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); + OUString aString = getConditionalFormatString(mpDoc, mnCol, mnRow, mnTab); + OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); #if DEBUG_CSV_HANDLER - std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; std::cout << "result: " << (int)(aCSVString == aString) << std::endl; #endif //DEBUG_CSV_HANDLER CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, aCSVString, aString).getStr(), aString == aCSVString ); diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx index 4de5c9d72599..e54cc43bc8c1 100644 --- a/sc/qa/unit/helper/debughelper.hxx +++ b/sc/qa/unit/helper/debughelper.hxx @@ -52,8 +52,6 @@ #include <iostream> using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::cout; using ::std::cerr; using ::std::endl; diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index b610f5883144..9558691aba86 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -154,7 +154,7 @@ protected: SfxItemSet* pSet = pSrcMed->GetItemSet(); pSet->Put(SfxStringItem(SID_PASSWORD, *pPassword)); } - printf("about to load %s\n", rtl::OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("about to load %s\n", OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); if (!xDocShRef->DoLoad(pSrcMed)) { xDocShRef->DoClose(); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 6416340fdc15..2acc0f4d055f 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -785,7 +785,7 @@ void testFuncNUMBERVALUE( ScDocument* pDoc ) SCROW nRows = SAL_N_ELEMENTS(aData); for (SCROW i = 0; i < nRows; ++i) - pDoc->SetString(0, i, 0, rtl::OUString::createFromAscii(aData[i])); + pDoc->SetString(0, i, 0, OUString::createFromAscii(aData[i])); printRange(pDoc, ScRange(0, 0, 0, 0, nRows - 1, 0), "data range for NUMBERVALUE"); @@ -807,14 +807,14 @@ void testFuncNUMBERVALUE( ScDocument* pDoc ) for (SCROW i = 0; i < nRows; ++i) { SCROW nRow = 20 + i; - pDoc->SetString(0, nRow, 0, rtl::OUString::createFromAscii(aChecks[i].pFormula)); + pDoc->SetString(0, nRow, 0, OUString::createFromAscii(aChecks[i].pFormula)); } pDoc->CalcAll(); for (SCROW i = 0; i < nRows; ++i) { SCROW nRow = 20 + i; - rtl::OUString aResult = pDoc->GetString(0, nRow, 0); + OUString aResult = pDoc->GetString(0, nRow, 0); CPPUNIT_ASSERT_EQUAL_MESSAGE( aChecks[i].pFormula, OUString::createFromAscii( aChecks[i].pResult), aResult); } diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index d52bcc69a258..fbb74439c89c 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -97,7 +97,7 @@ void ScAttrArray::TestData() const if (nErr) { - rtl::OStringBuffer aMsg; + OStringBuffer aMsg; aMsg.append(static_cast<sal_Int32>(nErr)); aMsg.append(RTL_CONSTASCII_STRINGPARAM( " errors in attribute array, column ")); diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index ef9b490d946b..363c609fdd83 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -127,7 +127,7 @@ ScMergeAttr::~ScMergeAttr() String ScMergeAttr::GetValueText() const { - rtl::OUStringBuffer aString; + OUStringBuffer aString; aString.append('('); aString.append(static_cast<sal_Int32>(nColMerge)); aString.append(','); @@ -716,7 +716,7 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ ) String ScPageHFItem::GetValueText() const { - return rtl::OUString("ScPageHFItem"); + return OUString("ScPageHFItem"); } //------------------------------------------------------------------------ @@ -1067,7 +1067,7 @@ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) String ScDoubleItem::GetValueText() const { - return rtl::OUString("ScDoubleItem"); + return OUString("ScDoubleItem"); } //------------------------------------------------------------------------ diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 3862e8864a5e..0bde4bf2080b 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -183,9 +183,9 @@ bool ScBaseCell::HasStringData() const } } -rtl::OUString ScBaseCell::GetStringData() const +OUString ScBaseCell::GetStringData() const { - rtl::OUString aStr; + OUString aStr; switch ( eCellType ) { case CELLTYPE_STRING: @@ -231,7 +231,7 @@ ScValueCell::~ScValueCell() // ============================================================================ -ScStringCell::ScStringCell( const rtl::OUString& rString ) : +ScStringCell::ScStringCell( const OUString& rString ) : ScBaseCell( CELLTYPE_STRING ), maString( rString.intern() ) { diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 9d8b1b9de07d..8345e488f980 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -109,10 +109,10 @@ OUString ScEditCell::GetString() const // Also Text from URL fields, Doc-Engine is a ScFieldEditEngine EditEngine& rEngine = mpDoc->GetEditEngine(); rEngine.SetText(*mpData); - rtl::OUString sRet = ScEditUtil::GetMultilineString(rEngine); // string with line separators between paragraphs + OUString sRet = ScEditUtil::GetMultilineString(rEngine); // string with line separators between paragraphs // cache short strings for formulas if ( sRet.getLength() < 256 ) - mpString = new rtl::OUString(sRet); //! non-const + mpString = new OUString(sRet); //! non-const return sRet; } diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index c9aa3cbc86ae..d97e6694d023 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -82,7 +82,7 @@ ScColorScaleEntry::~ScColorScaleEntry() mpCell->EndListeningTo(mpCell->GetDocument()); } -void ScColorScaleEntry::SetFormula( const rtl::OUString& rFormula, ScDocument* pDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar ) +void ScColorScaleEntry::SetFormula( const OUString& rFormula, ScDocument* pDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar ) { mpCell.reset(new ScFormulaCell( pDoc, rAddr, rFormula, eGrammar )); mpCell->StartListeningTo( pDoc ); @@ -98,9 +98,9 @@ const ScTokenArray* ScColorScaleEntry::GetFormula() const return NULL; } -rtl::OUString ScColorScaleEntry::GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const +OUString ScColorScaleEntry::GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const { - rtl::OUString aFormula; + OUString aFormula; if(mpCell) { mpCell->GetFormula(aFormula, eGrammar); diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 0aa3b175f47e..90b0927d78ec 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1514,7 +1514,7 @@ void ScColumn::CopyToColumn( // empty cell. if (pNew->GetCellType() == CELLTYPE_STRING) { - rtl::OUString aStr = static_cast<ScStringCell*>(pNew)->GetString(); + OUString aStr = static_cast<ScStringCell*>(pNew)->GetString(); if (aStr.isEmpty()) // A string cell with empty string. Delete the cell itself. rColumn.Delete(maItems[i].nRow); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 47013b74c086..946676ad5e9a 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -244,7 +244,7 @@ long ScColumn::GetNeededSize( if (!bEditEngine) // direct output { Color* pColor; - rtl::OUString aValStr; + OUString aValStr; ScCellFormat::GetString( aCell, nFormat, aValStr, &pColor, *pFormatter, true, rOptions.bFormula, ftCheck); @@ -561,7 +561,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth( // Try to find the row that has the longest string, and measure the width of that string. SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter ); - rtl::OUString aLongStr; + OUString aLongStr; Color* pColor; if (pParam->mnMaxTextRow >= 0) { diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 06472a4accb9..e66f74deecbe 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -54,8 +54,6 @@ #include <cstdio> using ::com::sun::star::i18n::LocaleDataItem; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // Err527 Workaroand extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx @@ -852,10 +850,10 @@ ScBaseCell* ScColumn::CloneCell( if ( bCloneSpecialBoolean ) { ScFormulaCell& rForm = (ScFormulaCell&)rSource; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // FIXME: do we have a localisation issue here? rForm.GetFormula( aBuf ); - rtl::OUString aVal( aBuf.makeStringAndClear() ); + OUString aVal( aBuf.makeStringAndClear() ); if ( aVal == "=TRUE()" || aVal == "=FALSE()" ) bForceFormula = true; } @@ -1526,7 +1524,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, std::vector<ScTy { bool bHasDates = false; SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); - rtl::OUString aString; + OUString aString; SCSIZE nIndex; Search( nStartRow, nIndex ); @@ -1753,7 +1751,7 @@ void ScColumn::SetValue( SCROW nRow, const double& rVal) } -void ScColumn::GetString( SCROW nRow, rtl::OUString& rString ) const +void ScColumn::GetString( SCROW nRow, OUString& rString ) const { SCSIZE nIndex; Color* pColor; @@ -1799,7 +1797,7 @@ double* ScColumn::GetValueCell( SCROW nRow ) return static_cast<ScValueCell*>(pCell)->GetValuePtr(); } -void ScColumn::GetInputString( SCROW nRow, rtl::OUString& rString ) const +void ScColumn::GetInputString( SCROW nRow, OUString& rString ) const { SCSIZE nIndex; if (Search(nRow, nIndex)) @@ -1812,10 +1810,10 @@ void ScColumn::GetInputString( SCROW nRow, rtl::OUString& rString ) const ScCellFormat::GetInputString(aCell, nFormat, rString, *(pDocument->GetFormatTable())); } else - rString = rtl::OUString(); + rString = OUString(); } else - rString = rtl::OUString(); + rString = OUString(); } @@ -1873,7 +1871,7 @@ void ScColumn::RemoveEditTextCharAttribs( SCROW nRow, const ScPatternAttr& rAttr pEditCell->RemoveCharAttribs(rAttr); } -void ScColumn::GetFormula( SCROW nRow, rtl::OUString& rFormula ) const +void ScColumn::GetFormula( SCROW nRow, OUString& rFormula ) const { SCSIZE nIndex; if (Search(nRow, nIndex)) @@ -1882,10 +1880,10 @@ void ScColumn::GetFormula( SCROW nRow, rtl::OUString& rFormula ) const if (pCell->GetCellType() == CELLTYPE_FORMULA) ((ScFormulaCell*)pCell)->GetFormula( rFormula ); else - rFormula = rtl::OUString(); + rFormula = OUString(); } else - rFormula = rtl::OUString(); + rFormula = OUString(); } const ScTokenArray* ScColumn::GetFormulaTokens( SCROW nRow ) const @@ -1976,8 +1974,8 @@ sal_Int32 ScColumn::GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCh sal_Int32 nStringLen = 0; if ( !maItems.empty() ) { - rtl::OUString aString; - rtl::OString aOString; + OUString aString; + OString aOString; bool bIsOctetTextEncoding = rtl_isOctetTextEncoding( eCharSet); SvNumberFormatter* pNumFmt = pDocument->GetFormatTable(); SCSIZE nIndex; @@ -2030,7 +2028,7 @@ xub_StrLen ScColumn::GetMaxNumberStringLen( if ( !maItems.empty() ) { - rtl::OUString aString; + OUString aString; SvNumberFormatter* pNumFmt = pDocument->GetFormatTable(); SCSIZE nIndex; SCROW nRow; @@ -2202,7 +2200,7 @@ void ScColumn::RebuildFormulaGroups() #if OSL_DEBUG_LEVEL > 0 if ( maDoubles.size() + maFnGroups.size() > 0 ) { - rtl::OUString aStr; + OUString aStr; fprintf( stderr, "column %2d has %2d double span(s): ", (int)nCol, (int)maDoubles.size() ); for (std::vector< ColDoubleEntry *>::iterator it = maDoubles.begin(); it != maDoubles.end(); ++it ) diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index be84d583af81..f898cfef0906 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -210,8 +210,8 @@ ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntr } ScConditionEntry::ScConditionEntry( ScConditionMode eOper, - const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, + const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : ScFormatEntry(pDocument), eOp(eOper), @@ -322,8 +322,8 @@ ScConditionEntry::~ScConditionEntry() delete pFormula2; } -void ScConditionEntry::Compile( const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, +void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2, bool bTextToReal ) { if ( !rExpr1.isEmpty() || !rExpr2.isEmpty() ) @@ -455,7 +455,7 @@ void ScConditionEntry::CompileXML() if ( aNew.Parse( aSrcString, mpDoc ) & SCA_VALID ) aSrcPos = aNew; // if the position is invalid, there isn't much we can do at this time - aSrcString = rtl::OUString(); + aSrcString = OUString(); } // Convert the text tokens that were created during XML import into real tokens. @@ -465,7 +465,7 @@ void ScConditionEntry::CompileXML() aStrNmsp1, aStrNmsp2, eTempGrammar1, eTempGrammar2, true ); } -void ScConditionEntry::SetSrcString( const rtl::OUString& rNew ) +void ScConditionEntry::SetSrcString( const OUString& rNew ) { // aSrcString is only evaluated in CompileXML SAL_WARN_IF( !mpDoc->IsImportingXML(), "sc", "SetSrcString is only valid for XML import" ); @@ -681,7 +681,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) { bIsStr1 = false; nVal1 = pEff1->GetValue(); - aStrVal1 = rtl::OUString(); + aStrVal1 = OUString(); } else { @@ -710,7 +710,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) { bIsStr2 = false; nVal2 = pEff2->GetValue(); - aStrVal2 = rtl::OUString(); + aStrVal2 = OUString(); } else { @@ -831,7 +831,7 @@ void ScConditionEntry::FillCache() const } } -bool ScConditionEntry::IsDuplicate( double nArg, const rtl::OUString& rStr ) const +bool ScConditionEntry::IsDuplicate( double nArg, const OUString& rStr ) const { FillCache(); @@ -1069,7 +1069,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_NOTDUPLICATE: if( pCondFormat ) { - bValid = IsDuplicate( nArg, rtl::OUString() ); + bValid = IsDuplicate( nArg, OUString() ); if( eOp == SC_COND_NOTDUPLICATE ) bValid = !bValid; } @@ -1106,26 +1106,26 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_BEGINS_WITH: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStr) == 0; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStrVal1) == 0; } break; case SC_COND_ENDS_WITH: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.endsWith(aStr) == 0; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.endsWith(aStrVal1) == 0; } break; @@ -1133,13 +1133,13 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_NOT_CONTAINS_TEXT: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStr) != -1; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStrVal1) != -1; } @@ -1153,7 +1153,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const return bValid; } -bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& rPos ) const +bool ScConditionEntry::IsValidStr( const OUString& rArg, const ScAddress& rPos ) const { bool bValid = false; // Interpret muss schon gerufen sein @@ -1180,15 +1180,15 @@ bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& r if ( !bIsStr2 ) return false; - rtl::OUString aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) - rtl::OUString aUpVal2( aStrVal2 ); + OUString aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) + OUString aUpVal2( aStrVal2 ); if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN ) if ( ScGlobal::GetCollator()->compareString( aUpVal1, aUpVal2 ) == COMPARE_GREATER ) { // richtige Reihenfolge fuer Wertebereich - rtl::OUString aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp; + OUString aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp; } switch ( eOp ) @@ -1269,7 +1269,7 @@ bool ScConditionEntry::IsCellValid( ScRefCellValue& rCell, const ScAddress& rPos ((ScConditionEntry*)this)->Interpret(rPos); // Formeln auswerten double nArg = 0.0; - rtl::OUString aArgStr; + OUString aArgStr; bool bVal = lcl_GetCellContent( rCell, bIsStr1, nArg, aArgStr ); if (bVal) return IsValid( nArg, rPos ); @@ -1277,12 +1277,12 @@ bool ScConditionEntry::IsCellValid( ScRefCellValue& rCell, const ScAddress& rPos return IsValidStr( aArgStr, rPos ); } -rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 nIndex, +OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 nIndex, sal_uLong nNumFmt, const FormulaGrammar::Grammar eGrammar ) const { assert( nIndex <= 1); - rtl::OUString aRet; + OUString aRet; if ( FormulaGrammar::isEnglish( eGrammar) && nNumFmt == 0 ) nNumFmt = mpDoc->GetFormatTable()->GetStandardIndex( LANGUAGE_ENGLISH_US ); @@ -1293,7 +1293,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn { ScCompiler aComp(mpDoc, rCursor, *pFormula1); aComp.SetGrammar(eGrammar); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aComp.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -1312,7 +1312,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn { ScCompiler aComp(mpDoc, rCursor, *pFormula2); aComp.SetGrammar(eGrammar); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aComp.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -1579,10 +1579,10 @@ void ScConditionEntry::endRendering() //------------------------------------------------------------------------ ScCondFormatEntry::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, const rtl::OUString& rExprNmsp2, + const OUString& rStyle, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : ScConditionEntry( eOper, rExpr1, rExpr2, pDocument, rPos, rExprNmsp1, rExprNmsp2, eGrammar1, eGrammar2 ), @@ -1593,7 +1593,7 @@ ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rStyle ) : + const OUString& rStyle ) : ScConditionEntry( eOper, pArr1, pArr2, pDocument, rPos ), aStyleName( rStyle ) { @@ -1783,12 +1783,12 @@ condformat::ScCondFormatDateType ScCondDateFormatEntry::GetDateType() const return meType; } -const rtl::OUString& ScCondDateFormatEntry::GetStyleName() const +const OUString& ScCondDateFormatEntry::GetStyleName() const { return maStyleName; } -void ScCondDateFormatEntry::SetStyleName( const rtl::OUString& rStyleName ) +void ScCondDateFormatEntry::SetStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; } @@ -2005,7 +2005,7 @@ void ScConditionalFormat::DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR maRanges.DeleteArea( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); } -void ScConditionalFormat::RenameCellStyle(const rtl::OUString& rOld, const rtl::OUString& rNew) +void ScConditionalFormat::RenameCellStyle(const OUString& rOld, const OUString& rNew) { for(CondFormatContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) if(itr->GetType() == condformat::CONDITION) @@ -2164,7 +2164,7 @@ void ScConditionalFormatList::UpdateReference( UpdateRefMode eUpdateRefMode, } } -void ScConditionalFormatList::RenameCellStyle( const rtl::OUString& rOld, const rtl::OUString& rNew ) +void ScConditionalFormatList::RenameCellStyle( const OUString& rOld, const OUString& rNew ) { for( iterator itr = begin(); itr != end(); ++itr) itr->RenameCellStyle(rOld,rNew); diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 553c38f2aa5d..5228bc1d45f9 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1498,7 +1498,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch() if (pCol->Search( nRow, nLo ) && bFirstStringIgnore && pCol->maItems[nLo].pCell->HasStringData()) { - rtl::OUString aCellStr; + OUString aCellStr; sal_uLong nFormat = pCol->GetNumberFormat( pCol->maItems[nLo].nRow); aCell.assign(*pCol->maItems[nLo].pCell); ScCellFormat::GetInputString(aCell, nFormat, aCellStr, rFormatter); @@ -1631,7 +1631,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch() } else if (bStr && bByString) { - rtl::OUString aCellStr; + OUString aCellStr; sal_uLong nFormat = pCol->GetNumberFormat( pCol->maItems[i].nRow); aCell.assign(*pCol->maItems[i].pCell); ScCellFormat::GetInputString(aCell, nFormat, aCellStr, rFormatter); diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index ea867f97e718..00ce7349d062 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -186,7 +186,7 @@ static SfxItemInfo const aItemInfos[] = ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) - : SfxItemPool ( rtl::OUString("ScDocumentPool"), + : SfxItemPool ( OUString("ScDocumentPool"), ATTR_STARTINDEX, ATTR_ENDINDEX, aItemInfos, NULL, bLoadRefCounts ), pSecondary ( pSecPool ) @@ -282,7 +282,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new ScCondFormatItem; - ppPoolDefaults[ ATTR_HYPERLINK - ATTR_STARTINDEX ] = new SfxStringItem( ATTR_HYPERLINK, rtl::OUString() ) ; + ppPoolDefaults[ ATTR_HYPERLINK - ATTR_STARTINDEX ] = new SfxStringItem( ATTR_HYPERLINK, OUString() ) ; // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem //! zusaetzliche Methode ScGlobal::IsInit() oder so... @@ -291,7 +291,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); else ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, - rtl::OUString(STRING_STANDARD) ); //! without name? + OUString(STRING_STANDARD) ); //! without name? ppPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); ppPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index ea13837ca181..5ce49e205ab0 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -52,7 +52,7 @@ using namespace formula; // Nach der Regula Falsi Methode bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, SCCOL nVCol, SCROW nVRow, SCTAB nVTab, - const rtl::OUString& sValStr, double& nX) + const OUString& sValStr, double& nX) { bool bRet = false; nX = 0.0; @@ -115,7 +115,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, - const rtl::OUString& rFormula, + const OUString& rFormula, const ScTokenArray* pArr, const formula::FormulaGrammar::Grammar eGram, bool bDirtyFlag ) @@ -227,7 +227,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera } ScRefAddress aRef; - rtl::OUStringBuffer aForString('='); + OUStringBuffer aForString('='); aForString.append(ScCompiler::GetNativeSymbol(ocTableOp)); aForString.append(ScCompiler::GetNativeSymbol( ocOpen)); @@ -636,7 +636,7 @@ const SfxPoolItem* ScDocument::GetEffItem( ScAddress aPos(nCol, nRow, nTab); ScRefCellValue aCell; aCell.assign(const_cast<ScDocument&>(*this), aPos); - rtl::OUString aStyle = pForm->GetCellStyle(aCell, aPos); + OUString aStyle = pForm->GetCellStyle(aCell, aPos); if (!aStyle.isEmpty()) { SfxStyleSheetBase* pStyleSheet = xPoolHelper->GetStylePool()->Find( @@ -964,8 +964,8 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) SCTAB nThisTab; // Tabellen mit gleichen Namen vergleichen - rtl::OUString aThisName; - rtl::OUString aOtherName; + OUString aThisName; + OUString aOtherName; for (nThisTab=0; nThisTab<nThisCount; nThisTab++) { SCTAB nOtherTab = SCTAB_MAX; @@ -1034,11 +1034,11 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) sal_uLong n1,n2; // fuer AppendDeleteRange //! ein Progress ueber alle Tabellen ??? - rtl::OUString aTabName; + OUString aTabName; GetName( nThisTab, aTabName ); - rtl::OUString aTemplate = ScGlobal::GetRscString(STR_PROGRESS_COMPARING); + OUString aTemplate = ScGlobal::GetRscString(STR_PROGRESS_COMPARING); sal_Int32 nIndex = 0; - rtl::OUStringBuffer aProText = aTemplate.getToken( 0, '#', nIndex ); + OUStringBuffer aProText = aTemplate.getToken( 0, '#', nIndex ); aProText.append(aTabName); nIndex = 0; aProText.append(aTemplate.getToken( 1, '#', nIndex )); diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 055598cfb56f..fbd00bc61869 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -53,7 +53,7 @@ const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator() return pScriptTypeData->xBreakIter; } -bool ScDocument::HasStringWeakCharacters( const rtl::OUString& rString ) +bool ScDocument::HasStringWeakCharacters( const OUString& rString ) { if (!rString.isEmpty()) { @@ -78,7 +78,7 @@ bool ScDocument::HasStringWeakCharacters( const rtl::OUString& rString ) return false; // none found } -sal_uInt8 ScDocument::GetStringScriptType( const rtl::OUString& rString ) +sal_uInt8 ScDocument::GetStringScriptType( const OUString& rString ) { sal_uInt8 nRet = 0; diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 5fe23dc5f75a..f8742e0adc0f 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -326,7 +326,7 @@ void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) //------------------------------------------------------------------------ -void ScDocument::InvalidateTextWidth( const rtl::OUString& rStyleName ) +void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) { const SCTAB nCount = GetTableCount(); for ( SCTAB i=0; i<nCount && maTabs[i]; i++ ) @@ -345,7 +345,7 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab ) //------------------------------------------------------------------------ -bool ScDocument::IsPageStyleInUse( const rtl::OUString& rStrPageStyle, SCTAB* pInTab ) +bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab ) { bool bInUse = false; const SCTAB nCount = GetTableCount(); @@ -362,7 +362,7 @@ bool ScDocument::IsPageStyleInUse( const rtl::OUString& rStrPageStyle, SCTAB* pI //------------------------------------------------------------------------ -bool ScDocument::RemovePageStyleInUse( const rtl::OUString& rStyle ) +bool ScDocument::RemovePageStyleInUse( const OUString& rStyle ) { bool bWasInUse = false; const SCTAB nCount = GetTableCount(); @@ -377,7 +377,7 @@ bool ScDocument::RemovePageStyleInUse( const rtl::OUString& rStyle ) return bWasInUse; } -bool ScDocument::RenamePageStyleInUse( const rtl::OUString& rOld, const rtl::OUString& rNew ) +bool ScDocument::RenamePageStyleInUse( const OUString& rOld, const OUString& rNew ) { bool bWasInUse = false; const SCTAB nCount = GetTableCount(); @@ -398,7 +398,7 @@ sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const { EEHorizontalTextDirection eRet = EE_HTEXTDIR_DEFAULT; - rtl::OUString aStyleName = GetPageStyle( nTab ); + OUString aStyleName = GetPageStyle( nTab ); SfxStyleSheetBase* pStyle = xPoolHelper->GetStylePool()->Find( aStyleName, SFX_STYLE_FAMILY_PAGE ); if ( pStyle ) { @@ -1110,13 +1110,13 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin) { // Update failed. Notify the user. - rtl::OUString aFile; + OUString aFile; pLinkManager->GetDisplayNames(pRefLink, NULL, &aFile, NULL, NULL); // Decode encoded URL for display friendliness. INetURLObject aUrl(aFile,INetURLObject::WAS_ENCODED); aFile = aUrl.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(String(ScResId(SCSTR_EXTDOC_NOT_LOADED))); aBuf.appendAscii("\n\n"); aBuf.append(aFile); @@ -1166,11 +1166,11 @@ void ScDocument::UpdateDdeLinks(Window* pWin) else { // Update failed. Notify the user. - rtl::OUString aFile = pDdeLink->GetTopic(); - rtl::OUString aElem = pDdeLink->GetItem(); - rtl::OUString aType = pDdeLink->GetAppl(); + OUString aFile = pDdeLink->GetTopic(); + OUString aElem = pDdeLink->GetItem(); + OUString aType = pDdeLink->GetAppl(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(String(ScResId(SCSTR_DDEDOC_NOT_LOADED))); aBuf.appendAscii("\n\n"); aBuf.appendAscii("Source : "); @@ -1198,7 +1198,7 @@ void ScDocument::UpdateDdeLinks(Window* pWin) } } -bool ScDocument::UpdateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem ) +bool ScDocument::UpdateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ) { // fuer refresh() per StarOne Api // ResetValue() fuer einzelnen Link nicht noetig @@ -1215,9 +1215,9 @@ bool ScDocument::UpdateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& if (pBase->ISA(ScDdeLink)) { ScDdeLink* pDdeLink = (ScDdeLink*)pBase; - if ( rtl::OUString(pDdeLink->GetAppl()) == rAppl && - rtl::OUString(pDdeLink->GetTopic()) == rTopic && - rtl::OUString(pDdeLink->GetItem()) == rItem ) + if ( OUString(pDdeLink->GetAppl()) == rAppl && + OUString(pDdeLink->GetTopic()) == rTopic && + OUString(pDdeLink->GetItem()) == rItem ) { pDdeLink->TryUpdate(); bFound = true; // koennen theoretisch mehrere sein (Mode), darum weitersuchen @@ -1296,7 +1296,7 @@ namespace { @return The DDE link, if it exists, otherwise 0. */ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, - const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, + const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, sal_uInt16* pnDdePos = NULL ) { if( pLinkManager ) @@ -1309,9 +1309,9 @@ ScDdeLink* lclGetDdeLink( ::sfx2::SvBaseLink* pLink = *rLinks[ nIndex ]; if( ScDdeLink* pDdeLink = PTR_CAST( ScDdeLink, pLink ) ) { - if( (rtl::OUString(pDdeLink->GetAppl()) == rAppl) && - (rtl::OUString(pDdeLink->GetTopic()) == rTopic) && - (rtl::OUString(pDdeLink->GetItem()) == rItem) && + if( (OUString(pDdeLink->GetAppl()) == rAppl) && + (OUString(pDdeLink->GetTopic()) == rTopic) && + (OUString(pDdeLink->GetItem()) == rItem) && ((nMode == SC_DDE_IGNOREMODE) || (nMode == pDdeLink->GetMode())) ) return pDdeLink; if( pnDdePos ) ++*pnDdePos; @@ -1349,12 +1349,12 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, sal_uInt16 nDde // ---------------------------------------------------------------------------- -bool ScDocument::FindDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ) +bool ScDocument::FindDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ) { return lclGetDdeLink( GetLinkManager(), rAppl, rTopic, rItem, nMode, &rnDdePos ) != NULL; } -bool ScDocument::GetDdeLinkData( sal_uInt16 nDdePos, rtl::OUString& rAppl, rtl::OUString& rTopic, rtl::OUString& rItem ) const +bool ScDocument::GetDdeLinkData( sal_uInt16 nDdePos, OUString& rAppl, OUString& rTopic, OUString& rItem ) const { if( const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) ) { @@ -1382,7 +1382,7 @@ const ScMatrix* ScDocument::GetDdeLinkResultMatrix( sal_uInt16 nDdePos ) const return pDdeLink ? pDdeLink->GetResult() : NULL; } -bool ScDocument::CreateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, ScMatrixRef pResults ) +bool ScDocument::CreateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, ScMatrixRef pResults ) { /* Create a DDE link without updating it (i.e. for Excel import), to prevent unwanted connections. First try to find existing link. Set result array @@ -1684,7 +1684,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp } uno::Sequence<sal_Int32> aOffsets; - rtl::OUString aNewStr = aTranslitarationWrapper.transliterate( aOldStr, nLanguage, 0, nOldLen, &aOffsets ); + OUString aNewStr = aTranslitarationWrapper.transliterate( aOldStr, nLanguage, 0, nOldLen, &aOffsets ); if ( aNewStr != aOldStr ) { diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 54e3a08547cd..0177c783522d 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -124,7 +124,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) if (!pDrawLayer) { - rtl::OUString aName; + OUString aName; if ( pShell && !pShell->IsLoading() ) // don't call GetTitle while loading aName = pShell->GetTitle(); pDrawLayer = new ScDrawLayer( this, aName ); @@ -146,7 +146,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) pDrawLayer->ScAddPage( nTab ); // always add page, with or without the table if (maTabs[nTab]) { - rtl::OUString aTabName; + OUString aTabName; maTabs[nTab]->GetName(aTabName); pDrawLayer->ScRenamePage( nTab, aTabName ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 81ca67618e2d..fe6d921236df 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -101,7 +101,6 @@ namespace WritingMode2 = ::com::sun::star::text::WritingMode2; using ::com::sun::star::uno::Sequence; using ::com::sun::star::sheet::TablePageBreakData; using ::std::set; -using ::rtl::OUString; // The constant parameters to CopyBlockFromClip struct ScCopyBlockFromClipParams diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 358f826d618f..17ab695c4f28 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -103,18 +103,18 @@ private: ScDocument* mpDoc; }; -rtl::OUString createLabelString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) +OUString createLabelString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) { - rtl::OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); + OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); if (aDocStr.isEmpty()) { // Replace an empty label string with column name. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScGlobal::GetRscString(STR_COLUMN)); aBuf.append(sal_Unicode(' ')); ScAddress aColAddr(nCol, 0, 0); - rtl::OUString aColStr; + OUString aColStr; aColAddr.Format(aColStr, SCA_VALID_COL, NULL); aBuf.append(aColStr); aDocStr = aBuf.makeStringAndClear(); @@ -126,7 +126,7 @@ void initFromCell( ScDPCache& rCache, ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, ScDPItemData& rData, sal_uLong& rNumFormat) { - rtl::OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); + OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); rNumFormat = 0; ScAddress aPos(nCol, nRow, nTab); @@ -399,7 +399,7 @@ bool ScDPCache::InitFromDataBase(DBConnector& rDB) for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol) { - rtl::OUString aColTitle = rDB.getColumnLabel(nCol); + OUString aColTitle = rDB.getColumnLabel(nCol); AddLabel(aColTitle); } @@ -575,7 +575,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam) const } else { - const rtl::OUString& rQueryStr = rEntry.GetQueryItem().maString; + const OUString& rQueryStr = rEntry.GetQueryItem().maString; ::com::sun::star::uno::Sequence< sal_Int32 > xOff; String aCell = pTransliteration->transliterate( aCellStr, ScGlobal::eLnge, 0, aCellStr.Len(), &xOff); @@ -667,7 +667,7 @@ const ScDPCache::GroupItems* ScDPCache::GetGroupItems(long nDim) const return NULL; } -rtl::OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const +OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const { OSL_ENSURE(nDim < maLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName"); OSL_ENSURE(maLabelNames.size() == static_cast <sal_uInt16> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName"); @@ -677,19 +677,19 @@ rtl::OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const return maLabelNames[nDim+1]; } else - return rtl::OUString(); + return OUString(); } namespace { -typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> LabelSet; +typedef boost::unordered_set<OUString, OUStringHash> LabelSet; -class InsertLabel : public std::unary_function<rtl::OUString, void> +class InsertLabel : public std::unary_function<OUString, void> { LabelSet& mrNames; public: InsertLabel(LabelSet& rNames) : mrNames(rNames) {} - void operator() (const rtl::OUString& r) + void operator() (const OUString& r) { mrNames.insert(r); } @@ -727,7 +727,7 @@ void ScDPCache::Clear() maStringPool.clear(); } -void ScDPCache::AddLabel(const rtl::OUString& rLabel) +void ScDPCache::AddLabel(const OUString& rLabel) { if ( maLabelNames.empty() ) @@ -737,7 +737,7 @@ void ScDPCache::AddLabel(const rtl::OUString& rLabel) LabelSet aExistingNames; std::for_each(maLabelNames.begin(), maLabelNames.end(), InsertLabel(aExistingNames)); sal_Int32 nSuffix = 1; - rtl::OUString aNewName = rLabel; + OUString aNewName = rLabel; while (true) { if (!aExistingNames.count(aNewName)) @@ -748,7 +748,7 @@ void ScDPCache::AddLabel(const rtl::OUString& rLabel) } // Name already exists. - rtl::OUStringBuffer aBuf(rLabel); + OUStringBuffer aBuf(rLabel); aBuf.append(++nSuffix); aNewName = aBuf.makeStringAndClear(); } @@ -863,7 +863,7 @@ long ScDPCache::GetDimMemberCount(long nDim) const return maFields[nDim].maItems.size(); } -SCCOL ScDPCache::GetDimensionIndex(const rtl::OUString& sName) const +SCCOL ScDPCache::GetDimensionIndex(const OUString& sName) const { for (size_t i = 1; i < maLabelNames.size(); ++i) { @@ -873,7 +873,7 @@ SCCOL ScDPCache::GetDimensionIndex(const rtl::OUString& sName) const return -1; } -const rtl::OUString* ScDPCache::InternString(const rtl::OUString& rStr) const +const OUString* ScDPCache::InternString(const OUString& rStr) const { StringSetType::iterator it = maStringPool.find(rStr); if (it != maStringPool.end()) @@ -948,7 +948,7 @@ SCROW ScDPCache::GetIdByItemData(long nDim, const ScDPItemData& rItem) const return -1; } -rtl::OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem) const +OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem) const { if (nDim < 0) return rItem.GetString(); @@ -1156,9 +1156,9 @@ long ScDPCache::GetColumnCount() const namespace { -std::ostream& operator<< (::std::ostream& os, const rtl::OUString& str) +std::ostream& operator<< (::std::ostream& os, const OUString& str) { - return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); + return os << OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); } void dumpItems(const ScDPCache& rCache, long nDim, const ScDPCache::ItemsType& rItems, size_t nOffset) diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index ae36524d2ea1..16f68b841bdb 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -38,12 +38,12 @@ using namespace com::sun::star; // ============================================================================ -ScDPSaveGroupItem::ScDPSaveGroupItem( const rtl::OUString& rName ) : +ScDPSaveGroupItem::ScDPSaveGroupItem( const OUString& rName ) : aGroupName(rName) {} ScDPSaveGroupItem::~ScDPSaveGroupItem() {} -void ScDPSaveGroupItem::AddElement( const rtl::OUString& rName ) +void ScDPSaveGroupItem::AddElement( const OUString& rName ) { aElements.push_back(rName); } @@ -52,14 +52,14 @@ void ScDPSaveGroupItem::AddElementsFromGroup( const ScDPSaveGroupItem& rGroup ) { // add all elements of the other group (used for nested grouping) - for ( std::vector<rtl::OUString>::const_iterator aIter(rGroup.aElements.begin()); + for ( std::vector<OUString>::const_iterator aIter(rGroup.aElements.begin()); aIter != rGroup.aElements.end(); ++aIter ) aElements.push_back( *aIter ); } -bool ScDPSaveGroupItem::RemoveElement( const rtl::OUString& rName ) +bool ScDPSaveGroupItem::RemoveElement( const OUString& rName ) { - for (std::vector<rtl::OUString>::iterator aIter = aElements.begin(); aIter != aElements.end(); ++aIter) + for (std::vector<OUString>::iterator aIter = aElements.begin(); aIter != aElements.end(); ++aIter) if (*aIter == rName) //! ignore case { aElements.erase(aIter); // found -> remove @@ -79,12 +79,12 @@ size_t ScDPSaveGroupItem::GetElementCount() const return aElements.size(); } -const rtl::OUString* ScDPSaveGroupItem::GetElementByIndex(size_t nIndex) const +const OUString* ScDPSaveGroupItem::GetElementByIndex(size_t nIndex) const { return (nIndex < aElements.size()) ? &aElements[ nIndex ] : 0; } -void ScDPSaveGroupItem::Rename( const rtl::OUString& rNewName ) +void ScDPSaveGroupItem::Rename( const OUString& rNewName ) { aGroupName = rNewName; } @@ -94,14 +94,14 @@ void ScDPSaveGroupItem::RemoveElementsFromGroups( ScDPSaveGroupDimension& rDimen // remove this group's elements from their groups in rDimension // (rDimension must be a different dimension from the one which contains this) - for ( std::vector<rtl::OUString>::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter ) + for ( std::vector<OUString>::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter ) rDimension.RemoveFromGroups( *aIter ); } void ScDPSaveGroupItem::ConvertElementsToItems(SvNumberFormatter* pFormatter) const { maItems.reserve(aElements.size()); - std::vector<rtl::OUString>::const_iterator it = aElements.begin(), itEnd = aElements.end(); + std::vector<OUString>::const_iterator it = aElements.begin(), itEnd = aElements.end(); for (; it != itEnd; ++it) { sal_uInt32 nFormat = 0; @@ -133,14 +133,14 @@ void ScDPSaveGroupItem::AddToData(ScDPGroupDimension& rDataDim) const // ============================================================================ -ScDPSaveGroupDimension::ScDPSaveGroupDimension( const rtl::OUString& rSource, const rtl::OUString& rName ) : +ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName ) : aSourceDim( rSource ), aGroupDimName( rName ), nDatePart( 0 ) { } -ScDPSaveGroupDimension::ScDPSaveGroupDimension( const rtl::OUString& rSource, const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : +ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : aSourceDim( rSource ), aGroupDimName( rName ), aDateInfo( rDateInfo ), @@ -163,7 +163,7 @@ void ScDPSaveGroupDimension::AddGroupItem( const ScDPSaveGroupItem& rItem ) aGroups.push_back( rItem ); } -rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const rtl::OUString& rPrefix) +OUString ScDPSaveGroupDimension::CreateGroupName(const OUString& rPrefix) { // create a name for a new group, using "Group1", "Group2" etc. (translated prefix in rPrefix) @@ -191,15 +191,15 @@ rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const rtl::OUString& rPref } OSL_FAIL("CreateGroupName: no valid name found"); - return rtl::OUString(); + return OUString(); } -const ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroup( const rtl::OUString& rGroupName ) const +const ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroup( const OUString& rGroupName ) const { return const_cast< ScDPSaveGroupDimension* >( this )->GetNamedGroupAcc( rGroupName ); } -ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroupAcc( const rtl::OUString& rGroupName ) +ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroupAcc( const OUString& rGroupName ) { for (ScDPSaveGroupItemVec::iterator aIter = aGroups.begin(); aIter != aGroups.end(); ++aIter) if (aIter->GetGroupName().equals(rGroupName)) //! ignore case @@ -223,7 +223,7 @@ ScDPSaveGroupItem* ScDPSaveGroupDimension::GetGroupAccByIndex( long nIndex ) return &aGroups[nIndex]; } -void ScDPSaveGroupDimension::RemoveFromGroups( const rtl::OUString& rItemName ) +void ScDPSaveGroupDimension::RemoveFromGroups( const OUString& rItemName ) { // if the item is in any group, remove it from the group, // also remove the group if it is empty afterwards @@ -238,7 +238,7 @@ void ScDPSaveGroupDimension::RemoveFromGroups( const rtl::OUString& rItemName ) } } -void ScDPSaveGroupDimension::RemoveGroup(const rtl::OUString& rGroupName) +void ScDPSaveGroupDimension::RemoveGroup(const OUString& rGroupName) { for (ScDPSaveGroupItemVec::iterator aIter = aGroups.begin(); aIter != aGroups.end(); ++aIter) if (aIter->GetGroupName().equals(rGroupName)) //! ignore case @@ -266,7 +266,7 @@ bool ScDPSaveGroupDimension::HasOnlyHidden(const ScDPUniqueStringSet& rVisible) return bAllHidden; } -void ScDPSaveGroupDimension::Rename( const rtl::OUString& rNewName ) +void ScDPSaveGroupDimension::Rename( const OUString& rNewName ) { aGroupDimName = rNewName; } @@ -429,14 +429,14 @@ void ScDPSaveGroupDimension::AddToCache(ScDPCache& rCache) const // ============================================================================ -ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rInfo ) : +ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rInfo ) : aDimensionName( rName ), aGroupInfo( rInfo ), nDatePart( 0 ) { } -ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : +ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : aDimensionName( rName ), aDateInfo( rDateInfo ), nDatePart( nPart ) @@ -583,15 +583,15 @@ namespace { struct ScDPSaveGroupDimNameFunc { - rtl::OUString maDimName; - inline explicit ScDPSaveGroupDimNameFunc( const rtl::OUString& rDimName ) : maDimName( rDimName ) {} + OUString maDimName; + inline explicit ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {} inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; } }; struct ScDPSaveGroupSourceNameFunc { - rtl::OUString maSrcDimName; - inline explicit ScDPSaveGroupSourceNameFunc( const rtl::OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {} + OUString maSrcDimName; + inline explicit ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {} inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; } }; @@ -630,7 +630,7 @@ void ScDPDimensionSaveData::ReplaceGroupDimension( const ScDPSaveGroupDimension& *aIt = rGroupDim; } -void ScDPDimensionSaveData::RemoveGroupDimension( const rtl::OUString& rGroupDimName ) +void ScDPDimensionSaveData::RemoveGroupDimension( const OUString& rGroupDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupDimNameFunc( rGroupDimName ) ); @@ -655,7 +655,7 @@ void ScDPDimensionSaveData::ReplaceNumGroupDimension( const ScDPSaveNumGroupDime aIt->second = rGroupDim; } -void ScDPDimensionSaveData::RemoveNumGroupDimension( const rtl::OUString& rGroupDimName ) +void ScDPDimensionSaveData::RemoveNumGroupDimension( const OUString& rGroupDimName ) { maNumGroupDims.erase( rGroupDimName ); } @@ -695,52 +695,52 @@ void ScDPDimensionSaveData::WriteToCache(ScDPCache& rCache) const it->second.AddToCache(rCache); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimForBase( const rtl::OUString& rBaseDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimForBase( const OUString& rBaseDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetGroupDimAccForBase( rBaseDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNamedGroupDimAcc( rGroupDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDim( const rtl::OUString& rBaseDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDim( const OUString& rBaseDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetFirstNamedGroupDimAcc( rBaseDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNextNamedGroupDimAcc( rGroupDimName ); } -const ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNumGroupDimAcc( rGroupDimName ); } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimAccForBase( const rtl::OUString& rBaseDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimAccForBase( const OUString& rBaseDimName ) { ScDPSaveGroupDimension* pGroupDim = GetFirstNamedGroupDimAcc( rBaseDimName ); return pGroupDim ? pGroupDim : GetNextNamedGroupDimAcc( rBaseDimName ); } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDimAcc( const OUString& rGroupDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupDimNameFunc( rGroupDimName ) ); return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDimAcc( const rtl::OUString& rBaseDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDimAcc( const OUString& rBaseDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupSourceNameFunc( rBaseDimName ) ); return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const OUString& rGroupDimName ) { // find the group dimension with the passed name ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( @@ -751,7 +751,7 @@ ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const rt return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDimAcc( const OUString& rGroupDimName ) { ScDPSaveNumGroupDimMap::iterator aIt = maNumGroupDims.find( rGroupDimName ); return (aIt == maNumGroupDims.end()) ? 0 : &aIt->second; @@ -762,7 +762,7 @@ bool ScDPDimensionSaveData::HasGroupDimensions() const return !maGroupDims.empty() || !maNumGroupDims.empty(); } -sal_Int32 ScDPDimensionSaveData::CollectDateParts( const rtl::OUString& rBaseDimName ) const +sal_Int32 ScDPDimensionSaveData::CollectDateParts( const OUString& rBaseDimName ) const { sal_Int32 nParts = 0; // start with part of numeric group @@ -775,9 +775,9 @@ sal_Int32 ScDPDimensionSaveData::CollectDateParts( const rtl::OUString& rBaseDim return nParts; } -rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( - const rtl::OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource, - const std::vector<rtl::OUString>* pDeletedNames ) +OUString ScDPDimensionSaveData::CreateGroupDimName( + const OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource, + const std::vector<OUString>* pDeletedNames ) { // create a name for the new dimension by appending a number to the original // dimension's name @@ -788,7 +788,7 @@ rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( const sal_Int32 nMaxAdd = 1000; // limit the loop while ( nAdd <= nMaxAdd ) { - rtl::OUString aDimName( rSourceName ); + OUString aDimName( rSourceName ); if ( !bUseSource ) aDimName += OUString::number(nAdd); bool bExists = false; @@ -819,7 +819,7 @@ rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( ++nAdd; // continue with higher number } OSL_FAIL("CreateGroupDimName: no valid name found"); - return rtl::OUString(); + return OUString(); } namespace @@ -836,12 +836,12 @@ namespace }; } -rtl::OUString ScDPDimensionSaveData::CreateDateGroupDimName( +OUString ScDPDimensionSaveData::CreateDateGroupDimName( sal_Int32 nDatePart, const ScDPObject& rObject, bool bAllowSource, - const std::vector<rtl::OUString>* pDeletedNames ) + const std::vector<OUString>* pDeletedNames ) { using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy; - rtl::OUString aPartName; + OUString aPartName; switch( nDatePart ) { case SECONDS: aPartName = ScGlobal::GetRscString( nDatePartIds[0] ); break; diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 64381e07ea78..47adbbeb9316 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::std::vector; using ::std::pair; using ::std::auto_ptr; @@ -291,7 +290,7 @@ void ScDPFilteredCache::getValue( ScDPValue& rVal, SCCOL nCol, SCROW nRow, bool rVal.Set(0.0, ScDPValue::Empty); } -rtl::OUString ScDPFilteredCache::getFieldName(SCCOL nIndex) const +OUString ScDPFilteredCache::getFieldName(SCCOL nIndex) const { return mrCache.GetDimensionName(nIndex); } diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index a7a216bd622a..bc2e132acb3c 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -44,8 +44,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::rtl::OUString; -using ::rtl::OUStringHash; using ::std::vector; using ::boost::shared_ptr; @@ -492,7 +490,7 @@ void ScDPGroupTableData::SetNumGroupDimension( long nIndex, const ScDPNumGroupDi } } -long ScDPGroupTableData::GetDimensionIndex( const rtl::OUString& rName ) +long ScDPGroupTableData::GetDimensionIndex( const OUString& rName ) { for (long i = 0; i < nSourceCount; ++i) // nSourceCount excludes data layout if (pSourceData->getDimensionName(i).equals(rName)) //! ignore case? @@ -548,7 +546,7 @@ const ScDPItemData* ScDPGroupTableData::GetMemberById( long nDim, long nId ) return pSourceData->GetMemberById( nDim, nId ); } -rtl::OUString ScDPGroupTableData::getDimensionName(long nColumn) +OUString ScDPGroupTableData::getDimensionName(long nColumn) { if ( nColumn >= nSourceCount ) { diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index a2d7bb74fb1e..a91476522699 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -83,7 +83,7 @@ ScDPItemData::ScDPItemData(const ScDPItemData& r) : { case String: case Error: - mpString = mbStringInterned ? r.mpString : new rtl::OUString(*r.mpString); + mpString = mbStringInterned ? r.mpString : new OUString(*r.mpString); break; case Value: case RangeStart: @@ -110,8 +110,8 @@ void ScDPItemData::DisposeString() mbStringInterned = false; } -ScDPItemData::ScDPItemData(const rtl::OUString& rStr) : - mpString(new rtl::OUString(rStr)), meType(String), mbStringInterned(false) {} +ScDPItemData::ScDPItemData(const OUString& rStr) : + mpString(new OUString(rStr)), meType(String), mbStringInterned(false) {} ScDPItemData::ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue) : meType(GroupValue), mbStringInterned(false) @@ -136,14 +136,14 @@ void ScDPItemData::SetEmpty() meType = Empty; } -void ScDPItemData::SetString(const rtl::OUString& rS) +void ScDPItemData::SetString(const OUString& rS) { DisposeString(); - mpString = new rtl::OUString(rS); + mpString = new OUString(rS); meType = String; } -void ScDPItemData::SetString(const rtl::OUString* pS) +void ScDPItemData::SetString(const OUString* pS) { DisposeString(); mpString = pS; @@ -179,7 +179,7 @@ void ScDPItemData::SetRangeLast() meType = RangeStart; } -void ScDPItemData::SetErrorString(const rtl::OUString* pS) +void ScDPItemData::SetErrorString(const OUString* pS) { SetString(pS); meType = Error; @@ -249,7 +249,7 @@ ScDPItemData& ScDPItemData::operator= (const ScDPItemData& r) { case String: case Error: - mpString = r.mbStringInterned ? r.mpString : new rtl::OUString(*r.mpString); + mpString = r.mbStringInterned ? r.mpString : new OUString(*r.mpString); mbStringInterned = r.mbStringInterned; break; case Value: @@ -296,7 +296,7 @@ void ScDPItemData::Dump(const char* msg) const break; case Error: printf("error: %s\n", - rtl::OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); break; case GroupValue: printf("group value: group type = %d value = %d\n", @@ -304,7 +304,7 @@ void ScDPItemData::Dump(const char* msg) const break; case String: printf("string: %s\n", - rtl::OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); break; case Value: printf("value: %g\n", mfValue); @@ -329,7 +329,7 @@ bool ScDPItemData::IsValue() const return meType == Value; } -rtl::OUString ScDPItemData::GetString() const +OUString ScDPItemData::GetString() const { switch (meType) { @@ -337,16 +337,16 @@ rtl::OUString ScDPItemData::GetString() const case Error: return *mpString; case Value: - return rtl::OUString::valueOf(mfValue); + return OUString::valueOf(mfValue); case GroupValue: case RangeStart: - return rtl::OUString::createFromAscii("fail"); + return OUString::createFromAscii("fail"); case Empty: default: ; } - return rtl::OUString(); + return OUString(); } double ScDPItemData::GetValue() const diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index c31a4149c97f..c8f3fffbe923 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -91,7 +91,6 @@ using ::com::sun::star::sheet::DataPilotTableHeaderData; using ::com::sun::star::sheet::DataPilotTablePositionData; using ::com::sun::star::sheet::XDimensionsSupplier; using ::com::sun::star::beans::XPropertySet; -using ::rtl::OUString; #define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 645e7b52e7bd..3cd83694a7f7 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::sheet::DataPilotTablePositionData; using ::com::sun::star::sheet::DataPilotTableResultData; using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Any; -using ::rtl::OUString; #define SC_DP_FRAME_INNER_BOLD 20 #define SC_DP_FRAME_OUTER_BOLD 40 @@ -83,8 +82,8 @@ struct ScDPOutLevelData long nDimPos; sal_uInt32 mnSrcNumFmt; /// Prevailing number format used in the source data. uno::Sequence<sheet::MemberResult> aResult; - rtl::OUString maName; /// Name is the internal field name. - rtl::OUString maCaption; /// Caption is the name visible in the output table. + OUString maName; /// Name is the internal field name. + OUString maCaption; /// Caption is the name visible in the output table. bool mbHasHiddenMember:1; bool mbDataLayout:1; bool mbPageDim:1; @@ -287,7 +286,7 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab, return; } - rtl::OUString aStyleName = ScGlobal::GetRscString( nStrId ); + OUString aStyleName = ScGlobal::GetRscString( nStrId ); ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool(); ScStyleSheet* pStyle = (ScStyleSheet*) pStlPool->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); if (!pStyle) @@ -346,7 +345,7 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, // get names/formats for all data dimensions //! merge this with the loop to collect ScDPOutLevelData? - rtl::OUString aDataNames[SC_DPOUT_MAXLEVELS]; + OUString aDataNames[SC_DPOUT_MAXLEVELS]; sal_uInt32 nDataFormats[SC_DPOUT_MAXLEVELS]; long nDataCount = 0; long nDimCount = xDims->getCount(); @@ -360,14 +359,14 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA ) { aDataNames[nDataCount] = xDimName->getName(); long nFormat = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNONAME_NUMFMT) ); + OUString(SC_UNONAME_NUMFMT) ); nDataFormats[nDataCount] = nFormat; ++nDataCount; } @@ -379,7 +378,7 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, const sheet::MemberResult* pArray = aResult.getConstArray(); - rtl::OUString aName; + OUString aName; sal_uInt32* pNumFmt = new sal_uInt32[nSize]; if (nDataCount == 1) { @@ -424,13 +423,13 @@ sal_uInt32 lcl_GetFirstNumberFormat( const uno::Reference<container::XIndexAcces { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA ) { long nFormat = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNONAME_NUMFMT) ); + OUString(SC_UNONAME_NUMFMT) ); return nFormat; // use format from first found data dimension } @@ -555,12 +554,12 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); long nDimPos = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNO_DP_POSITION) ); + OUString(SC_UNO_DP_POSITION) ); bool bIsDataLayout = ScUnoHelpFunctions::GetBoolProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ISDATALAYOUT)); + xDimProp, OUString(SC_UNO_DP_ISDATALAYOUT)); bool bHasHiddenMember = ScUnoHelpFunctions::GetBoolProperty( xDimProp, OUString(SC_UNO_DP_HAS_HIDDEN_MEMBER)); sal_Int32 nNumFmt = ScUnoHelpFunctions::GetLongProperty( @@ -572,7 +571,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS new ScNameToIndexAccess( xDimSupp->getHierarchies() ); long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNO_DP_USEDHIERARCHY) ); + OUString(SC_UNO_DP_USEDHIERARCHY) ); if ( nHierarchy >= xHiers->getCount() ) nHierarchy = 0; @@ -595,7 +594,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS xLevel, uno::UNO_QUERY ); if ( xLevNam.is() && xLevRes.is() ) { - rtl::OUString aName = xLevNam->getName(); + OUString aName = xLevNam->getName(); Reference<XPropertySet> xPropSet(xLevel, UNO_QUERY); // Caption equals the field name by default. // #i108948# use ScUnoHelpFunctions::GetStringProperty, because @@ -706,8 +705,8 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS try { uno::Any aAny = xSrcProp->getPropertyValue( - rtl::OUString(SC_UNO_DP_DATADESC) ); - rtl::OUString aUStr; + OUString(SC_UNO_DP_DATADESC) ); + OUString aUStr; aAny >>= aUStr; aDataDescription = aUStr; } @@ -1235,7 +1234,7 @@ bool ScDPOutput::GetHeaderLayout() const namespace { void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, sal_Int32& rDataLayoutIndex, - std::vector<rtl::OUString>& rDataNames, std::vector<rtl::OUString>& rGivenNames, + std::vector<OUString>& rDataNames, std::vector<OUString>& rGivenNames, sheet::DataPilotFieldOrientation& rDataOrient, const uno::Reference<sheet::XDimensionsSupplier>& xSource ) { @@ -1246,12 +1245,12 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s uno::Reference<beans::XPropertySet> xSrcProp( xSource, uno::UNO_QUERY ); bool bColGrand = ScUnoHelpFunctions::GetBoolProperty( - xSrcProp, rtl::OUString(SC_UNO_DP_COLGRAND)); + xSrcProp, OUString(SC_UNO_DP_COLGRAND)); if ( bColGrand ) rGrandTotalCols = 1; // default if data layout not in columns bool bRowGrand = ScUnoHelpFunctions::GetBoolProperty( - xSrcProp, rtl::OUString(SC_UNO_DP_ROWGRAND)); + xSrcProp, OUString(SC_UNO_DP_ROWGRAND)); if ( bRowGrand ) rGrandTotalRows = 1; // default if data layout not in rows @@ -1272,18 +1271,18 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); if ( ScUnoHelpFunctions::GetBoolProperty( xDimProp, - rtl::OUString(SC_UNO_DP_ISDATALAYOUT) ) ) + OUString(SC_UNO_DP_ISDATALAYOUT) ) ) { rDataLayoutIndex = nDim; rDataOrient = eDimOrient; } if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA ) { - rtl::OUString aSourceName; - rtl::OUString aGivenName; + OUString aSourceName; + OUString aGivenName; ScDPOutput::GetDataDimensionNames( aSourceName, aGivenName, xDim ); try { @@ -1350,7 +1349,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa if (xPropSet.is()) { sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet, - rtl::OUString(SC_UNO_DP_DATAFIELDCOUNT) ); + OUString(SC_UNO_DP_DATAFIELDCOUNT) ); if (nDataFieldCount > 0) aResData.DataFieldIndex = (nRow - nDataStartRow) % nDataFieldCount; } @@ -1432,7 +1431,7 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>& return false; sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet, - rtl::OUString(SC_UNO_DP_DATAFIELDCOUNT) ); + OUString(SC_UNO_DP_DATAFIELDCOUNT) ); if (nDataFieldCount == 0) // No data field is present in this datapilot table. return false; @@ -1441,8 +1440,8 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>& sal_Int32 nGrandTotalCols; sal_Int32 nGrandTotalRows; sal_Int32 nDataLayoutIndex; - std::vector<rtl::OUString> aDataNames; - std::vector<rtl::OUString> aGivenNames; + std::vector<OUString> aDataNames; + std::vector<OUString> aGivenNames; sheet::DataPilotFieldOrientation eDataOrient; lcl_GetTableVars( nGrandTotalCols, nGrandTotalRows, nDataLayoutIndex, aDataNames, aGivenNames, eDataOrient, xSource ); @@ -1521,7 +1520,7 @@ namespace { // helper functions for ScDPOutput::GetPivotData // -bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const rtl::OUString& rSourceName, const rtl::OUString& rGivenName ) +bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const OUString& rSourceName, const OUString& rGivenName ) { // match one of the names, ignoring case return ScGlobal::GetpTransliteration()->isEqual( rTarget.maFieldName, rSourceName ) || @@ -1614,7 +1613,7 @@ uno::Sequence<sheet::GeneralFunction> lcl_GetSubTotals( { try { - uno::Any aValue = xLevelProp->getPropertyValue( rtl::OUString(SC_UNO_DP_SUBTOTAL) ); + uno::Any aValue = xLevelProp->getPropertyValue( OUString(SC_UNO_DP_SUBTOTAL) ); aValue >>= aSubTotals; } catch(const uno::Exception&) @@ -1631,7 +1630,7 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS std::vector<bool>& rFilterUsed, bool& rBeforeDataLayout, sal_Int32 nGrandTotals, sal_Int32 nDataLayoutIndex, - const std::vector<rtl::OUString>& rDataNames, const std::vector<rtl::OUString>& rGivenNames, + const std::vector<OUString>& rDataNames, const std::vector<OUString>& rGivenNames, const ScDPGetPivotDataField& rTarget, const uno::Reference<sheet::XDimensionsSupplier>& xSource ) { // returns true if a filter was given for the field @@ -1699,8 +1698,8 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS // grand total is always automatic sal_Int32 nDataPos = j - ( nSize - nGrandTotals ); OSL_ENSURE( nDataPos < (sal_Int32)rDataNames.size(), "wrong data count" ); - rtl::OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nDataPos] ); + OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names + OUString aGivenName( rGivenNames[nDataPos] ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ); } @@ -1735,8 +1734,8 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS sal_Int32 nFuncPos = nSubTotalCount / nDataCount; // outer order: subtotal functions sal_Int32 nDataPos = nSubTotalCount % nDataCount; // inner order: data fields - rtl::OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nDataPos] ); + OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names + OUString aGivenName( rGivenNames[nDataPos] ); OSL_ENSURE( nFuncPos < aSubTotals.getLength(), "wrong subtotal count" ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ) && @@ -1755,8 +1754,8 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS if ( rBeforeDataLayout ) { OSL_ENSURE( nSubTotalCount < (sal_Int32)rDataNames.size(), "wrong data count" ); - rtl::OUString aSourceName( rDataNames[nSubTotalCount] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nSubTotalCount] ); + OUString aSourceName( rDataNames[nSubTotalCount] ); // vector contains source names + OUString aGivenName( rGivenNames[nSubTotalCount] ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ); } @@ -1780,7 +1779,7 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS { // Asterisks are added in ScDPSaveData::WriteToSource to create unique names. //! preserve original name there? - rtl::OUString aSourceName = ScDPUtil::getSourceDimensionName(aResultEntry.Name); + OUString aSourceName = ScDPUtil::getSourceDimensionName(aResultEntry.Name); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aResultEntry.Caption); @@ -1819,7 +1818,7 @@ void lcl_StripSubTotals( std::vector<bool>& rResult, const std::vector<sal_Int32 } } -rtl::OUString lcl_GetDataFieldName( const rtl::OUString& rSourceName, sheet::GeneralFunction eFunc ) +OUString lcl_GetDataFieldName( const OUString& rSourceName, sheet::GeneralFunction eFunc ) { sal_uInt16 nStrId = 0; switch ( eFunc ) @@ -1843,9 +1842,9 @@ rtl::OUString lcl_GetDataFieldName( const rtl::OUString& rSourceName, sheet::Gen } } if ( !nStrId ) - return rtl::OUString(); + return OUString(); - rtl::OUStringBuffer aRet( ScGlobal::GetRscString( nStrId ) ); + OUStringBuffer aRet( ScGlobal::GetRscString( nStrId ) ); aRet.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - ")); aRet.append(rSourceName); return aRet.makeStringAndClear(); @@ -1854,7 +1853,7 @@ rtl::OUString lcl_GetDataFieldName( const rtl::OUString& rSourceName, sheet::Gen } void ScDPOutput::GetDataDimensionNames( - rtl::OUString& rSourceName, rtl::OUString& rGivenName, const uno::Reference<uno::XInterface>& xDim ) + OUString& rSourceName, OUString& rGivenName, const uno::Reference<uno::XInterface>& xDim ) { uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY ); uno::Reference<container::XNamed> xDimName( xDim, uno::UNO_QUERY ); @@ -1868,7 +1867,7 @@ void ScDPOutput::GetDataDimensionNames( //! Should use a stored name when available sheet::GeneralFunction eFunc = (sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_FUNCTION), + xDimProp, OUString(SC_UNO_DP_FUNCTION), sheet::GeneralFunction_NONE ); rGivenName = lcl_GetDataFieldName( rSourceName, eFunc ); } @@ -1883,8 +1882,8 @@ bool ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget, sal_Int32 nGrandTotalCols; sal_Int32 nGrandTotalRows; sal_Int32 nDataLayoutIndex; - std::vector<rtl::OUString> aDataNames; - std::vector<rtl::OUString> aGivenNames; + std::vector<OUString> aDataNames; + std::vector<OUString> aGivenNames; sheet::DataPilotFieldOrientation eDataOrient; lcl_GetTableVars( nGrandTotalCols, nGrandTotalRows, nDataLayoutIndex, aDataNames, aGivenNames, eDataOrient, xSource ); diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index bef099b008c7..28d609b5d16c 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -53,9 +53,6 @@ using namespace com::sun::star; using namespace com::sun::star::sheet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringHash; using ::std::auto_ptr; #define SC_DPSAVEMODE_DONTKNOW 2 diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index bb0e9b541e85..9f50a68e4f29 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -86,7 +86,7 @@ long ScDatabaseDPData::GetColumnCount() } -rtl::OUString ScDatabaseDPData::getDimensionName(long nColumn) +OUString ScDatabaseDPData::getDimensionName(long nColumn) { if (getIsDataLayoutDimension(nColumn)) { diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index f1cf22735dcd..f4a80b2f3941 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::std::vector; // ----------------------------------------------------------------------- @@ -82,7 +81,7 @@ long ScSheetDPData::GetColumnCount() return aCacheTable.getColSize(); } -rtl::OUString ScSheetDPData::getDimensionName(long nColumn) +OUString ScSheetDPData::getDimensionName(long nColumn) { CreateCacheTable(); if (getIsDataLayoutDimension(nColumn)) @@ -94,7 +93,7 @@ rtl::OUString ScSheetDPData::getDimensionName(long nColumn) else if (nColumn >= aCacheTable.getColSize()) { OSL_FAIL("getDimensionName: invalid dimension"); - return rtl::OUString(); + return OUString(); } else { diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index c92c23f964fb..fdd5b5ab7de8 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -59,7 +59,7 @@ ScDPTableData::~ScDPTableData() { } -rtl::OUString ScDPTableData::GetFormattedString(long nDim, const ScDPItemData& rItem) const +OUString ScDPTableData::GetFormattedString(long nDim, const ScDPItemData& rItem) const { const ScDPCache* pCache = GetCacheTable().getCache(); return pCache->GetFormattedString(nDim, rItem); diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 0f693105f85b..322dc5ff450d 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star; using ::std::vector; using ::std::pair; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ----------------------------------------------------------------------- @@ -810,7 +809,7 @@ sal_uInt16 ScDPResultData::GetMeasureRefOrient(long nMeasure) const return maMeasureRefOrients[nMeasure]; } -rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const +OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const { // with bForce==true, return function instead of "result" for single measure // with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc @@ -835,7 +834,7 @@ rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSub if (pLayoutName) return *pLayoutName; } - rtl::OUStringBuffer aRet; + OUStringBuffer aRet; ScSubTotalFunc eFunc = ( eForceFunc == SUBTOTAL_FUNC_NONE ) ? GetMeasureFunction(nMeasure) : eForceFunc; sal_uInt16 nId = nFuncStrIds[eFunc]; @@ -850,12 +849,12 @@ rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSub } } -rtl::OUString ScDPResultData::GetMeasureDimensionName(long nMeasure) const +OUString ScDPResultData::GetMeasureDimensionName(long nMeasure) const { if ( nMeasure < 0 ) { OSL_FAIL("GetMeasureDimensionName: negative"); - return rtl::OUString::createFromAscii("***"); + return OUString::createFromAscii("***"); } return mrSource.GetDataDimName(nMeasure); @@ -1742,7 +1741,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, #if DEBUG_PIVOT_TABLE void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( rtl::OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); + lcl_DumpRow( OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); if (pDataRoot) @@ -2599,7 +2598,7 @@ void ScDPDataMember::UpdateRunningTotals( #if DEBUG_PIVOT_TABLE void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( rtl::OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); + lcl_DumpRow( OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); SCROW nStartRow = rPos.Row(); const ScDPDataDimension* pDataChild = GetChildDimension(); @@ -2964,9 +2963,9 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const if ( NULL != pMember ) return pMember->IsValidEntry( aMembers ); #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer strTemp(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer strTemp(RTL_CONSTASCII_STRINGPARAM( "IsValidEntry: Member not found, DimName = ")); - strTemp.append(rtl::OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8)); + strTemp.append(OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8)); OSL_TRACE("%s", strTemp.getStr()); #endif return false; @@ -3424,8 +3423,8 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( #if DEBUG_PIVOT_TABLE void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString(GetName()); - lcl_DumpRow( rtl::OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); + OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString(GetName()); + lcl_DumpRow( OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); @@ -3798,8 +3797,8 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim, #if DEBUG_PIVOT_TABLE void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const { - rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString("(unknown)"); - lcl_DumpRow( rtl::OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); + OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString("(unknown)"); + lcl_DumpRow( OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 91dcacc363e2..dddbeabf6663 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index dc78e3b687ca..a842d7de20b1 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -48,7 +48,7 @@ namespace { const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary leap year for date calculations -rtl::OUString getTwoDigitString(sal_Int32 nValue) +OUString getTwoDigitString(sal_Int32 nValue) { OUString aRet = OUString::number( nValue ); if ( aRet.getLength() < 2 ) @@ -56,17 +56,17 @@ rtl::OUString getTwoDigitString(sal_Int32 nValue) return aRet; } -void appendDateStr(rtl::OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter) +void appendDateStr(OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter) { sal_uLong nFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge ); - rtl::OUString aString; + OUString aString; pFormatter->GetInputLineString(fValue, nFormat, aString); rBuffer.append(aString); } -rtl::OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* pFormatter) +OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* pFormatter) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append(sal_Unicode(bFirst ? '<' : '>')); appendDateStr(aBuffer, fValue, pFormatter); return aBuffer.makeStringAndClear(); @@ -74,7 +74,7 @@ rtl::OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* } -bool ScDPUtil::isDuplicateDimension(const rtl::OUString& rName) +bool ScDPUtil::isDuplicateDimension(const OUString& rName) { if (rName.isEmpty()) return false; @@ -83,24 +83,24 @@ bool ScDPUtil::isDuplicateDimension(const rtl::OUString& rName) return cLast == sal_Unicode('*'); } -rtl::OUString ScDPUtil::getSourceDimensionName(const rtl::OUString& rName) +OUString ScDPUtil::getSourceDimensionName(const OUString& rName) { return comphelper::string::stripEnd(rName, '*'); } -rtl::OUString ScDPUtil::createDuplicateDimensionName(const rtl::OUString& rOriginal, size_t nDupCount) +OUString ScDPUtil::createDuplicateDimensionName(const OUString& rOriginal, size_t nDupCount) { if (!nDupCount) return rOriginal; - rtl::OUStringBuffer aBuf(rOriginal); + OUStringBuffer aBuf(rOriginal); for (size_t i = 0; i < nDupCount; ++i) aBuf.append(sal_Unicode('*')); return aBuf.makeStringAndClear(); } -rtl::OUString ScDPUtil::getDateGroupName( +OUString ScDPUtil::getDateGroupName( sal_Int32 nDatePart, sal_Int32 nValue, SvNumberFormatter* pFormatter, double fStart, double fEnd) { @@ -112,7 +112,7 @@ rtl::OUString ScDPUtil::getDateGroupName( switch ( nDatePart ) { case sheet::DataPilotFieldGroupBy::YEARS: - return rtl::OUString::valueOf(nValue); + return OUString::valueOf(nValue); case sheet::DataPilotFieldGroupBy::QUARTERS: return ScGlobal::pLocaleData->getQuarterAbbreviation(sal_Int16(nValue-1)); // nValue is 1-based case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS: @@ -140,7 +140,7 @@ rtl::OUString ScDPUtil::getDateGroupName( case sheet::DataPilotFieldGroupBy::MINUTES: case sheet::DataPilotFieldGroupBy::SECONDS: { - rtl::OUStringBuffer aBuf(ScGlobal::pLocaleData->getTimeSep()); + OUStringBuffer aBuf(ScGlobal::pLocaleData->getTimeSep()); aBuf.append(getTwoDigitString(nValue)); return aBuf.makeStringAndClear(); } @@ -149,7 +149,7 @@ rtl::OUString ScDPUtil::getDateGroupName( OSL_FAIL("invalid date part"); } - return rtl::OUString::createFromAscii("FIXME: unhandled value"); + return OUString::createFromAscii("FIXME: unhandled value"); } double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rInfo) @@ -195,20 +195,20 @@ double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rI namespace { -void lcl_AppendDateStr( rtl::OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter ) +void lcl_AppendDateStr( OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter ) { sal_uLong nFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge ); - rtl::OUString aString; + OUString aString; pFormatter->GetInputLineString( fValue, nFormat, aString ); rBuffer.append( aString ); } -rtl::OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicode cDecSeparator, +OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicode cDecSeparator, bool bDateValues, SvNumberFormatter* pFormatter ) { OSL_ENSURE( cDecSeparator != 0, "cDecSeparator not initialized" ); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append((sal_Unicode)( bFirst ? '<' : '>' )); if ( bDateValues ) lcl_AppendDateStr( aBuffer, fValue, pFormatter ); @@ -218,7 +218,7 @@ rtl::OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicod return aBuffer.makeStringAndClear(); } -rtl::OUString lcl_GetNumGroupName( +OUString lcl_GetNumGroupName( double fStartValue, const ScDPNumGroupInfo& rInfo, sal_Unicode cDecSep, SvNumberFormatter* pFormatter) { @@ -244,7 +244,7 @@ rtl::OUString lcl_GetNumGroupName( fEndValue = rInfo.mfEnd; } - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if ( rInfo.mbDateValues ) { lcl_AppendDateStr( aBuffer, fStartValue, pFormatter ); @@ -265,7 +265,7 @@ rtl::OUString lcl_GetNumGroupName( } -rtl::OUString ScDPUtil::getNumGroupName( +OUString ScDPUtil::getNumGroupName( double fValue, const ScDPNumGroupInfo& rInfo, sal_Unicode cDecSep, SvNumberFormatter* pFormatter) { if ( fValue < rInfo.mfStart && !rtl::math::approxEqual( fValue, rInfo.mfStart ) ) diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 897e93a601f5..97dea58f6725 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -242,11 +242,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : rPool.FreezeIdRanges(); // the pool is also used directly SdrLayerAdmin& rAdmin = GetLayerAdmin(); - rAdmin.NewLayer(rtl::OUString("vorne"), SC_LAYER_FRONT); - rAdmin.NewLayer(rtl::OUString("hinten"), SC_LAYER_BACK); - rAdmin.NewLayer(rtl::OUString("intern"), SC_LAYER_INTERN); - rAdmin.NewLayer(rtl::OUString("Controls"), SC_LAYER_CONTROLS); - rAdmin.NewLayer(rtl::OUString("hidden"), SC_LAYER_HIDDEN); + rAdmin.NewLayer(OUString("vorne"), SC_LAYER_FRONT); + rAdmin.NewLayer(OUString("hinten"), SC_LAYER_BACK); + rAdmin.NewLayer(OUString("intern"), SC_LAYER_INTERN); + rAdmin.NewLayer(OUString("Controls"), SC_LAYER_CONTROLS); + rAdmin.NewLayer(OUString("hidden"), SC_LAYER_HIDDEN); // "Controls" is new - must also be created when loading // Link fuer URL-Fields setzen @@ -1407,13 +1407,13 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const //#i110034# charts need correct sheet names for xml range conversion during load //so the target sheet name is temporarily renamed (if we have any SdrObjects) - rtl::OUString aDestTabName; + OUString aDestTabName; sal_Bool bRestoreDestTabName = false; if( pOldObject && !bSameDoc && !bDestClip ) { if( pDoc && pClipDoc ) { - rtl::OUString aSourceTabName; + OUString aSourceTabName; if( pClipDoc->GetName( nSourceTab, aSourceTabName ) && pDoc->GetName( nDestTab, aDestTabName ) ) { diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index f6bf3a1c69d8..7bd078575775 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -275,7 +275,7 @@ void adjustRangeName(ScToken* pToken, ScDocument& rNewDoc, const ScDocument* pOl { bool bOldGlobal = pToken->IsGlobal(); SCTAB aOldTab = aOldPos.Tab(); - rtl::OUString aRangeName; + OUString aRangeName; int nOldIndex = pToken->GetIndex(); ScRangeData* pOldRangeData = NULL; @@ -354,7 +354,7 @@ void adjustDBRange(ScToken* pToken, ScDocument& rNewDoc, const ScDocument* pOldD ScDBData* pDBData = aOldNamedDBs.findByIndex(pToken->GetIndex()); if (!pDBData) return; //invalid index - rtl::OUString aDBName = pDBData->GetUpperName(); + OUString aDBName = pDBData->GetUpperName(); //search in new document ScDBCollection* pNewDBCollection = rNewDoc.GetDBCollection(); @@ -386,7 +386,7 @@ ScFormulaCellGroup::~ScFormulaCellGroup() // ============================================================================ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, - const rtl::OUString& rFormula, + const OUString& rFormula, const FormulaGrammar::Grammar eGrammar, sal_uInt8 cMatInd ) : ScBaseCell( CELLTYPE_FORMULA ), @@ -615,12 +615,12 @@ ScFormulaVectorState ScFormulaCell::GetVectorState() const return pCode->GetVectorState(); } -void ScFormulaCell::GetFormula( rtl::OUStringBuffer& rBuffer, +void ScFormulaCell::GetFormula( OUStringBuffer& rBuffer, const FormulaGrammar::Grammar eGrammar ) const { if( pCode->GetCodeError() && !pCode->GetLen() ) { - rBuffer = rtl::OUStringBuffer( ScGlobal::GetErrorString( pCode->GetCodeError())); + rBuffer = OUStringBuffer( ScGlobal::GetErrorString( pCode->GetCodeError())); return; } else if( cMatrixFlag == MM_REFERENCE ) @@ -675,9 +675,9 @@ void ScFormulaCell::GetFormula( rtl::OUStringBuffer& rBuffer, } } -void ScFormulaCell::GetFormula( rtl::OUString& rFormula, const FormulaGrammar::Grammar eGrammar ) const +void ScFormulaCell::GetFormula( OUString& rFormula, const FormulaGrammar::Grammar eGrammar ) const { - rtl::OUStringBuffer rBuffer( rFormula ); + OUStringBuffer rBuffer( rFormula ); GetFormula( rBuffer, eGrammar ); rFormula = rBuffer.makeStringAndClear(); } @@ -697,7 +697,7 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ) } } -void ScFormulaCell::Compile( const rtl::OUString& rFormula, bool bNoListening, +void ScFormulaCell::Compile( const OUString& rFormula, bool bNoListening, const FormulaGrammar::Grammar eGrammar ) { if ( pDocument->IsClipOrUndo() ) @@ -788,7 +788,7 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress ) ScCompiler aComp( pDocument, aPos, *pCode); aComp.SetGrammar(eTempGrammar); - rtl::OUString aFormula, aFormulaNmsp; + OUString aFormula, aFormulaNmsp; aComp.CreateStringFromXMLTokenArray( aFormula, aFormulaNmsp ); pDocument->DecXMLImportedFormulaCount( aFormula.getLength() ); rProgress.SetStateCountDownOnPercent( pDocument->GetXMLImportedFormulaCount() ); @@ -1633,9 +1633,9 @@ void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits ) } // Dynamically create the URLField on a mouse-over action on a hyperlink() cell. -void ScFormulaCell::GetURLResult( rtl::OUString& rURL, rtl::OUString& rCellText ) +void ScFormulaCell::GetURLResult( OUString& rURL, OUString& rCellText ) { - rtl::OUString aCellString; + OUString aCellString; Color* pColor; @@ -1702,8 +1702,8 @@ bool ScFormulaCell::IsHyperLinkCell() const EditTextObject* ScFormulaCell::CreateURLObject() { - rtl::OUString aCellText; - rtl::OUString aURL; + OUString aCellText; + OUString aURL; GetURLResult( aURL, aCellText ); return ScEditUtil::CreateURLObjectFromURL( *pDocument, aURL, aCellText ); @@ -1748,13 +1748,13 @@ double ScFormulaCell::GetValueAlways() return aResult.GetDouble(); } -rtl::OUString ScFormulaCell::GetString() +OUString ScFormulaCell::GetString() { MaybeInterpret(); if ((!pCode->GetCodeError() || pCode->GetCodeError() == errDoubleRef) && !aResult.GetResultError()) return aResult.GetString(); - return rtl::OUString(); + return OUString(); } const ScMatrix* ScFormulaCell::GetMatrix() @@ -1877,14 +1877,14 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) else { #if OSL_DEBUG_LEVEL > 0 - rtl::OUString aTmp; - rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( + OUString aTmp; + OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( "broken Matrix, no MatFormula at origin, Pos: ")); aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatOrg: ")); aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aMsg.getStr()); #endif return 0; // bad luck ... @@ -1910,13 +1910,13 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) #if OSL_DEBUG_LEVEL > 0 else { - rtl::OUString aTmp; - rtl::OStringBuffer aMsg( "broken Matrix, Pos: " ); + OUString aTmp; + OStringBuffer aMsg( "broken Matrix, Pos: " ); aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatOrg: ")); aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatCols: ")); aMsg.append(static_cast<sal_Int32>( nC )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatRows: ")); @@ -2771,7 +2771,7 @@ void ScFormulaCell::CompileDBFormula( bool bCreateFormulaString ) } if ( bRecompile ) { - rtl::OUString aFormula; + OUString aFormula; GetFormula( aFormula, formula::FormulaGrammar::GRAM_NATIVE); if ( GetMatrixFlag() != MM_NONE && !aFormula.isEmpty() ) { @@ -2818,7 +2818,7 @@ void ScFormulaCell::CompileNameFormula( bool bCreateFormulaString ) } if ( bRecompile ) { - rtl::OUString aFormula; + OUString aFormula; GetFormula( aFormula, formula::FormulaGrammar::GRAM_NATIVE); if ( GetMatrixFlag() != MM_NONE && !aFormula.isEmpty() ) { diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 5facf9f16b70..44f9e65bb06e 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -112,7 +112,7 @@ void ScFuncDesc::Clear() nFIndex = 0; nCategory = 0; - sHelpId = rtl::OString(); + sHelpId = OString(); bIncomplete = false; bHasSuppressedArgs = false; } @@ -367,7 +367,7 @@ void ScFuncDesc::initArgumentInfo() const } } -::rtl::OString ScFuncDesc::getHelpId() const +OString ScFuncDesc::getHelpId() const { return sHelpId; } diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index bc665d6d099e..7d31f6f8d9ba 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -80,8 +80,6 @@ // ----------------------------------------------------------------------- -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL; SvxSearchItem* ScGlobal::pSearchItem = NULL; @@ -104,7 +102,7 @@ CollatorWrapper* ScGlobal::pCaseCollator = NULL; IntlWrapper* ScGlobal::pScIntlWrapper = NULL; sal_Unicode ScGlobal::cListDelimiter = ','; String* ScGlobal::pEmptyString = NULL; -::rtl::OUString* ScGlobal::pEmptyOUString = NULL; +OUString* ScGlobal::pEmptyOUString = NULL; String* ScGlobal::pStrClipDocName = NULL; SvxBrushItem* ScGlobal::pEmptyBrushItem = NULL; @@ -514,7 +512,7 @@ const String& ScGlobal::GetEmptyString() return *pEmptyString; } -const ::rtl::OUString& ScGlobal::GetEmptyOUString() +const OUString& ScGlobal::GetEmptyOUString() { return *pEmptyOUString; } @@ -530,7 +528,7 @@ ImageList* ScGlobal::GetOutlineSymbols() void ScGlobal::Init() { pEmptyString = new String; - pEmptyOUString = new ::rtl::OUString; + pEmptyOUString = new OUString; // Die Default-Sprache fuer Zahlenformate (ScGlobal::eLnge) // muss immer LANGUAGE_SYSTEM sein @@ -735,7 +733,7 @@ String ScGlobal::GetCharsetString( CharSet eVal ) default: return OUString::number( eVal ); } - return rtl::OUString::createFromAscii(pChar); + return OUString::createFromAscii(pChar); } //------------------------------------------------------------------------ @@ -803,7 +801,7 @@ const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, OUString ScGlobal::addToken(const OUString& rTokenList, const OUString& rToken, sal_Unicode cSep, sal_Int32 nSepCount, bool bForceSep) { - rtl::OUStringBuffer aBuf(rTokenList); + OUStringBuffer aBuf(rTokenList); if( bForceSep || (!rToken.isEmpty() && !rTokenList.isEmpty()) ) comphelper::string::padToLength(aBuf, aBuf.getLength() + nSepCount, cSep); aBuf.append(rToken); @@ -822,7 +820,7 @@ void ScGlobal::AddQuotes( OUString& rString, sal_Unicode cQuote, bool bEscapeEmb sal_Unicode pQ[3]; pQ[0] = pQ[1] = cQuote; pQ[2] = 0; - rtl::OUString aQuotes( pQ ); + OUString aQuotes( pQ ); rString = rString.replaceAll( OUString(cQuote), aQuotes); } rString = OUString( cQuote ) + OUString( cQuote ); @@ -838,7 +836,7 @@ void ScGlobal::EraseQuotes( OUString& rString, sal_Unicode cQuote, bool bUnescap sal_Unicode pQ[3]; pQ[0] = pQ[1] = cQuote; pQ[2] = 0; - rtl::OUString aQuotes( pQ ); + OUString aQuotes( pQ ); rString = rString.replaceAll( aQuotes, OUString(cQuote)); } } @@ -943,7 +941,7 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget ) SfxStringItem aUrl( SID_FILE_NAME, rURL ); SfxStringItem aTarget( SID_TARGETNAME, rTarget ); - aTarget.SetValue(rtl::OUString("_blank")); + aTarget.SetValue(OUString("_blank")); SfxViewFrame* pFrame = NULL; String aReferName; if ( pScActiveViewShell ) diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index a9c2c07045f8..64c362236b94 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -377,7 +377,7 @@ String ScGlobal::GetAbsDocName( const String& rFileName, String ScGlobal::GetDocTabName( const String& rFileName, const String& rTabName ) { - String aDocTab(rtl::OUString('\'')); + String aDocTab(OUString('\'')); aDocTab += rFileName; xub_StrLen nPos = 1; while( (nPos = aDocTab.Search( '\'', nPos )) diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index aa8734e69367..47a0c3158cd1 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -46,20 +46,20 @@ void ScGlobal::InitAddIns() { // multi paths separated by semicolons SvtPathOptions aPathOpt; - rtl::OUString aMultiPath = aPathOpt.GetAddinPath(); + OUString aMultiPath = aPathOpt.GetAddinPath(); if (aMultiPath.isEmpty()) return; sal_Int32 nTokens = comphelper::string::getTokenCount(aMultiPath, ';'); for (sal_Int32 j = 0; j < nTokens; ++j) { - rtl::OUString aPath = comphelper::string::getToken(aMultiPath, j, ';'); + OUString aPath = comphelper::string::getToken(aMultiPath, j, ';'); if (aPath.isEmpty()) continue; // use LocalFileHelper to convert the path to a URL that always points // to the file on the server - rtl::OUString aUrl; + OUString aUrl; if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) ) aPath = aUrl; @@ -72,7 +72,7 @@ void ScGlobal::InitAddIns() Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); Reference< sdbc::XResultSet > xResultSet; - Sequence< rtl::OUString > aProps; + Sequence< OUString > aProps; try { xResultSet = aCnt.createCursor( @@ -95,7 +95,7 @@ void ScGlobal::InitAddIns() { do { - rtl::OUString aId = xContentAccess->queryContentIdentifierString(); + OUString aId = xContentAccess->queryContentIdentifierString(); InitExternalFunc( aId ); } while ( xResultSet->next() ); @@ -127,7 +127,7 @@ String ScGlobal::GetOrdinalSuffix( sal_Int32 nNumber) { xOrdinalSuffix = i18n::OrdinalSuffix::create( ::comphelper::getProcessComponentContext() ); } - uno::Sequence< rtl::OUString > aSuffixes = xOrdinalSuffix->getOrdinalSuffix( nNumber, + uno::Sequence< OUString > aSuffixes = xOrdinalSuffix->getOrdinalSuffix( nNumber, ScGlobal::pLocaleData->getLanguageTag().getLocale()); if ( aSuffixes.getLength() > 0 ) return aSuffixes[0]; diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index d4156bb8a054..e8aed7776d99 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -44,7 +44,6 @@ using std::endl; #endif using ::com::sun::star::sheet::DataPilotFieldReference; -using ::rtl::OUString; using ::std::vector; namespace { diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index ea885b31dd26..cff5084ddf0a 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -48,8 +48,6 @@ #include <utility> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -468,7 +466,7 @@ struct ScCaptionInitData SfxItemSetPtr mxItemSet; /// Caption object formatting. OutlinerParaObjPtr mxOutlinerObj; /// Text object with all text portion formatting. - ::rtl::OUString maSimpleText; /// Simple text without formatting. + OUString maSimpleText; /// Simple text without formatting. Point maCaptionOffset; /// Caption position relative to cell corner. Size maCaptionSize; /// Size of the caption object. bool mbDefaultPosSize; /// True = use default position and size for caption. diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index 55b4c63b2838..231f3a2cf9a7 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -21,12 +21,12 @@ #include <com/sun/star/script/vba/VBAEventId.hpp> // ----------------------------------------------------------------------- -rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) +OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) { OSL_FAIL("invalid event number"); - return rtl::OUString(); + return OUString(); } static const sal_Char* aEventNames[] = @@ -39,7 +39,7 @@ rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) "OnChange", // SC_SHEETEVENT_CHANGE "OnCalculate" // SC_SHEETEVENT_CALCULATE }; - return rtl::OUString::createFromAscii(aEventNames[nEvent]); + return OUString::createFromAscii(aEventNames[nEvent]); } sal_Int32 ScSheetEvents::GetVbaSheetEventId(sal_Int32 nEvent) @@ -105,17 +105,17 @@ const ScSheetEvents& ScSheetEvents::operator=(const ScSheetEvents& rOther) Clear(); if (rOther.mpScriptNames) { - mpScriptNames = new rtl::OUString*[SC_SHEETEVENT_COUNT]; + mpScriptNames = new OUString*[SC_SHEETEVENT_COUNT]; for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent) if (rOther.mpScriptNames[nEvent]) - mpScriptNames[nEvent] = new rtl::OUString(*rOther.mpScriptNames[nEvent]); + mpScriptNames[nEvent] = new OUString(*rOther.mpScriptNames[nEvent]); else mpScriptNames[nEvent] = NULL; } return *this; } -const rtl::OUString* ScSheetEvents::GetScript(sal_Int32 nEvent) const +const OUString* ScSheetEvents::GetScript(sal_Int32 nEvent) const { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) { @@ -128,7 +128,7 @@ const rtl::OUString* ScSheetEvents::GetScript(sal_Int32 nEvent) const return NULL; } -void ScSheetEvents::SetScript(sal_Int32 nEvent, const rtl::OUString* pNew) +void ScSheetEvents::SetScript(sal_Int32 nEvent, const OUString* pNew) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) { @@ -138,13 +138,13 @@ void ScSheetEvents::SetScript(sal_Int32 nEvent, const rtl::OUString* pNew) if (!mpScriptNames) { - mpScriptNames = new rtl::OUString*[SC_SHEETEVENT_COUNT]; + mpScriptNames = new OUString*[SC_SHEETEVENT_COUNT]; for (sal_Int32 nEventIdx=0; nEventIdx<SC_SHEETEVENT_COUNT; ++nEventIdx) mpScriptNames[nEventIdx] = NULL; } delete mpScriptNames[nEvent]; if (pNew) - mpScriptNames[nEvent] = new rtl::OUString(*pNew); + mpScriptNames[nEvent] = new OUString(*pNew); else mpScriptNames[nEvent] = NULL; } diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index e7aa9fc18273..99c1774878d0 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -59,7 +59,7 @@ void ScSortParam::Clear() bHasHeader=bCaseSens=bUserDef=bNaturalSort = false; bByRow=bIncludePattern=bInplace = true; aCollatorLocale = ::com::sun::star::lang::Locale(); - aCollatorAlgorithm = ::rtl::OUString(); + aCollatorAlgorithm = OUString(); aKeyState.bDoSort = false; aKeyState.nField = 0; diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 546e5b9c0490..99f14d65ba08 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -437,7 +437,7 @@ void ScStyleSheetPool::CreateStandardStyles() // Kopfzeile: // [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\] //---------------------------------------- - aStr = rtl::OUString(" ()"); + aStr = OUString(" ()"); pEdEngine->SetText( aStr ); pEdEngine->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) ); pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() ); @@ -445,7 +445,7 @@ void ScStyleSheetPool::CreateStandardStyles() pHeaderItem->SetLeftArea( *pTxtObj ); pHeaderItem->SetCenterArea( *pEmptyTxtObj ); DELETEZ( pTxtObj ); - aStr = rtl::OUString(", "); + aStr = OUString(", "); pEdEngine->SetText( aStr ); pEdEngine->QuickInsertField( SvxFieldItem(SvxTimeField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) ); pEdEngine->QuickInsertField( SvxFieldItem(SvxDateField(Date( Date::SYSTEM ),SVXDATETYPE_VAR), EE_FEATURE_FIELD), diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 1415acd05089..3ef1b42b9c76 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -325,7 +325,7 @@ const String& ScStyleSheet::GetFollow() const bool ScStyleSheet::SetName( const String& rNew ) { - String aFileStdName = rtl::OUString(STRING_STANDARD); + String aFileStdName = OUString(STRING_STANDARD); if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return false; else diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 1004a7c52819..06a3e3969ac2 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -220,7 +220,7 @@ bool SetOptimalHeightsToRows(OptimalHeightsFuncObjBase& rFuncObj, // ----------------------------------------------------------------------- -ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const rtl::OUString& rNewName, +ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, bool bColInfo, bool bRowInfo ) : aName( rNewName ), aCodeName( rNewName ), @@ -339,20 +339,20 @@ ScTable::~ScTable() DestroySortCollator(); } -void ScTable::GetName( rtl::OUString& rName ) const +void ScTable::GetName( OUString& rName ) const { rName = aName; } -void ScTable::SetName( const rtl::OUString& rNewName ) +void ScTable::SetName( const OUString& rNewName ) { aName = rNewName; - aUpperName = rtl::OUString(); // invalidated if the name is changed + aUpperName = OUString(); // invalidated if the name is changed // SetStreamValid is handled in ScDocument::RenameTab } -const rtl::OUString& ScTable::GetUpperName() const +const OUString& ScTable::GetUpperName() const { if (aUpperName.isEmpty() && !aName.isEmpty()) aUpperName = ScGlobal::pCharClass->uppercase(aName); diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index f7521c2f6077..fd0db12f4d72 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1397,12 +1397,12 @@ void ScTable::SetValue( SCCOL nCol, SCROW nRow, const double& rVal ) } -void ScTable::GetString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const +void ScTable::GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetString( nRow, rString ); else - rString = rtl::OUString(); + rString = OUString(); } const OUString* ScTable::GetStringCell( SCCOL nCol, SCROW nRow ) const @@ -1421,12 +1421,12 @@ double* ScTable::GetValueCell( SCCOL nCol, SCROW nRow ) return aCol[nCol].GetValueCell(nRow); } -void ScTable::GetInputString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const +void ScTable::GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetInputString( nRow, rString ); else - rString = rtl::OUString(); + rString = OUString(); } @@ -1453,12 +1453,12 @@ void ScTable::RemoveEditTextCharAttribs( SCCOL nCol, SCROW nRow, const ScPattern return aCol[nCol].RemoveEditTextCharAttribs(nRow, rAttr); } -void ScTable::GetFormula( SCCOL nCol, SCROW nRow, rtl::OUString& rFormula ) const +void ScTable::GetFormula( SCCOL nCol, SCROW nRow, OUString& rFormula ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetFormula( nRow, rFormula ); else - rFormula = rtl::OUString(); + rFormula = OUString(); } const ScTokenArray* ScTable::GetFormulaTokens( SCCOL nCol, SCROW nRow ) const @@ -3466,7 +3466,7 @@ bool ScTable::RefVisible(ScFormulaCell* pCell) } -void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, rtl::OUString& rStr) +void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, OUString& rStr) { GetInputString(nCol, nRow, rStr); rStr = ScGlobal::pCharClass->uppercase(rStr.trim()); diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index ea82e75f9bd3..e4d89f04e90e 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -83,7 +83,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* xub_StrLen nNum = 0; if ( p[nNum] == '-' ) nNum = nNeg = 1; - while ( p[nNum] && CharClass::isAsciiNumeric( rtl::OUString(p[nNum]) ) ) + while ( p[nNum] && CharClass::isAsciiNumeric( OUString(p[nNum]) ) ) nNum++; sal_Unicode cNext = p[nNum]; // 0 if at the end @@ -92,7 +92,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* // #i5550# If there are numbers at the beginning and the end, // prefer the one at the beginning only if it's followed by a space. // Otherwise, use the number at the end, to enable things like IP addresses. - if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(rtl::OUString(cLast)) ) ) + if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(OUString(cLast)) ) ) { // number at the beginning nVal = aValue.Copy( 0, nNum ).ToInt32(); // any number with a leading zero sets the minimum number of digits @@ -105,7 +105,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* { nNeg = 0; xub_StrLen nEnd = nNum = aValue.Len() - 1; - while ( nNum && CharClass::isAsciiNumeric( rtl::OUString(p[nNum]) ) ) + while ( nNum && CharClass::isAsciiNumeric( OUString(p[nNum]) ) ) nNum--; if ( p[nNum] == '-' ) { @@ -326,14 +326,14 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } else if (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) { - rtl::OUString aStr; + OUString aStr; GetString(nCol, nRow, aStr); // fdo#39500 don't deduce increment from multiple equal list entries bool bAllSame = true; for (sal_uInt16 i = 0; i < nCount; ++i) { - rtl::OUString aTestStr; + OUString aTestStr; GetString(static_cast<SCCOL>(nCol + i* nAddX), static_cast<SCROW>(nRow + i * nAddY), aTestStr); if(aStr != aTestStr) { diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 7e3fd7f57214..cbffff1560b4 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -1097,11 +1097,11 @@ void ScTable::EndListening( const ScAddress& rAddress, SvtListener* pListener ) aCol[rAddress.Col()].EndListening( *pListener, rAddress.Row() ); } -void ScTable::SetPageStyle( const rtl::OUString& rName ) +void ScTable::SetPageStyle( const OUString& rName ) { if ( aPageStyle != rName ) { - rtl::OUString aStrNew = rName; + OUString aStrNew = rName; SfxStyleSheetBasePool* pStylePool = pDocument->GetStyleSheetPool(); SfxStyleSheetBase* pNewStyle = pStylePool->Find( aStrNew, SFX_STYLE_FAMILY_PAGE ); diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 0354e09d8264..788c1509ac77 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -40,7 +40,7 @@ using ::com::sun::star::util::SearchOptions; namespace { -bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, rtl::OUString& rVal ) +bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, OUString& rVal ) { // true = more than 1 paragraph @@ -54,13 +54,13 @@ bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, rtl::OUSt } bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bDoSearch = true; bool bDoBack = rSearchItem.GetBackward(); - rtl::OUString aString; + OUString aString; ScBaseCell* pCell; if (rSearchItem.GetSelection()) bDoSearch = rMark.IsCellMarked(nCol, nRow); @@ -157,14 +157,14 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo if (rSearchItem.GetRegExp()) { pSearchText->ReplaceBackReferences( sReplStr, aString, aSearchResult ); - rtl::OUStringBuffer aStrBuffer(aString); + OUStringBuffer aStrBuffer(aString); aStrBuffer.remove(nStart, nEnd-nStart+1); aStrBuffer.insert(nStart, sReplStr); aString = aStrBuffer.makeStringAndClear(); } else { - rtl::OUStringBuffer aStrBuffer(aString); + OUStringBuffer aStrBuffer(aString); aStrBuffer.remove(nStart, nEnd-nStart+1); aStrBuffer.insert(nStart, rSearchItem.GetReplaceString()); aString = aStrBuffer.makeStringAndClear(); @@ -273,7 +273,7 @@ void ScTable::SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bFo } bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bAll = (rSearchItem.GetCommand() == SVX_SEARCHCMD_FIND_ALL) @@ -421,7 +421,7 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, } bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = true; SCCOL nCol = 0; @@ -443,7 +443,7 @@ bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMar } bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; SCCOL nCol = rCol; @@ -473,7 +473,7 @@ bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow bool ScTable::ReplaceAll( const SvxSearchItem& rSearchItem, const ScMarkData& rMark, ScRangeList& rMatchedRanges, - rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + OUString& rUndoStr, ScDocument* pUndoDoc) { SCCOL nCol = 0; SCROW nRow = -1; @@ -664,7 +664,7 @@ bool ScTable::ReplaceAllStyle( bool ScTable::SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { sal_uInt16 nCommand = rSearchItem.GetCommand(); bool bFound = false; @@ -728,7 +728,7 @@ bool ScTable::SearchAndReplace( bool ScTable::SearchAndReplaceEmptyCells( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { SCCOL nColStart, nColEnd; SCROW nRowStart, nRowEnd; @@ -808,7 +808,7 @@ bool ScTable::SearchAndReplaceEmptyCells( namespace { bool lcl_maybeReplaceCellString( - ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, rtl::OUString& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem) + ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, OUString& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem) { ScBaseCell* pCell = rColObj.GetCell(nRow); if (!pCell || pCell->GetCellType() == CELLTYPE_NOTE) @@ -820,7 +820,7 @@ bool lcl_maybeReplaceCellString( rSearchItem.GetReplaceString().Len()) { rColObj.Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString())); - rUndoStr = rtl::OUString(); + rUndoStr = OUString(); } return true; } @@ -831,7 +831,7 @@ bool lcl_maybeReplaceCellString( bool ScTable::SearchRangeForEmptyCell( const ScRange& rRange, const SvxSearchItem& rSearchItem, - SCCOL& rCol, SCROW& rRow, rtl::OUString& rUndoStr) + SCCOL& rCol, SCROW& rRow, OUString& rUndoStr) { sal_uInt16 nCmd = rSearchItem.GetCommand(); bool bSkipFiltered = rSearchItem.IsSearchFiltered(); @@ -941,7 +941,7 @@ bool ScTable::SearchRangeForEmptyCell( bool ScTable::SearchRangeForAllEmptyCells( const ScRange& rRange, const SvxSearchItem& rSearchItem, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bReplace = (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) && diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 750aa10cfa8e..979454027f0c 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::vector; // ============================================================================ diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 588e05b4abf8..258e7e02b074 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -201,12 +201,12 @@ sal_Bool ScValidationData::DoScript( const ScAddress& rPos, const String& rInput if ( bIsValue ) aParams[0] = ::com::sun::star::uno::makeAny( nValue ); else - aParams[0] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aValStr ) ); + aParams[0] = ::com::sun::star::uno::makeAny( OUString( aValStr ) ); // 2) Position der Zelle String aPosStr; rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() ); - aParams[1] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aPosStr ) ); + aParams[1] = ::com::sun::star::uno::makeAny( OUString( aPosStr ) ); // use link-update flag to prevent closing the document // while the macro is running diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index 871578041841..6b484dea6ac8 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -36,13 +36,13 @@ private: ScUnoAddInHelpIdGenerator(); // disabled public: - ScUnoAddInHelpIdGenerator( const ::rtl::OUString& rServiceName ); + ScUnoAddInHelpIdGenerator( const OUString& rServiceName ); /** Sets service name of the AddIn. Has to be done before requesting help IDs. */ - void SetServiceName( const ::rtl::OUString& rServiceName ); + void SetServiceName( const OUString& rServiceName ); /** @return The help ID of the function with given built-in name or 0 if not found. */ - rtl::OString GetHelpId( const ::rtl::OUString& rFuncName ) const; + OString GetHelpId( const OUString& rFuncName ) const; }; diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index 3269f85d4169..05eddd11fd39 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.hxx @@ -75,13 +75,13 @@ 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/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx index d7b6f37dd459..9802196ef5d3 100644 --- a/sc/source/core/inc/cellkeytranslator.hxx +++ b/sc/source/core/inc/cellkeytranslator.hxx @@ -64,7 +64,7 @@ class ScCellKeywordTranslator { public: static void transKeyword(String& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); - static void transKeyword(rtl::OUString& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); + static void transKeyword(OUString& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); ~ScCellKeywordTranslator(); private: diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 33e48c371054..1782f443d3cb 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -53,7 +53,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const = 0; + virtual OUString getString(SCCOL nCol, SCROW nRow) const = 0; virtual SCCOL getFirstFieldColumn() const = 0; @@ -67,7 +67,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const = 0; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const = 0; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const = 0; virtual bool isRangeEqual(const ScRange& rRange) const = 0; @@ -110,7 +110,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const; + virtual OUString getString(SCCOL nCol, SCROW nRow) const; virtual SCCOL getFirstFieldColumn() const; /** @@ -123,7 +123,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const; virtual bool isRangeEqual(const ScRange& rRange) const; @@ -151,7 +151,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const; + virtual OUString getString(SCCOL nCol, SCROW nRow) const; virtual SCCOL getFirstFieldColumn() const; @@ -165,7 +165,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const; virtual bool isRangeEqual(const ScRange& rRange) const; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index e3eeb4a2b9c8..fd4c27e40b8d 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -54,9 +54,9 @@ using namespace com::sun::star; #define SC_CALLERPOS_NONE (-1) -ScUnoAddInFuncData::ScUnoAddInFuncData( const ::rtl::OUString& rNam, const ::rtl::OUString& rLoc, - const ::rtl::OUString& rDesc, - sal_uInt16 nCat, const rtl::OString& sHelp, +ScUnoAddInFuncData::ScUnoAddInFuncData( const OUString& rNam, const OUString& rLoc, + const OUString& rDesc, + sal_uInt16 nCat, const OString& sHelp, const uno::Reference<reflection::XIdlMethod>& rFunc, const uno::Any& rO, long nAC, const ScAddInArgDesc* pAD, @@ -104,7 +104,7 @@ const uno::Sequence<sheet::LocalizedName>& ScUnoAddInFuncData::GetCompNames() co uno::Reference<sheet::XCompatibilityNames> xComp( xAddIn, uno::UNO_QUERY ); if ( xComp.is() && xFunction.is() ) { - rtl::OUString aMethodName = xFunction->getName(); + OUString aMethodName = xFunction->getName(); aCompNames = xComp->getCompatibilityNames( aMethodName ); // change all locale entries to default case @@ -155,7 +155,7 @@ void ScUnoAddInFuncData::SetCompNames( const uno::Sequence< sheet::LocalizedName bCompInitialized = sal_True; } -sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, ::rtl::OUString& rRetExcelName ) const +sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, OUString& rRetExcelName ) const { const uno::Sequence<sheet::LocalizedName>& rSequence = GetCompNames(); long nSeqLen = rSequence.getLength(); @@ -165,10 +165,10 @@ sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, ::rtl::OUStri long i; /* FIXME-BCP47: we may want to handle language tags here as well. */ - rtl::OUString aLangStr, aCountryStr; + OUString aLangStr, aCountryStr; LanguageTag( eDestLang ).getIsoLanguageCountry( aLangStr, aCountryStr ); - rtl::OUString aUserLang = aLangStr.toAsciiLowerCase(); - rtl::OUString aUserCountry = aCountryStr.toAsciiUpperCase(); + OUString aUserLang = aLangStr.toAsciiLowerCase(); + OUString aUserCountry = aCountryStr.toAsciiUpperCase(); // first check for match of both language and country @@ -326,7 +326,7 @@ void ScUnoAddInCollection::Initialize() } // ----------------------------------------------------------------------------- -static sal_uInt16 lcl_GetCategory( const ::rtl::OUString& rName ) +static sal_uInt16 lcl_GetCategory( const OUString& rName ) { static const sal_Char* aFuncNames[SC_FUNCGROUP_COUNT] = { @@ -375,26 +375,26 @@ void ScUnoAddInCollection::ReadConfiguration() ScAddInCfg& rAddInConfig = SC_MOD()->GetAddInCfg(); // additional, temporary config item for the compatibility names - ScLinkConfigItem aAllLocalesConfig( rtl::OUString(CFGPATH_ADDINS), CONFIG_MODE_ALL_LOCALES ); + ScLinkConfigItem aAllLocalesConfig( OUString(CFGPATH_ADDINS), CONFIG_MODE_ALL_LOCALES ); // CommitLink is not used (only reading values) - const rtl::OUString sSlash('/'); + const OUString sSlash('/'); // get the list of add-ins (services) - rtl::OUString aEmptyString; - uno::Sequence<rtl::OUString> aServiceNames = rAddInConfig.GetNodeNames( aEmptyString ); + OUString aEmptyString; + uno::Sequence<OUString> aServiceNames = rAddInConfig.GetNodeNames( aEmptyString ); sal_Int32 nServiceCount = aServiceNames.getLength(); for ( sal_Int32 nService = 0; nService < nServiceCount; nService++ ) { - rtl::OUString aServiceName = aServiceNames[nService]; + OUString aServiceName = aServiceNames[nService]; ScUnoAddInHelpIdGenerator aHelpIdGenerator( aServiceName ); - rtl::OUString aFunctionsPath = aServiceName; + OUString aFunctionsPath = aServiceName; aFunctionsPath += sSlash; - aFunctionsPath += rtl::OUString(CFGSTR_ADDINFUNCTIONS); + aFunctionsPath += OUString(CFGSTR_ADDINFUNCTIONS); - uno::Sequence<rtl::OUString> aFunctionNames = rAddInConfig.GetNodeNames( aFunctionsPath ); + uno::Sequence<OUString> aFunctionNames = rAddInConfig.GetNodeNames( aFunctionsPath ); sal_Int32 nNewCount = aFunctionNames.getLength(); // allocate pointers @@ -422,41 +422,41 @@ void ScUnoAddInCollection::ReadConfiguration() //! get the function information in a single call for all functions? - const rtl::OUString* pFuncNameArray = aFunctionNames.getConstArray(); + const OUString* pFuncNameArray = aFunctionNames.getConstArray(); for ( sal_Int32 nFuncPos = 0; nFuncPos < nNewCount; nFuncPos++ ) { ppFuncData[nFuncPos+nOld] = NULL; // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+pFuncNameArray[nFuncPos].getLength()); + OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+pFuncNameArray[nFuncPos].getLength()); aFuncNameBuffer.append(aServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(pFuncNameArray[nFuncPos]); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); // skip the function if already known (read from old AddIn service) if ( pExactHashMap->find( aFuncName ) == pExactHashMap->end() ) { - rtl::OUString aLocalName; - rtl::OUString aDescription; + OUString aLocalName; + OUString aDescription; sal_uInt16 nCategory = ID_FUNCTION_GRP_ADDINS; // get direct information on the function - rtl::OUString aFuncPropPath = aFunctionsPath; + OUString aFuncPropPath = aFunctionsPath; aFuncPropPath += sSlash; aFuncPropPath += pFuncNameArray[nFuncPos]; aFuncPropPath += sSlash; - uno::Sequence<rtl::OUString> aFuncPropNames(CFG_FUNCPROP_COUNT); - rtl::OUString* pNameArray = aFuncPropNames.getArray(); + uno::Sequence<OUString> aFuncPropNames(CFG_FUNCPROP_COUNT); + OUString* pNameArray = aFuncPropNames.getArray(); pNameArray[CFG_FUNCPROP_DISPLAYNAME] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_DISPLAYNAME] += rtl::OUString(CFGSTR_DISPLAYNAME); + pNameArray[CFG_FUNCPROP_DISPLAYNAME] += OUString(CFGSTR_DISPLAYNAME); pNameArray[CFG_FUNCPROP_DESCRIPTION] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_DESCRIPTION] += rtl::OUString(CFGSTR_DESCRIPTION); + pNameArray[CFG_FUNCPROP_DESCRIPTION] += OUString(CFGSTR_DESCRIPTION); pNameArray[CFG_FUNCPROP_CATEGORY] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_CATEGORY] += rtl::OUString(CFGSTR_CATEGORY); + pNameArray[CFG_FUNCPROP_CATEGORY] += OUString(CFGSTR_CATEGORY); uno::Sequence<uno::Any> aFuncProperties = rAddInConfig.GetProperties( aFuncPropNames ); if ( aFuncProperties.getLength() == CFG_FUNCPROP_COUNT ) @@ -464,7 +464,7 @@ void ScUnoAddInCollection::ReadConfiguration() aFuncProperties[CFG_FUNCPROP_DISPLAYNAME] >>= aLocalName; aFuncProperties[CFG_FUNCPROP_DESCRIPTION] >>= aDescription; - rtl::OUString aCategoryName; + OUString aCategoryName; aFuncProperties[CFG_FUNCPROP_CATEGORY] >>= aCategoryName; nCategory = lcl_GetCategory( aCategoryName ); } @@ -473,9 +473,9 @@ void ScUnoAddInCollection::ReadConfiguration() uno::Sequence<sheet::LocalizedName> aCompNames; - rtl::OUString aCompPath = aFuncPropPath; - aCompPath += rtl::OUString(CFGSTR_COMPATIBILITYNAME); - uno::Sequence<rtl::OUString> aCompPropNames( &aCompPath, 1 ); + OUString aCompPath = aFuncPropPath; + aCompPath += OUString(CFGSTR_COMPATIBILITYNAME); + uno::Sequence<OUString> aCompPropNames( &aCompPath, 1 ); uno::Sequence<uno::Any> aCompProperties = aAllLocalesConfig.GetProperties( aCompPropNames ); if ( aCompProperties.getLength() == 1 ) @@ -494,7 +494,7 @@ void ScUnoAddInCollection::ReadConfiguration() // PropertyValue name is the locale (convert from string to Locale struct) - const rtl::OUString& rLocaleStr = pConfigArray[nLocale].Name; + const OUString& rLocaleStr = pConfigArray[nLocale].Name; lang::Locale& rLocale = pCompArray[nLocale].Locale; sal_Int32 nSepPos = rLocaleStr.indexOf( cLocaleSep ); if ( nSepPos >= 0 ) @@ -518,39 +518,39 @@ void ScUnoAddInCollection::ReadConfiguration() long nVisibleCount = 0; long nCallerPos = SC_CALLERPOS_NONE; - rtl::OUString aArgumentsPath = aFuncPropPath; - aArgumentsPath += rtl::OUString(CFGSTR_PARAMETERS); + OUString aArgumentsPath = aFuncPropPath; + aArgumentsPath += OUString(CFGSTR_PARAMETERS); - uno::Sequence<rtl::OUString> aArgumentNames = rAddInConfig.GetNodeNames( aArgumentsPath ); + uno::Sequence<OUString> aArgumentNames = rAddInConfig.GetNodeNames( aArgumentsPath ); sal_Int32 nArgumentCount = aArgumentNames.getLength(); if ( nArgumentCount ) { // get DisplayName and Description for each argument - uno::Sequence<rtl::OUString> aArgPropNames( nArgumentCount * 2 ); - rtl::OUString* pPropNameArray = aArgPropNames.getArray(); + uno::Sequence<OUString> aArgPropNames( nArgumentCount * 2 ); + OUString* pPropNameArray = aArgPropNames.getArray(); sal_Int32 nArgument; sal_Int32 nIndex = 0; - const rtl::OUString* pArgNameArray = aArgumentNames.getConstArray(); + const OUString* pArgNameArray = aArgumentNames.getConstArray(); for ( nArgument = 0; nArgument < nArgumentCount; nArgument++ ) { - rtl::OUString aOneArgPath = aArgumentsPath; + OUString aOneArgPath = aArgumentsPath; aOneArgPath += sSlash; aOneArgPath += pArgNameArray[nArgument]; aOneArgPath += sSlash; pPropNameArray[nIndex] = aOneArgPath; - pPropNameArray[nIndex++] += rtl::OUString(CFGSTR_DISPLAYNAME); + pPropNameArray[nIndex++] += OUString(CFGSTR_DISPLAYNAME); pPropNameArray[nIndex] = aOneArgPath; - pPropNameArray[nIndex++] += rtl::OUString(CFGSTR_DESCRIPTION); + pPropNameArray[nIndex++] += OUString(CFGSTR_DESCRIPTION); } uno::Sequence<uno::Any> aArgProperties = rAddInConfig.GetProperties( aArgPropNames ); if ( aArgProperties.getLength() == aArgPropNames.getLength() ) { const uno::Any* pPropArray = aArgProperties.getConstArray(); - rtl::OUString sDisplayName; - rtl::OUString sDescription; + OUString sDisplayName; + OUString sDescription; ScAddInArgDesc aDesc; aDesc.eType = SC_ADDINARG_NONE; // arg type is not in configuration @@ -574,7 +574,7 @@ void ScUnoAddInCollection::ReadConfiguration() } } - rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); + OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); uno::Reference<reflection::XIdlMethod> xFunc; // remains empty uno::Any aObject; // also empty @@ -612,11 +612,11 @@ void ScUnoAddInCollection::ReadConfiguration() void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData ) { - ::rtl::OUString aFullName = rFuncData.GetOriginalName(); + OUString aFullName = rFuncData.GetOriginalName(); sal_Int32 nPos = aFullName.lastIndexOf( (sal_Unicode) '.' ); if ( nPos > 0 ) { - ::rtl::OUString aServiceName = aFullName.copy( 0, nPos ); + OUString aServiceName = aFullName.copy( 0, nPos ); uno::Reference<lang::XMultiServiceFactory> xServiceFactory = comphelper::getProcessServiceFactory(); uno::Reference<uno::XInterface> xInterface( xServiceFactory->createInstance( aServiceName ) ); @@ -626,8 +626,8 @@ void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData ) } } -sal_Bool ScUnoAddInCollection::GetExcelName( const ::rtl::OUString& rCalcName, - LanguageType eDestLang, ::rtl::OUString& rRetExcelName ) +sal_Bool ScUnoAddInCollection::GetExcelName( const OUString& rCalcName, + LanguageType eDestLang, OUString& rRetExcelName ) { const ScUnoAddInFuncData* pFuncData = GetFuncData( rCalcName ); if ( pFuncData ) @@ -635,12 +635,12 @@ sal_Bool ScUnoAddInCollection::GetExcelName( const ::rtl::OUString& rCalcName, return false; } -sal_Bool ScUnoAddInCollection::GetCalcName( const ::rtl::OUString& rExcelName, ::rtl::OUString& rRetCalcName ) +sal_Bool ScUnoAddInCollection::GetCalcName( const OUString& rExcelName, OUString& rRetCalcName ) { if (!bInitialized) Initialize(); - rtl::OUString aUpperCmp = ScGlobal::pCharClass->uppercase(rExcelName); + OUString aUpperCmp = ScGlobal::pCharClass->uppercase(rExcelName); for (long i=0; i<nFuncCount; i++) { @@ -667,7 +667,7 @@ sal_Bool ScUnoAddInCollection::GetCalcName( const ::rtl::OUString& rExcelName, : return false; } -inline sal_Bool IsTypeName( const rtl::OUString& rName, const uno::Type& rType ) +inline sal_Bool IsTypeName( const OUString& rName, const uno::Type& rType ) { return rName == rType.getTypeName(); } @@ -699,7 +699,7 @@ static sal_Bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass> // return type XInterface may contain a XVolatileResult //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); return ( IsTypeName( sName, getCppuType((uno::Reference<sheet::XVolatileResult>*)0) ) || IsTypeName( sName, getCppuType((uno::Reference<uno::XInterface>*)0) ) ); @@ -710,11 +710,11 @@ static sal_Bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass> // nested sequences for arrays //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); return ( IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<sal_Int32> >*)0) ) || IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<double> >*)0) ) || - IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<rtl::OUString> >*)0) ) || + IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<OUString> >*)0) ) || IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<uno::Any> >*)0) ) ); } } @@ -737,7 +737,7 @@ static ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdl return SC_ADDINARG_STRING; //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<sal_Int32> >*)0) )) return SC_ADDINARG_INTEGER_ARRAY; @@ -745,7 +745,7 @@ static ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdl if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<double> >*)0) )) return SC_ADDINARG_DOUBLE_ARRAY; - if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<rtl::OUString> >*)0) )) + if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<OUString> >*)0) )) return SC_ADDINARG_STRING_ARRAY; if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<uno::Any> >*)0) )) @@ -776,7 +776,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& lang::Locale aLocale( Application::GetSettings().GetUILanguageTag().getLocale()); xAddIn->setLocale( aLocale ); - ::rtl::OUString aServiceName( xName->getServiceName() ); + OUString aServiceName( xName->getServiceName() ); ScUnoAddInHelpIdGenerator aHelpIdGenerator( xName->getServiceName() ); //! pass XIntrospection to ReadFromAddIn @@ -830,7 +830,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& if ( xClass.is() ) { //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); bSkip = ( IsTypeName( sName, getCppuType((uno::Reference<uno::XInterface>*)0) ) || @@ -850,14 +850,14 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& } if (!bSkip) { - rtl::OUString aFuncU = xFunc->getName(); + OUString aFuncU = xFunc->getName(); // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+aFuncU.getLength()); + OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+aFuncU.getLength()); aFuncNameBuffer.append(aServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(aFuncU); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); sal_Bool bValid = sal_True; long nVisibleCount = 0; @@ -887,9 +887,9 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& sal_uInt16 nCategory = lcl_GetCategory( xAddIn->getProgrammaticCategoryName( aFuncU ) ); - rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); + OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); - ::rtl::OUString aLocalName; + OUString aLocalName; try { aLocalName = xAddIn-> @@ -900,7 +900,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& aLocalName = "###"; } - ::rtl::OUString aDescription; + OUString aDescription; try { aDescription = xAddIn-> @@ -924,7 +924,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& ScAddInArgumentType eArgType = lcl_GetArgType( xParClass ); if ( eArgType != SC_ADDINARG_CALLER ) { - rtl::OUString aArgName; + OUString aArgName; try { aArgName = xAddIn-> @@ -934,7 +934,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& { aArgName = "###"; } - rtl::OUString aArgDesc; + OUString aArgDesc; try { aArgDesc = xAddIn-> @@ -995,7 +995,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& static void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAddInFuncData& rFuncData ) { - ::rtl::OUString aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData + OUString aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData sal_uLong nCount = rFunctionList.GetCount(); for (sal_uLong nPos=0; nPos<nCount; nPos++) @@ -1009,7 +1009,7 @@ static void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAd } } -static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncData, const ::rtl::OUString& rArgIntName ) +static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncData, const OUString& rArgIntName ) { long nArgCount = rFuncData.GetArgumentCount(); const ScAddInArgDesc* pArguments = rFuncData.GetArguments(); @@ -1022,7 +1022,7 @@ static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncDat } void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface>& xInterface, - const ::rtl::OUString& rServiceName ) + const OUString& rServiceName ) { uno::Reference<lang::XLocalizable> xLoc( xInterface, uno::UNO_QUERY ); if ( xLoc.is() ) // optional in new add-ins @@ -1056,14 +1056,14 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface uno::Reference<reflection::XIdlMethod> xFunc = pArray[nFuncPos]; if (xFunc.is()) { - rtl::OUString aFuncU = xFunc->getName(); + OUString aFuncU = xFunc->getName(); // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( rServiceName.getLength()+1+aFuncU.getLength()); + OUStringBuffer aFuncNameBuffer( rServiceName.getLength()+1+aFuncU.getLength()); aFuncNameBuffer.append(rServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(aFuncU); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); // internal names are skipped because no FuncData exists ScUnoAddInFuncData* pOldData = const_cast<ScUnoAddInFuncData*>( GetFuncData( aFuncName ) ); @@ -1152,7 +1152,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface } } -::rtl::OUString ScUnoAddInCollection::FindFunction( const ::rtl::OUString& rUpperName, sal_Bool bLocalFirst ) +OUString ScUnoAddInCollection::FindFunction( const OUString& rUpperName, sal_Bool bLocalFirst ) { if (!bInitialized) Initialize(); @@ -1187,7 +1187,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface return EMPTY_OUSTRING; } -const ScUnoAddInFuncData* ScUnoAddInCollection::GetFuncData( const ::rtl::OUString& rName, bool bComplete ) +const ScUnoAddInFuncData* ScUnoAddInCollection::GetFuncData( const OUString& rName, bool bComplete ) { if (!bInitialized) Initialize(); @@ -1218,7 +1218,7 @@ const ScUnoAddInFuncData* ScUnoAddInCollection::GetFuncData( long nIndex ) return NULL; } -void ScUnoAddInCollection::LocalizeString( ::rtl::OUString& rName ) +void ScUnoAddInCollection::LocalizeString( OUString& rName ) { if (!bInitialized) Initialize(); @@ -1267,14 +1267,14 @@ sal_Bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncDat // nFIndex is set from outside - rDesc.pFuncName = new ::rtl::OUString( rFuncData.GetUpperLocal() ); //! upper? + rDesc.pFuncName = new OUString( rFuncData.GetUpperLocal() ); //! upper? rDesc.nCategory = rFuncData.GetCategory(); rDesc.sHelpId = rFuncData.GetHelpId(); - ::rtl::OUString aDesc = rFuncData.GetDescription(); + OUString aDesc = rFuncData.GetDescription(); if (aDesc.isEmpty()) aDesc = rFuncData.GetLocalName(); // use name if no description is available - rDesc.pFuncDesc = new ::rtl::OUString( aDesc ); + rDesc.pFuncDesc = new OUString( aDesc ); // AddInArgumentType_CALLER is already left out in FuncData @@ -1284,21 +1284,21 @@ sal_Bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncDat sal_Bool bMultiple = false; const ScAddInArgDesc* pArgs = rFuncData.GetArguments(); - rDesc.ppDefArgNames = new ::rtl::OUString*[nArgCount]; - rDesc.ppDefArgDescs = new ::rtl::OUString*[nArgCount]; + rDesc.ppDefArgNames = new OUString*[nArgCount]; + rDesc.ppDefArgDescs = new OUString*[nArgCount]; rDesc.pDefArgFlags = new ScFuncDesc::ParameterFlags[nArgCount]; for ( long nArg=0; nArg<nArgCount; nArg++ ) { - rDesc.ppDefArgNames[nArg] = new ::rtl::OUString( pArgs[nArg].aName ); - rDesc.ppDefArgDescs[nArg] = new ::rtl::OUString( pArgs[nArg].aDescription ); + rDesc.ppDefArgNames[nArg] = new OUString( pArgs[nArg].aName ); + rDesc.ppDefArgDescs[nArg] = new OUString( pArgs[nArg].aDescription ); rDesc.pDefArgFlags[nArg].bOptional = pArgs[nArg].bOptional; rDesc.pDefArgFlags[nArg].bSuppress = false; // no empty names... if ( rDesc.ppDefArgNames[nArg]->isEmpty() ) { - ::rtl::OUString aDefName("arg"); - aDefName += ::rtl::OUString::valueOf( nArg+1 ); + OUString aDefName("arg"); + aDefName += OUString::valueOf( nArg+1 ); *rDesc.ppDefArgNames[nArg] = aDefName; } @@ -1319,7 +1319,7 @@ sal_Bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncDat //------------------------------------------------------------------------ -ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const ::rtl::OUString& rName, +ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const OUString& rName, long nParamCount ) : bValidCount( false ), nErrCode( errNoCode ), // before function was called @@ -1663,19 +1663,19 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) } } } - else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<rtl::OUString> > *)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<OUString> > *)0 ) ) ) { - const uno::Sequence< uno::Sequence<rtl::OUString> >* pRowSeq = NULL; + const uno::Sequence< uno::Sequence<OUString> >* pRowSeq = NULL; //! use pointer from any! - uno::Sequence< uno::Sequence<rtl::OUString> > aSequence; + uno::Sequence< uno::Sequence<OUString> > aSequence; if ( rNewRes >>= aSequence ) pRowSeq = &aSequence; if ( pRowSeq ) { long nRowCount = pRowSeq->getLength(); - const uno::Sequence<rtl::OUString>* pRowArr = pRowSeq->getConstArray(); + const uno::Sequence<OUString>* pRowArr = pRowSeq->getConstArray(); long nMaxColCount = 0; long nCol, nRow; for (nRow=0; nRow<nRowCount; nRow++) @@ -1692,7 +1692,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) for (nRow=0; nRow<nRowCount; nRow++) { long nColCount = pRowArr[nRow].getLength(); - const rtl::OUString* pColArr = pRowArr[nRow].getConstArray(); + const OUString* pColArr = pRowArr[nRow].getConstArray(); for (nCol=0; nCol<nColCount; nCol++) xMatrix->PutString( pColArr[nCol], static_cast<SCSIZE>(nCol), diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index ff36337ac7b1..5b41833ba445 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -158,12 +158,12 @@ const ScUnoAddInHelpId pDateFuncHelpIds[] = // ============================================================================ -ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator( const ::rtl::OUString& rServiceName ) +ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator( const OUString& rServiceName ) { SetServiceName( rServiceName ); } -void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceName ) +void ScUnoAddInHelpIdGenerator::SetServiceName( const OUString& rServiceName ) { pCurrHelpIds = NULL; sal_uInt32 nSize = 0; @@ -182,10 +182,10 @@ void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceN nArrayCount = nSize / sizeof( ScUnoAddInHelpId ); } -rtl::OString ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncName ) const +OString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const { if( !pCurrHelpIds || !nArrayCount ) - return rtl::OString(); + return OString(); const ScUnoAddInHelpId* pFirst = pCurrHelpIds; const ScUnoAddInHelpId* pLast = pCurrHelpIds + nArrayCount - 1; @@ -202,7 +202,7 @@ rtl::OString ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncN pFirst = pMiddle + 1; } - return rtl::OString(); + return OString(); } diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 9a8fe8f5e22a..cdc13803a4cf 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -35,7 +35,6 @@ #include <tools/urlobj.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; const ScAddress::Details ScAddress::detailsOOOa1( formula::FormulaGrammar::CONV_OOO, 0, 0 ); @@ -363,7 +362,7 @@ static bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, String& rExtern { case sheet::ExternalLinkType::DOCUMENT : { - rtl::OUString aStr; + OUString aStr; if (!(rInfo.Data >>= aStr)) { OSL_TRACE( "ScRange::Parse_XL_Header: Data type mismatch for ExternalLinkInfo %d", i); @@ -1119,7 +1118,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd } else { - rtl::OUString aTmp( p ); + OUString aTmp( p ); long n = aTmp.toInt32() - 1; while (CharClass::isAsciiDigit( *p )) p++; @@ -1698,7 +1697,7 @@ void ScAddress::Format( String& r, sal_uInt16 nFlags, const ScDocument* pDoc, if( nFlags & SCA_TAB_3D ) { String aTabName, aDocName; - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); aTabName = aTmp; // TODO: remove use of String here. // External Reference, same as in ScCompiler::MakeTabStr() @@ -1775,7 +1774,7 @@ lcl_Split_DocTab( const ScDocument* pDoc, SCTAB nTab, sal_uInt16 nFlags, String& rTabName, String& rDocName ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); rTabName = aTmp; rDocName.Erase(); @@ -2033,7 +2032,7 @@ String ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab, //------------------------------------------------------------------------ -void ScColToAlpha( rtl::OUStringBuffer& rBuf, SCCOL nCol ) +void ScColToAlpha( OUStringBuffer& rBuf, SCCOL nCol ) { if (nCol < 26*26) { diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index b333155fb1b4..45a256e6daa2 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //======================================================================== // ScAppOptions - Applikations-Optionen diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index dc07cda3b5f7..ec010497a1ba 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -30,7 +30,6 @@ using ::com::sun::star::lang::Locale; using ::com::sun::star::uno::Sequence; using ::std::list; using ::boost::unordered_map; -using ::rtl::OUString; using namespace ::com::sun::star; @@ -84,7 +83,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, { // Since no locale nor opcode matching is needed, simply return // the first item on the list. - rName = rtl::OUString::createFromAscii( itr->second.front().mpName ); + rName = OUString::createFromAscii( itr->second.front().mpName ); return; } @@ -104,7 +103,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching opcode and locale found. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -125,7 +124,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( itrList->meOpCode == eOpCode ) { // Name with a matching opcode preferred. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } } @@ -135,7 +134,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching locale preferred. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -148,7 +147,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, } // No preferred strings found. Return the best matching name. - rName = rtl::OUString::createFromAscii(aBestMatchName); + rName = OUString::createFromAscii(aBestMatchName); } void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, OpCode eOpCode) @@ -162,7 +161,7 @@ void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, lclMatchKeyword(rName, spInstance->maStringNameMap, eOpCode, pLocale); } -void ScCellKeywordTranslator::transKeyword(rtl::OUString& rName, const Locale* pLocale, OpCode eOpCode) +void ScCellKeywordTranslator::transKeyword(OUString& rName, const Locale* pLocale, OpCode eOpCode) { String aName = rName; transKeyword(aName, pLocale, eOpCode); @@ -225,7 +224,7 @@ void ScCellKeywordTranslator::addToMap(const String& rKey, const sal_Char* pName void ScCellKeywordTranslator::addToMap(const TransItem* pItems, const Locale& rLocale) { for (sal_uInt16 i = 0; pItems[i].from != NULL; ++i) - addToMap(rtl::OUString(pItems[i].from), pItems[i].to, rLocale, pItems[i].func); + addToMap(OUString(pItems[i].from), pItems[i].to, rLocale, pItems[i].func); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 26716c1a8e65..7abb78751816 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -32,8 +32,6 @@ #include <vector> using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 67da7473c54d..0b0f7a1197ee 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -107,7 +107,7 @@ boost::unordered_set<sal_uInt16>& ScChartListener::ExternalRefListener::getAllFi // ---------------------------------------------------------------------------- -ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, +ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : SvtListener(), mpExtRefListener(NULL), @@ -122,7 +122,7 @@ ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, ScRefTokenHelper::getTokensFromRangeList(*mpTokens, *rRangeList); } -ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, vector<ScTokenRef>* pTokens ) : +ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, vector<ScTokenRef>* pTokens ) : SvtListener(), mpExtRefListener(NULL), mpTokens(pTokens), @@ -183,7 +183,7 @@ ScChartListener::~ScChartListener() } } -const rtl::OUString& ScChartListener::GetName() const +const OUString& ScChartListener::GetName() const { return maName; } @@ -465,17 +465,17 @@ void ScChartListenerCollection::StartAllListeners() void ScChartListenerCollection::insert(ScChartListener* pListener) { - rtl::OUString aName = pListener->GetName(); + OUString aName = pListener->GetName(); maListeners.insert(aName, pListener); } -ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString& rName) +ScChartListener* ScChartListenerCollection::findByName(const OUString& rName) { ListenersType::iterator it = maListeners.find(rName); return it == maListeners.end() ? NULL : it->second; } -const ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString& rName) const +const ScChartListener* ScChartListenerCollection::findByName(const OUString& rName) const { ListenersType::const_iterator it = maListeners.find(rName); return it == maListeners.end() ? NULL : it->second; @@ -501,17 +501,17 @@ ScChartListenerCollection::StringSetType& ScChartListenerCollection::getNonOleOb return maNonOleObjectNames; } -rtl::OUString ScChartListenerCollection::getUniqueName(const rtl::OUString& rPrefix) const +OUString ScChartListenerCollection::getUniqueName(const OUString& rPrefix) const { for (sal_Int32 nNum = 1; nNum < 10000; ++nNum) // arbitrary limit to prevent infinite loop. { - rtl::OUStringBuffer aBuf(rPrefix); + OUStringBuffer aBuf(rPrefix); aBuf.append(nNum); - rtl::OUString aTestName = aBuf.makeStringAndClear(); + OUString aTestName = aBuf.makeStringAndClear(); if (maListeners.find(aTestName) == maListeners.end()) return aTestName; } - return rtl::OUString(); + return OUString(); } void ScChartListenerCollection::ChangeListening( const String& rName, @@ -544,7 +544,7 @@ public: void operator() (ScChartListener* p) { - rtl::OUString aName = p->GetName(); + OUString aName = p->GetName(); mrListeners.insert(aName, p); } }; diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index cf0212851878..5425056769e0 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -68,7 +68,7 @@ ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScBigRange& rRange, const sal_uLong nTempAction, const sal_uLong nTempRejectAction, const ScChangeActionState eTempState, const DateTime& aTempDateTime, - const rtl::OUString& aTempUser, const rtl::OUString& aTempComment) : + const OUString& aTempUser, const OUString& aTempComment) : aBigRange( rRange ), aDateTime( aTempDateTime ), aUser( aTempUser ), @@ -431,7 +431,7 @@ void ScChangeAction::UpdateReference( const ScChangeTrack* /* pTrack */, void ScChangeAction::GetDescription( - rtl::OUString& rStr, ScDocument* /* pDoc */, bool /* bSplitRange */, bool bWarning ) const + OUString& rStr, ScDocument* /* pDoc */, bool /* bSplitRange */, bool bWarning ) const { if (!IsRejecting() || !bWarning) return; @@ -440,7 +440,7 @@ void ScChangeAction::GetDescription( // not properly restored in formulas. See specification at // http://specs.openoffice.org/calc/ease-of-use/redlining_comment.sxw - rtl::OUStringBuffer aBuf(rStr); // Take the original string. + OUStringBuffer aBuf(rStr); // Take the original string. if (GetType() == SC_CAT_MOVE) { aBuf.append( @@ -515,10 +515,10 @@ void ScChangeAction::GetDescription( } -rtl::OUString ScChangeAction::GetRefString( +OUString ScChangeAction::GetRefString( const ScBigRange& rRange, ScDocument* pDoc, bool bFlag3D ) const { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_uInt16 nFlags = ( rRange.IsValid( pDoc ) ? SCA_VALID : 0 ); if ( !nFlags ) aBuf.append(ScGlobal::GetRscString(STR_NOREF_STR)); @@ -531,7 +531,7 @@ rtl::OUString ScChangeAction::GetRefString( case SC_CAT_DELETE_COLS : if ( bFlag3D ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName( aTmpRange.aStart.Tab(), aTmp ); aBuf.append(aTmp); aBuf.append(sal_Unicode('.')); @@ -544,7 +544,7 @@ rtl::OUString ScChangeAction::GetRefString( case SC_CAT_DELETE_ROWS : if ( bFlag3D ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName( aTmpRange.aStart.Tab(), aTmp ); aBuf.append(aTmp); aBuf.append(sal_Unicode('.')); @@ -558,7 +558,7 @@ rtl::OUString ScChangeAction::GetRefString( if ( bFlag3D || GetType() == SC_CAT_INSERT_TABS ) nFlags |= SCA_TAB_3D; - rtl::OUString aTmp; + OUString aTmp; aTmpRange.Format(aTmp, nFlags, pDoc, pDoc->GetAddressConvention()); aBuf.append(aTmp); } @@ -572,28 +572,28 @@ rtl::OUString ScChangeAction::GetRefString( return aBuf.makeStringAndClear(); } -const rtl::OUString& ScChangeAction::GetUser() const +const OUString& ScChangeAction::GetUser() const { return aUser; } -void ScChangeAction::SetUser( const rtl::OUString& r ) +void ScChangeAction::SetUser( const OUString& r ) { aUser = r; } -const rtl::OUString& ScChangeAction::GetComment() const +const OUString& ScChangeAction::GetComment() const { return aComment; } -void ScChangeAction::SetComment( const rtl::OUString& rStr ) +void ScChangeAction::SetComment( const OUString& rStr ) { aComment = rStr; } void ScChangeAction::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { rStr = GetRefString( GetBigRange(), pDoc, bFlag3D ); } @@ -717,8 +717,8 @@ ScChangeActionIns::ScChangeActionIns( const ScRange& rRange ) ScChangeActionIns::ScChangeActionIns( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, - const rtl::OUString& sComment, const ScChangeActionType eTypeP) : + const OUString& aUserP, const DateTime& aDateTimeP, + const OUString& sComment, const ScChangeActionType eTypeP) : ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment) { } @@ -728,7 +728,7 @@ ScChangeActionIns::~ScChangeActionIns() } void ScChangeActionIns::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); @@ -745,15 +745,15 @@ void ScChangeActionIns::GetDescription( nWhatId = STR_AREA; } - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_INSERT); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_INSERT); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { // Construct a range string to replace '#1' first. - rtl::OUStringBuffer aBuf(ScGlobal::GetRscString(nWhatId)); + OUStringBuffer aBuf(ScGlobal::GetRscString(nWhatId)); aBuf.append(sal_Unicode(' ')); aBuf.append(GetRefString(GetBigRange(), pDoc)); - rtl::OUString aRangeStr = aBuf.makeStringAndClear(); + OUString aRangeStr = aBuf.makeStringAndClear(); aRsc = aRsc.replaceAt(nPos, 2, aRangeStr); // replace '#1' with the range string. @@ -837,7 +837,7 @@ ScChangeActionDel::ScChangeActionDel( const ScRange& rRange, ScChangeActionDel::ScChangeActionDel( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, const rtl::OUString &sComment, + const OUString& aUserP, const DateTime& aDateTimeP, const OUString &sComment, const ScChangeActionType eTypeP, const SCsCOLROW nD, ScChangeTrack* pTrackP) : // wich of nDx and nDy is set is depend on the type ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment), pTrack( pTrackP ), @@ -973,7 +973,7 @@ ScBigRange ScChangeActionDel::GetOverAllRange() const void ScChangeActionDel::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); @@ -1002,16 +1002,16 @@ void ScChangeActionDel::GetDescription( aTmpRange.aEnd.SetRow( aTmpRange.aEnd.Row() + GetDy() ); } - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_DELETE); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_DELETE); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { // Build a string to replace with. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScGlobal::GetRscString(nWhatId)); aBuf.append(sal_Unicode(' ')); aBuf.append(GetRefString(aTmpRange, pDoc)); - rtl::OUString aRangeStr = aBuf.makeStringAndClear(); + OUString aRangeStr = aBuf.makeStringAndClear(); aRsc = aRsc.replaceAt(nPos, 2, aRangeStr); // replace '#1' with the string. aBuf.append(rStr).append(aRsc); @@ -1064,7 +1064,7 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc ) case SC_CAT_DELETE_TABS : { //2do: Tabellennamen merken? - rtl::OUString aName; + OUString aName; pDoc->CreateValidTabName( aName ); if ( ( bOk = pDoc->ValidNewTabName( aName ) ) != false ) bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName ); @@ -1182,8 +1182,8 @@ void ScChangeActionDel::UndoCutOffInsert() ScChangeActionMove::ScChangeActionMove( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aToBigRange, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, - const rtl::OUString &sComment, const ScBigRange& aFromBigRange, + const OUString& aUserP, const DateTime& aDateTimeP, + const OUString &sComment, const ScBigRange& aFromBigRange, ScChangeTrack* pTrackP) : // wich of nDx and nDy is set is depend on the type ScChangeAction(SC_CAT_MOVE, aToBigRange, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment), aFromRange(aFromBigRange), @@ -1234,15 +1234,15 @@ void ScChangeActionMove::GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nD void ScChangeActionMove::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); bool bFlag3D = GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab(); - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_MOVE); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_MOVE); - rtl::OUString aTmpStr = ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D); + OUString aTmpStr = ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { @@ -1258,19 +1258,19 @@ void ScChangeActionMove::GetDescription( nPos += aTmpStr.getLength(); } - rtl::OUStringBuffer aBuf(rStr); // append to the original string. + OUStringBuffer aBuf(rStr); // append to the original string. aBuf.append(aRsc); rStr = aBuf.makeStringAndClear(); } void ScChangeActionMove::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { if ( !bFlag3D ) bFlag3D = ( GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab() ); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D)); aBuf.append(sal_Unicode(',')); aBuf.append(sal_Unicode(' ')); @@ -1501,13 +1501,13 @@ void ScChangeActionContent::SetOldValue( const OUString& rOld, ScDocument* pDoc } -void ScChangeActionContent::GetOldString( rtl::OUString& rStr ) const +void ScChangeActionContent::GetOldString( OUString& rStr ) const { GetValueString(rStr, maOldValue, maOldCell); } -void ScChangeActionContent::GetNewString( rtl::OUString& rStr ) const +void ScChangeActionContent::GetNewString( OUString& rStr ) const { GetValueString(rStr, maNewValue, maNewCell); } @@ -1523,13 +1523,13 @@ const ScCellValue& ScChangeActionContent::GetNewCell() const } void ScChangeActionContent::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_CELL); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_CELL); - rtl::OUString aTmpStr; + OUString aTmpStr; GetRefString(aTmpStr, pDoc); sal_Int32 nPos = 0; @@ -1562,14 +1562,14 @@ void ScChangeActionContent::GetDescription( nPos += aTmpStr.getLength(); } - rtl::OUStringBuffer aBuf(rStr); // append to the original string. + OUStringBuffer aBuf(rStr); // append to the original string. aBuf.append(aRsc); rStr = aBuf.makeStringAndClear(); } void ScChangeActionContent::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { sal_uInt16 nFlags = ( GetBigRange().IsValid( pDoc ) ? SCA_VALID : 0 ); if ( nFlags ) @@ -1595,7 +1595,7 @@ void ScChangeActionContent::GetRefString( if ( IsDeletedIn() ) { // Insert the parentheses. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(sal_Unicode('(')); aBuf.append(rStr); aBuf.append(sal_Unicode(')')); @@ -1882,7 +1882,7 @@ void ScChangeActionContent::GetValueString( void ScChangeActionContent::GetFormulaString( - rtl::OUString& rStr, const ScFormulaCell* pCell ) const + OUString& rStr, const ScFormulaCell* pCell ) const { ScAddress aPos( aBigRange.aStart.MakeAddress() ); if ( aPos == pCell->aPos || IsDeletedIn() ) @@ -2148,8 +2148,8 @@ bool ScChangeActionContent::IsOldMatrixReference() const ScChangeActionReject::ScChangeActionReject( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, - const ScBigRange& aBigRangeP, const rtl::OUString& aUserP, - const DateTime& aDateTimeP, const rtl::OUString& sComment) : + const ScBigRange& aBigRangeP, const OUString& aUserP, + const DateTime& aDateTimeP, const OUString& sComment) : ScChangeAction(SC_CAT_CONTENT, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment) { } @@ -2189,7 +2189,7 @@ ScChangeTrack::ScChangeTrack( ScDocument* pDocP ) : memset( ppContentSlots, 0, nContentSlots * sizeof( ScChangeActionContent* ) ); } -ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const std::set<rtl::OUString>& aTempUserCollection) : +ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const std::set<OUString>& aTempUserCollection) : maUserCollection(aTempUserCollection), aFixDateTime( DateTime::SYSTEM ), pDoc( pDocP ) @@ -2235,7 +2235,7 @@ void ScChangeTrack::Init() bTime100thSeconds = true; const SvtUserOptions& rUserOpt = SC_MOD()->GetUserOptions(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rUserOpt.GetFirstName()); aBuf.append(sal_Unicode(' ')); aBuf.append(rUserOpt.GetLastName()); @@ -2301,11 +2301,11 @@ void ScChangeTrack::Clear() aGeneratedMap.clear(); aPasteCutMap.clear(); maUserCollection.clear(); - maUser = rtl::OUString(); + maUser = OUString(); Init(); } -const std::set<rtl::OUString>& ScChangeTrack::GetUserCollection() const +const std::set<OUString>& ScChangeTrack::GetUserCollection() const { return maUserCollection; } @@ -2317,7 +2317,7 @@ void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI const SvtUserOptions& rUserOptions = SC_MOD()->GetUserOptions(); size_t nOldCount = maUserCollection.size(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rUserOptions.GetFirstName()); aBuf.append(sal_Unicode(' ')); aBuf.append(rUserOptions.GetLastName()); @@ -2338,7 +2338,7 @@ void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI } -void ScChangeTrack::SetUser( const rtl::OUString& rUser ) +void ScChangeTrack::SetUser( const OUString& rUser ) { if ( IsLoadSave() ) return ; // nicht die Collection zerschiessen @@ -2347,7 +2347,7 @@ void ScChangeTrack::SetUser( const rtl::OUString& rUser ) maUserCollection.insert(maUser); } -const rtl::OUString& ScChangeTrack::GetUser() const +const OUString& ScChangeTrack::GetUser() const { return maUser; } @@ -4520,7 +4520,7 @@ bool ScChangeTrack::Reject( sal_uLong ScChangeTrack::AddLoadedGenerated( - const ScCellValue& rNewCell, const ScBigRange& aBigRange, const rtl::OUString& sNewValue ) + const ScCellValue& rNewCell, const ScBigRange& aBigRange, const OUString& sNewValue ) { ScChangeActionContent* pAct = new ScChangeActionContent( --nGeneratedMin, rNewCell, aBigRange, pDoc, sNewValue ); if ( pAct ) diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index 2a63d4c1de00..06f1f292f9c0 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.cxx @@ -81,7 +81,7 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting return *this; } -sal_Bool ScChangeViewSettings::IsValidComment(const ::rtl::OUString* pCommentStr) const +sal_Bool ScChangeViewSettings::IsValidComment(const OUString* pCommentStr) const { sal_Bool nTheFlag=sal_True; @@ -94,7 +94,7 @@ sal_Bool ScChangeViewSettings::IsValidComment(const ::rtl::OUString* pCommentStr return nTheFlag; } -void ScChangeViewSettings::SetTheComment(const ::rtl::OUString& rString) +void ScChangeViewSettings::SetTheComment(const OUString& rString) { aComment=rString; if(pCommentSearcher!=NULL) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index e17500d48f8a..1e099602e1a7 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -66,7 +66,6 @@ using namespace formula; using namespace ::com::sun::star; -using ::rtl::OUString; using ::std::vector; diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 29084b508392..82330711840a 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -36,7 +36,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 24a7b6b4016f..849cf7853acb 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -34,7 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------------ diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index aa07053f52b9..f7d873cb61a8 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -28,7 +28,6 @@ #include <memory> #include <vector> -using ::rtl::OUString; using ::std::auto_ptr; using ::std::vector; @@ -186,7 +185,7 @@ bool lcl_createExcelQuery( if (nIndex < nNewEntries) { pParam->GetEntry(nIndex).nField = aFields[nCol]; - pParam->FillInExcelSyntax(rtl::OUString(aCellStr), nIndex); + pParam->FillInExcelSyntax(OUString(aCellStr), nIndex); nIndex++; if (nIndex < nNewEntries) pParam->GetEntry(nIndex).eConnect = SC_AND; diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 4e1955ce7494..790fc7de0f68 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -685,7 +685,7 @@ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, { const SvxFieldData* pFieldData = rField.GetField(); if (!pFieldData) - return rtl::OUString("?"); + return OUString("?"); OUString aRet; sal_Int32 nClsId = pFieldData->GetClassId(); @@ -753,11 +753,11 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 /* nPara */, sal_uInt16 /* nPos */, Color*& rTxtColor, Color*& /* rFldColor */ ) { - rtl::OUString aRet; + OUString aRet; const SvxFieldData* pFieldData = rField.GetField(); if (!pFieldData) - return rtl::OUString(" "); + return OUString(" "); sal_uInt16 nClsId = pFieldData->GetClassId(); switch (nClsId) @@ -765,7 +765,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, case text::textfield::Type::URL: { const SvxURLField* pField = static_cast<const SvxURLField*>(pFieldData); - rtl::OUString aURL = pField->GetURL(); + OUString aURL = pField->GetURL(); switch (pField->GetFormat()) { @@ -810,7 +810,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, { const SvxTableField* pField = static_cast<const SvxTableField*>(pFieldData); SCTAB nTab = pField->GetTab(); - rtl::OUString aName; + OUString aName; if (mpDoc->GetName(nTab, aName)) aRet = aName; else diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index a825dda1ffe4..ca4f27cfa0fb 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -26,7 +26,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------ diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 01ebadaad9a1..4a57c07134c0 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -39,7 +39,6 @@ using namespace utl; using namespace com::sun::star::uno; using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx index 0c0231cdef2d..91c066c0bc96 100644 --- a/sc/source/core/tool/formulaparserpool.cxx +++ b/sc/source/core/tool/formulaparserpool.cxx @@ -29,8 +29,6 @@ #include <sfx2/objsh.hxx> #include "document.hxx" -using ::rtl::OUString; -using ::rtl::OUStringHash; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx index 791dbadcea86..ed1dc772d660 100644 --- a/sc/source/core/tool/formularesult.cxx +++ b/sc/source/core/tool/formularesult.cxx @@ -420,7 +420,7 @@ void ScFormulaResult::SetHybridDouble( double f ) } } -void ScFormulaResult::SetHybridString( const rtl::OUString & rStr ) +void ScFormulaResult::SetHybridString( const OUString & rStr ) { // Obtain values before changing anything. double f = GetDouble(); diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index eb12f797abda..6f056d6036fe 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -31,7 +31,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //======================================================================== // ScInputOptions - input options diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 0bbeab951802..d35eebd9f1c8 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -79,7 +79,6 @@ bool ScInterpreter::bGlobalStackInUse = false; using namespace formula; using ::std::auto_ptr; -using ::rtl::OUString; struct ScCompare { diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index cdb1535d6518..883a2e91df12 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2919,7 +2919,7 @@ inline void lclSplitBlock( double& rfInt, sal_Int32& rnBlock, double fValue, dou } /** Appends a digit (0 to 9) to the passed string. */ -void lclAppendDigit( rtl::OStringBuffer& rText, sal_Int32 nDigit ) +void lclAppendDigit( OStringBuffer& rText, sal_Int32 nDigit ) { switch( nDigit ) { @@ -2941,7 +2941,7 @@ void lclAppendDigit( rtl::OStringBuffer& rText, sal_Int32 nDigit ) @param nDigit A digit in the range from 1 to 9. @param nPow10 A value in the range from 2 to 5. */ -void lclAppendPow10( rtl::OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow10 ) +void lclAppendPow10( OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow10 ) { OSL_ENSURE( (1 <= nDigit) && (nDigit <= 9), "lclAppendPow10 - illegal digit" ); lclAppendDigit( rText, nDigit ); @@ -2956,7 +2956,7 @@ void lclAppendPow10( rtl::OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow } /** Appends a block of 6 digits (value from 1 to 999,999) to the passed string. */ -void lclAppendBlock( rtl::OStringBuffer& rText, sal_Int32 nValue ) +void lclAppendBlock( OStringBuffer& rText, sal_Int32 nValue ) { OSL_ENSURE( (1 <= nValue) && (nValue <= 999999), "lclAppendBlock - illegal value" ); if( nValue >= 100000 ) @@ -3027,7 +3027,7 @@ void ScInterpreter::ScBahtText() sal_Int32 nSatang = 0; lclSplitBlock( fBaht, nSatang, fValue, 100.0 ); - rtl::OStringBuffer aText; + OStringBuffer aText; // generate text for Baht value if( fBaht == 0.0 ) @@ -3037,7 +3037,7 @@ void ScInterpreter::ScBahtText() } else while( fBaht > 0.0 ) { - rtl::OStringBuffer aBlock; + OStringBuffer aBlock; sal_Int32 nBlock = 0; lclSplitBlock( fBaht, nBlock, fBaht, 1.0e6 ); if( nBlock > 0 ) @@ -3045,7 +3045,7 @@ void ScInterpreter::ScBahtText() // add leading "million", if there will come more blocks if( fBaht > 0.0 ) aBlock.insert( - 0, rtl::OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_1E6))); + 0, OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_1E6))); aText.insert(0, aBlock.makeStringAndClear()); } @@ -3066,9 +3066,9 @@ void ScInterpreter::ScBahtText() // add the minus sign if( bMinus ) aText.insert( - 0, rtl::OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_MINUS))); + 0, OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_MINUS))); - PushString( rtl::OStringToOUString(aText.makeStringAndClear(), RTL_TEXTENCODING_UTF8) ); + PushString( OStringToOUString(aText.makeStringAndClear(), RTL_TEXTENCODING_UTF8) ); } } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index e24fc6644d3c..40d5d83444ae 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -703,7 +703,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } if (bOk) { - rtl::OString aTmp(OUStringToOString(aStr, + OString aTmp(OUStringToOString(aStr, osl_getThreadTextEncoding())); // In case the xub_StrLen will be longer than USHORT // one day, and room for pad byte check. @@ -827,7 +827,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } else { - rtl::OString aTmp(OUStringToOString(aStr, + OString aTmp(OUStringToOString(aStr, osl_getThreadTextEncoding())); // In case the xub_StrLen will be longer than USHORT // one day, and room for pad byte check. @@ -2548,7 +2548,7 @@ void ScInterpreter::ScExternal() break; case PTR_STRING : { - rtl::OString aStr(OUStringToOString(GetString(), + OString aStr(OUStringToOString(GetString(), osl_getThreadTextEncoding())); if ( aStr.getLength() >= ADDIN_MAXSTRLEN ) SetError( errStringOverflow ); diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 3836940012ee..3a7417e92f55 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -36,12 +36,12 @@ sal_Bool ScOptionsUtil::IsMetricSystem() //------------------------------------------------------------------ -ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree ) : +ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree ) : ConfigItem( rSubTree ) { } -ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ) : +ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode ) : ConfigItem( rSubTree, nMode ) { } @@ -51,7 +51,7 @@ void ScLinkConfigItem::SetCommitLink( const Link& rLink ) aCommitLink = rLink; } -void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& /* aPropertyNames */ ) +void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<OUString>& /* aPropertyNames */ ) { //! not implemented yet... } diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index b4187c593d8f..02a697d133d3 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -336,7 +336,7 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken { Type eRet = Unknown; // similar to ScInterpreter::ScExternal() - rtl::OUString aFuncName = ScGlobal::pCharClass->uppercase( pToken->GetExternal()); + OUString aFuncName = ScGlobal::pCharClass->uppercase( pToken->GetExternal()); { const FuncData* pFuncData = ScGlobal::GetFuncCollection()->findByName(aFuncName); if (pFuncData) @@ -360,7 +360,7 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken } } - rtl::OUString aUnoName = + OUString aUnoName = ScGlobal::GetAddInCollection()->FindFunction(aFuncName, false); if (!aUnoName.isEmpty()) @@ -434,9 +434,9 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource() } if ( nArgs > CommonData::nMaxParams ) { - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; aBuf.append("ScParameterClassification::Init: too many arguments in listed function: "); - aBuf.append(rtl::OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8)); + aBuf.append(OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8)); aBuf.append(": "); aBuf.append(sal_Int32(nArgs)); OSL_FAIL( aBuf.getStr()); @@ -485,7 +485,7 @@ void ScParameterClassification::GenerateDocumentation() if ( xMap->getSymbol(eOp).Len() ) { fprintf( stdout, "%s: ", aEnvVarName); - rtl::OStringBuffer aStr(rtl::OUStringToOString(xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8)); + OStringBuffer aStr(OUStringToOString(xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8)); aStr.append('('); formula::FormulaByteToken aToken( eOp); sal_uInt8 nParams = GetMinimumParameters( eOp); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 154ac47868a8..1ec3ea36d73d 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -26,7 +26,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index c87cf8fe14be..1ac1a899327b 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -95,7 +95,7 @@ void ScQueryEntry::SetQueryByEmpty() maQueryItems.resize(1); Item& rItem = maQueryItems[0]; rItem.meType = ByEmpty; - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); rItem.mfVal = SC_EMPTYFIELDS; } @@ -117,7 +117,7 @@ void ScQueryEntry::SetQueryByNonEmpty() maQueryItems.resize(1); Item& rItem = maQueryItems[0]; rItem.meType = ByEmpty; - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); rItem.mfVal = SC_NONEMPTYFIELDS; } @@ -178,7 +178,7 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( bool bCaseSens ) const { if ( !pSearchParam ) { - const rtl::OUString& rStr = maQueryItems[0].maString; + const OUString& rStr = maQueryItems[0].maString; pSearchParam = new utl::SearchParam( rStr, utl::SearchParam::SRCH_REGEXP, bCaseSens, false, false); pSearchText = new utl::TextSearch( *pSearchParam, *ScGlobal::pCharClass ); diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index d0f637bd5660..826ea3e3981e 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -165,7 +165,7 @@ void ScQueryParamBase::Resize(size_t nNew) } } -void ScQueryParamBase::FillInExcelSyntax(const rtl::OUString& rStr, SCSIZE nIndex) +void ScQueryParamBase::FillInExcelSyntax(const OUString& rStr, SCSIZE nIndex) { const String aCellStr = rStr; if (aCellStr.Len() > 0) diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index af2fb6e1fdee..8f37c136af74 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -240,7 +240,7 @@ void ScRangeList::Format( String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, } -void ScRangeList::Format( rtl::OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc, +void ScRangeList::Format( OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cDelimiter ) const { @@ -1356,7 +1356,7 @@ int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) const ScRangePairNameSort* ps2 = (const ScRangePairNameSort*)p2; const ScAddress& rStartPos1 = ps1->pPair->GetRange(0).aStart; const ScAddress& rStartPos2 = ps2->pPair->GetRange(0).aStart; - rtl::OUString aStr1, aStr2; + OUString aStr1, aStr2; sal_Int32 nComp; if ( rStartPos1.Tab() == rStartPos2.Tab() ) nComp = COMPARE_EQUAL; diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index ecd4a8ea6f3a..b833fecb889c 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -37,14 +37,13 @@ using namespace formula; using ::std::pair; using ::std::unary_function; -using ::rtl::OUString; //======================================================================== // ScRangeData //======================================================================== ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const String& rSymbol, const ScAddress& rAddress, RangeType nType, @@ -76,7 +75,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, } ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const ScTokenArray& rArr, const ScAddress& rAddress, RangeType nType ) : @@ -96,7 +95,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, } ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const ScAddress& rTarget ) : aName ( rName ), aUpperName ( ScGlobal::pCharClass->uppercase( rName ) ), @@ -257,7 +256,7 @@ void ScRangeData::GetSymbol( OUString& rSymbol, const ScAddress& rPos, const For rSymbol = aStr; } -void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos, +void ScRangeData::UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& rPos, const FormulaGrammar::Grammar eGrammar ) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -833,7 +832,7 @@ bool ScRangeName::insert(ScRangeData* p) p->SetIndex(maIndexToData.size() + 1); } - rtl::OUString aName(p->GetUpperName()); + OUString aName(p->GetUpperName()); erase(aName); // ptr_map won't insert it if a duplicate name exists. pair<DataType::iterator, bool> r = maData.insert(aName, p); if (r.second) @@ -852,7 +851,7 @@ void ScRangeName::erase(const ScRangeData& r) erase(r.GetUpperName()); } -void ScRangeName::erase(const rtl::OUString& rName) +void ScRangeName::erase(const OUString& rName) { DataType::iterator itr = maData.find(rName); if (itr != maData.end()) diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 957548121f43..a892eb408373 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -181,12 +181,12 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, c bool bHasErrors = false; - uno::Sequence< uno::Sequence<rtl::OUString> > aRowSeq( nRowCount ); - uno::Sequence<rtl::OUString>* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence<OUString> > aRowSeq( nRowCount ); + uno::Sequence<OUString>* pRowAry = aRowSeq.getArray(); for (long nRow = 0; nRow < nRowCount; nRow++) { - uno::Sequence<rtl::OUString> aColSeq( nColCount ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence<OUString> aColSeq( nColCount ); + OUString* pColAry = aColSeq.getArray(); for (long nCol = 0; nCol < nColCount; nCol++) { sal_uInt16 nErrCode = pDoc->GetStringForFormula( @@ -213,12 +213,12 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa SCSIZE nRowCount; pMatrix->GetDimensions( nColCount, nRowCount ); - uno::Sequence< uno::Sequence<rtl::OUString> > aRowSeq( static_cast<sal_Int32>(nRowCount) ); - uno::Sequence<rtl::OUString>* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence<OUString> > aRowSeq( static_cast<sal_Int32>(nRowCount) ); + uno::Sequence<OUString>* pRowAry = aRowSeq.getArray(); for (SCSIZE nRow = 0; nRow < nRowCount; nRow++) { - uno::Sequence<rtl::OUString> aColSeq( static_cast<sal_Int32>(nColCount) ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence<OUString> aColSeq( static_cast<sal_Int32>(nColCount) ); + OUString* pColAry = aColSeq.getArray(); for (SCSIZE nCol = 0; nCol < nColCount; nCol++) { String aStr; @@ -233,7 +233,7 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa Color* pColor; pFormatter->GetOutputString( fVal, 0, aStr, &pColor ); } - pColAry[nCol] = rtl::OUString( aStr ); + pColAry[nCol] = OUString( aStr ); } pRowAry[nRow] = aColSeq; @@ -314,7 +314,7 @@ sal_Bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMat String aStr; if ( !pMatrix->IsEmpty( nCol, nRow ) ) aStr = pMatrix->GetString( nCol, nRow ); - pColAry[nCol] <<= rtl::OUString( aStr ); + pColAry[nCol] <<= OUString( aStr ); } else { @@ -385,7 +385,7 @@ ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::An } if ( nMaxColCount && nRowCount ) { - rtl::OUString aUStr; + OUString aUStr; xMatrix = new ScMatrix( static_cast<SCSIZE>(nMaxColCount), static_cast<SCSIZE>(nRowCount), 0.0); diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 2f3f43972a48..e318466319b4 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -28,8 +28,6 @@ #include "externalrefmgr.hxx" #include "compiler.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::formula::FormulaGrammar; using namespace ::com::sun::star; @@ -267,13 +265,13 @@ sal_Bool ScRangeUtil::MakeRangeFromName ( if( eScope==RUTL_NAMES ) { //first handle ui names like local1 (Sheet1), which point to a local range name - rtl::OUString aName(rName); + OUString aName(rName); sal_Int32 nEndPos = aName.lastIndexOf(')'); sal_Int32 nStartPos = aName.lastIndexOfAsciiL(" (",2); SCTAB nTable = nCurTab; if (nEndPos != -1 && nStartPos != -1) { - rtl::OUString aSheetName = aName.copy(nStartPos+2, nEndPos-nStartPos-2); + OUString aSheetName = aName.copy(nStartPos+2, nEndPos-nStartPos-2); if (pDoc->GetTable(aSheetName, nTable)) { aName = aName.copy(0, nStartPos); @@ -357,7 +355,7 @@ void ScRangeStringConverter::AssignString( if( !rNewStr.isEmpty() ) { if( !rString.isEmpty() ) - rString += rtl::OUString(cSeperator); + rString += OUString(cSeperator); rString += rNewStr; } } @@ -794,7 +792,7 @@ void ScRangeStringConverter::GetStringFromRangeList( } static void lcl_appendCellAddress( - rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, + OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, const ScAddress::ExternalInfo& rExtInfo) { if (rExtInfo.mbExternal) @@ -826,7 +824,7 @@ static void lcl_appendCellAddress( } static void lcl_appendCellRangeAddress( - rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell1, const ScAddress& rCell2, + OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell1, const ScAddress& rCell2, const ScAddress::ExternalInfo& rExtInfo1, const ScAddress::ExternalInfo& rExtInfo2) { if (rExtInfo1.mbExternal) @@ -994,11 +992,11 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con rString = aRetStr.makeStringAndClear(); } -ScRangeData* ScRangeStringConverter::GetRangeDataFromString(const rtl::OUString& rString, const SCTAB nTab, const ScDocument* pDoc) +ScRangeData* ScRangeStringConverter::GetRangeDataFromString(const OUString& rString, const SCTAB nTab, const ScDocument* pDoc) { ScRangeName* pLocalRangeName = pDoc->GetRangeName(nTab); ScRangeData* pData = NULL; - rtl::OUString aUpperName = ScGlobal::pCharClass->uppercase(rString); + OUString aUpperName = ScGlobal::pCharClass->uppercase(rString); if(pLocalRangeName) { pData = pLocalRangeName->findByUpperName(aUpperName); @@ -1071,9 +1069,9 @@ ScAreaNameIterator::ScAreaNameIterator( ScDocument* pDoc ) : } } -bool ScAreaNameIterator::Next( rtl::OUString& rName, ScRange& rRange ) +bool ScAreaNameIterator::Next( OUString& rName, ScRange& rRange ) { - // Just a wrapper for rtl::OUString for now. It should replace the method + // Just a wrapper for OUString for now. It should replace the method // below eventually. String aTmp; bool bRet = Next(aTmp, rRange); diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx index 09d0712479bd..dbacb4493487 100644 --- a/sc/source/core/tool/reftokenhelper.cxx +++ b/sc/source/core/tool/reftokenhelper.cxx @@ -31,7 +31,6 @@ using namespace formula; using ::std::vector; using ::std::auto_ptr; -using ::rtl::OUString; void ScRefTokenHelper::compileRangeRepresentation( vector<ScTokenRef>& rRefTokens, const OUString& rRangeStr, ScDocument* pDoc, diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 0a92ffc2721a..37aa03a7472c 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -42,11 +42,11 @@ using ::std::advance; using ::std::unary_function; const mdds::mtv::element_t element_type_custom_string = mdds::mtv::element_type_user_start; -typedef mdds::mtv::default_element_block<element_type_custom_string, rtl::OUString> custom_string_block; +typedef mdds::mtv::default_element_block<element_type_custom_string, OUString> custom_string_block; namespace rtl { -// Callback functions required for supporting rtl::OUString in +// Callback functions required for supporting OUString in // mdds::multi_type_vector. They must be in the rtl namespace to satisfy // argument dependent lookup that mdds::multi_type_vector requires. MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, element_type_custom_string, OUString(), custom_string_block) @@ -342,9 +342,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); void PutEmptyPath(SCSIZE nC, SCSIZE nR); @@ -353,9 +353,9 @@ public: sal_uInt16 GetError( SCSIZE nC, SCSIZE nR) const; double GetDouble(SCSIZE nC, SCSIZE nR) const; double GetDouble( SCSIZE nIndex) const; - rtl::OUString GetString(SCSIZE nC, SCSIZE nR) const; - rtl::OUString GetString( SCSIZE nIndex) const; - rtl::OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; + OUString GetString(SCSIZE nC, SCSIZE nR) const; + OUString GetString( SCSIZE nIndex) const; + OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; ScMatrixValue Get(SCSIZE nC, SCSIZE nR) const; bool IsString( SCSIZE nIndex ) const; bool IsString( SCSIZE nC, SCSIZE nR ) const; @@ -513,7 +513,7 @@ void ScMatrixImpl::PutDouble( double fVal, SCSIZE nIndex) PutDouble(fVal, nC, nR); } -void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) +void ScMatrixImpl::PutString(const OUString& rStr, SCSIZE nC, SCSIZE nR) { if (ValidColRow( nC, nR)) maMat.set(nR, nC, rStr); @@ -523,7 +523,7 @@ void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) } } -void ScMatrixImpl::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) +void ScMatrixImpl::PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) { if (ValidColRow( nC, nR)) maMat.set(nR, nC, pArray, pArray + nLen); @@ -533,7 +533,7 @@ void ScMatrixImpl::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC } } -void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nIndex) +void ScMatrixImpl::PutString(const OUString& rStr, SCSIZE nIndex) { SCSIZE nC, nR; CalcPosition(nIndex, nC, nR); @@ -622,7 +622,7 @@ double ScMatrixImpl::GetDouble( SCSIZE nIndex) const return GetDouble(nC, nR); } -rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const +OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const { if (ValidColRowOrReplicated( nC, nR )) { @@ -630,7 +630,7 @@ rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const switch (maMat.get_type(nR, nC)) { case mdds::mtm::element_string: - return maMat.get<rtl::OUString>(nR, nC); + return maMat.get<OUString>(nR, nC); case mdds::mtm::element_empty: return EMPTY_OUSTRING; case mdds::mtm::element_numeric: @@ -653,26 +653,26 @@ rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const return EMPTY_OUSTRING; } -rtl::OUString ScMatrixImpl::GetString( SCSIZE nIndex) const +OUString ScMatrixImpl::GetString( SCSIZE nIndex) const { SCSIZE nC, nR; CalcPosition(nIndex, nC, nR); return GetString(nC, nR); } -rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const +OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const { if (!ValidColRowOrReplicated( nC, nR )) { OSL_FAIL("ScMatrixImpl::GetString: dimension error"); - return ::rtl::OUString(); + return OUString(); } double fVal = 0.0; switch (maMat.get_type(nR, nC)) { case mdds::mtm::element_string: - return maMat.get<rtl::OUString>(nR, nC); + return maMat.get<OUString>(nR, nC); case mdds::mtm::element_empty: { if (!maMatFlag.get<bool>(nR, nC)) @@ -682,7 +682,7 @@ rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, // result of empty FALSE jump path sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_LOGICAL, ScGlobal::eLnge); - ::rtl::OUString aStr; + OUString aStr; Color* pColor = NULL; rFormatter.GetOutputString( 0.0, nKey, aStr, &pColor); return aStr; @@ -706,7 +706,7 @@ rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_NUMBER, ScGlobal::eLnge); - ::rtl::OUString aStr; + OUString aStr; rFormatter.GetInputLineString( fVal, nKey, aStr); return aStr; } @@ -1228,17 +1228,17 @@ void ScMatrix::PutDouble(const double* pArray, size_t nLen, SCSIZE nC, SCSIZE nR pImpl->PutDouble(pArray, nLen, nC, nR); } -void ScMatrix::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) +void ScMatrix::PutString(const OUString& rStr, SCSIZE nC, SCSIZE nR) { pImpl->PutString(rStr, nC, nR); } -void ScMatrix::PutString(const ::rtl::OUString& rStr, SCSIZE nIndex) +void ScMatrix::PutString(const OUString& rStr, SCSIZE nIndex) { pImpl->PutString(rStr, nIndex); } -void ScMatrix::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) +void ScMatrix::PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) { pImpl->PutString(pArray, nLen, nC, nR); } @@ -1278,17 +1278,17 @@ double ScMatrix::GetDouble( SCSIZE nIndex) const return pImpl->GetDouble(nIndex); } -rtl::OUString ScMatrix::GetString(SCSIZE nC, SCSIZE nR) const +OUString ScMatrix::GetString(SCSIZE nC, SCSIZE nR) const { return pImpl->GetString(nC, nR); } -rtl::OUString ScMatrix::GetString( SCSIZE nIndex) const +OUString ScMatrix::GetString( SCSIZE nIndex) const { return pImpl->GetString(nIndex); } -::rtl::OUString ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const +OUString ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const { return pImpl->GetString(rFormatter, nC, nR); } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 85d6e9a6e0ab..acadb7f1505d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -366,9 +366,9 @@ FormulaToken* ScRawToken::CreateToken() const return new FormulaDoubleToken( nValue ); case svString : if (eOp == ocPush) - return new FormulaStringToken( rtl::OUString( cStr ) ); + return new FormulaStringToken( OUString( cStr ) ); else - return new FormulaStringOpToken( eOp, rtl::OUString( cStr ) ); + return new FormulaStringOpToken( eOp, OUString( cStr ) ); case svSingleRef : if (eOp == ocPush) return new ScSingleRefToken( aRef.Ref1 ); @@ -386,23 +386,23 @@ FormulaToken* ScRawToken::CreateToken() const return new FormulaIndexToken( eOp, name.nIndex, name.bGlobal); case svExternalSingleRef: { - rtl::OUString aTabName(extref.cTabName); + OUString aTabName(extref.cTabName); return new ScExternalSingleRefToken(extref.nFileId, aTabName, extref.aRef.Ref1); } case svExternalDoubleRef: { - rtl::OUString aTabName(extref.cTabName); + OUString aTabName(extref.cTabName); return new ScExternalDoubleRefToken(extref.nFileId, aTabName, extref.aRef); } case svExternalName: { - rtl::OUString aName(extname.cName); + OUString aName(extname.cName); return new ScExternalNameToken( extname.nFileId, aName ); } case svJump : return new FormulaJumpToken( eOp, (short*) nJump ); case svExternal : - return new FormulaExternalToken( eOp, sbyte.cByte, rtl::OUString( cStr+1 ) ); + return new FormulaExternalToken( eOp, sbyte.cByte, OUString( cStr+1 ) ); case svFAP : return new FormulaFAPToken( eOp, sbyte.cByte, NULL ); case svMissing : @@ -1172,7 +1172,7 @@ bool ScTokenArray::AddFormulaToken(const com::sun::star::sheet::FormulaToken& _a sal_uInt16 nFileId = static_cast< sal_uInt16 >( aApiExtRef.Index ); sheet::SingleReference aApiSRef; sheet::ComplexReference aApiCRef; - ::rtl::OUString aName; + OUString aName; if( aApiExtRef.Reference >>= aApiSRef ) { // try to resolve cache index to sheet name @@ -1995,9 +1995,9 @@ void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos, namespace { -void GetExternalTableData(const ScDocument* pOldDoc, const ScDocument* pNewDoc, const SCTAB nTab, rtl::OUString& rTabName, sal_uInt16& rFileId) +void GetExternalTableData(const ScDocument* pOldDoc, const ScDocument* pNewDoc, const SCTAB nTab, OUString& rTabName, sal_uInt16& rFileId) { - rtl::OUString aFileName = pOldDoc->GetFileURL();; + OUString aFileName = pOldDoc->GetFileURL();; rFileId = pNewDoc->GetExternalRefManager()->getExternalFileId(aFileName); rTabName = pOldDoc->GetCopyTabName(nTab); if (rTabName.isEmpty()) @@ -2081,7 +2081,7 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons if ( (rRef2.IsFlag3D() && !rRef2.IsTabRel()) || (rRef1.IsFlag3D() && !rRef1.IsTabRel()) ) { - rtl::OUString aTabName; + OUString aTabName; sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef1.nTab, aTabName, nFileId); pCode[j]->DecRef(); @@ -2100,7 +2100,7 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons if ( rRef.IsFlag3D() && !rRef.IsTabRel() ) { - rtl::OUString aTabName; + OUString aTabName; sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef.nTab, aTabName, nFileId); //replace with ScExternalSingleRefToken and adjust references diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index 71cf0faee1e9..2a8a851e2698 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -94,7 +94,7 @@ bool ScTypedStrData::operator< (const ScTypedStrData& r) const } ScTypedStrData::ScTypedStrData( - const rtl::OUString& rStr, double nVal, StringType nType ) : + const OUString& rStr, double nVal, StringType nType ) : maStrValue(rStr), mfValue(nVal), meStrType(nType) {} @@ -109,7 +109,7 @@ bool ScTypedStrData::IsStrData() const return meStrType != Value; } -const rtl::OUString& ScTypedStrData::GetString() const +const OUString& ScTypedStrData::GetString() const { return maStrValue; } diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 28f342af6473..17fe72f5fdfe 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -27,7 +27,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // -------------------------------------------------------------------- diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index 07a3fcfe9215..5d8c7691c9ae 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.cxx @@ -27,8 +27,6 @@ #include <boost/bind.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace { diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 114b7ab18563..488b59782f58 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -34,7 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------ diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index a4c225699f25..704edb1a8770 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -60,8 +60,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc rOut.SetStreamCharSet( eCharSet ); sal_Unicode cStrDelim('"'); - rtl::OString aStrDelimEncoded; // only used if not Unicode - rtl::OUString aStrDelimDecoded; // only used if context encoding + OString aStrDelimEncoded; // only used if not Unicode + OUString aStrDelimDecoded; // only used if context encoding bool bContextOrNotAsciiEncoding; if ( eCharSet == RTL_TEXTENCODING_UNICODE ) { @@ -70,7 +70,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc } else { - aStrDelimEncoded = rtl::OString(&cStrDelim, 1, eCharSet); + aStrDelimEncoded = OString(&cStrDelim, 1, eCharSet); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof(aInfo); if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) ) @@ -79,7 +79,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc (((aInfo.Flags & RTL_TEXTENCODING_INFO_CONTEXT) != 0) || ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0)); if ( bContextOrNotAsciiEncoding ) - aStrDelimDecoded = rtl::OStringToOUString(aStrDelimEncoded, eCharSet); + aStrDelimDecoded = OStringToOUString(aStrDelimEncoded, eCharSet); } else bContextOrNotAsciiEncoding = false; @@ -93,8 +93,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc const sal_Char* pNumDataERROR = "0,0\nERROR\n"; FltError eRet = eERR_OK; - rtl::OUStringBuffer aOS; - rtl::OUString aString; + OUStringBuffer aOS; + OUString aString; SCCOL nEndCol = rRange.aEnd.Col(); SCROW nEndRow = rRange.aEnd.Row(); SCCOL nNumCols = nEndCol - rRange.aStart.Col() + 1; @@ -243,14 +243,14 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc else if ( bContextOrNotAsciiEncoding ) { // to byte encoding - rtl::OString aStrEnc = rtl::OUStringToOString(aTmpStr, eCharSet); + OString aStrEnc = OUStringToOString(aTmpStr, eCharSet); // back to Unicode - rtl::OUString aStrDec = rtl::OStringToOUString(aStrEnc, eCharSet); + OUString aStrDec = OStringToOUString(aStrEnc, eCharSet); // search on re-decoded string sal_Int32 nPos = aStrDec.indexOf(aStrDelimDecoded); while (nPos >= 0) { - rtl::OUStringBuffer aBuf(aStrDec); + OUStringBuffer aBuf(aStrDec); aBuf.insert(nPos, aStrDelimDecoded); aStrDec = aBuf.makeStringAndClear(); nPos = aStrDec.indexOf( @@ -263,12 +263,12 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc } else { - rtl::OString aStrEnc = rtl::OUStringToOString(aTmpStr, eCharSet); + OString aStrEnc = OUStringToOString(aTmpStr, eCharSet); // search on encoded string sal_Int32 nPos = aStrEnc.indexOf(aStrDelimEncoded); while (nPos >= 0) { - rtl::OStringBuffer aBuf(aStrEnc); + OStringBuffer aBuf(aStrEnc); aBuf.insert(nPos, aStrDelimEncoded); aStrEnc = aBuf.makeStringAndClear(); nPos = aStrEnc.indexOf( diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 7e2ae9dc1a4d..734253a6de93 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -61,7 +61,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, bool bSyntErrWarn = false; bool bOverflowWarn = false; - rtl::OUString aData = aDifParser.aData; + OUString aData = aDifParser.aData; bool bData = false; rIn.Seek( 0 ); @@ -308,7 +308,7 @@ TOPIC DifParser::GetNextTopic( void ) }; STATE eS = S_START; - rtl::OUString aLine; + OUString aLine; nVector = 0; nVal = 0; @@ -430,7 +430,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData ) else { // ...und zur Strafe mit'm Numberformatter... OSL_ENSURE( pNumFormatter, "-DifParser::GetNextDataset(): No Formatter, more fun!" ); - rtl::OUString aTestVal( pPossibleNumericData ); + OUString aTestVal( pPossibleNumericData ); sal_uInt32 nFormat = 0; double fTmpVal; if( pNumFormatter->IsNumberFormat( aTestVal, nFormat, fTmpVal ) ) @@ -445,7 +445,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData ) return eRet; } -bool DifParser::ReadNextLine( rtl::OUString& rStr ) +bool DifParser::ReadNextLine( OUString& rStr ) { if( aLookAheadLine.isEmpty() ) { @@ -454,7 +454,7 @@ bool DifParser::ReadNextLine( rtl::OUString& rStr ) else { rStr = aLookAheadLine; - aLookAheadLine = rtl::OUString(); + aLookAheadLine = OUString(); return true; } } @@ -502,7 +502,7 @@ bool DifParser::LookAhead() DATASET DifParser::GetNextDataset( void ) { DATASET eRet = D_UNKNOWN; - rtl::OUString aLine; + OUString aLine; const sal_Unicode* pAktBuffer; ReadNextLine( aLine ); @@ -529,7 +529,7 @@ DATASET DifParser::GetNextDataset( void ) { pAktBuffer++; eRet = GetNumberDataset(pAktBuffer); - rtl::OUString aTmpLine; + OUString aTmpLine; ReadNextLine( aTmpLine ); if ( eRet == D_SYNT_ERROR ) { // for broken records write "#ERR: data" to cell diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 5ac3c6063d29..a6571ab729a5 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -76,7 +76,6 @@ #include <oox/token/tokens.hxx> #include <boost/shared_ptr.hpp> -using ::rtl::OString; using namespace oox; static String lcl_GetVbaTabName( SCTAB n ) @@ -180,7 +179,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) Add( new ExcBofW8 ); SCTAB nC; - rtl::OUString aTmpString; + OUString aTmpString; SCTAB nScTabCount = rTabInfo.GetScTabCount(); sal_uInt16 nExcTabCount = rTabInfo.GetXclTabCount(); sal_uInt16 nCodenames = static_cast< sal_uInt16 >( GetExtDocOptions().GetCodeNameCount() ); @@ -425,7 +424,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx ) // notes const ScPostIt* pScNote = itr->second; ScAddress aScPos( itr->first.first, itr->first.second, mnScTab ); - mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, rtl::OUString() ) ); + mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, OUString() ) ); } if( GetOutput() != EXC_OUTPUT_BINARY ) diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 5007456fcd36..e288d8326b43 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -33,8 +33,6 @@ #include <vector> #include <cstring> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::vector; namespace { diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 59f93976b2e7..8ac6a11ab531 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -106,7 +106,6 @@ using namespace com::sun::star; using namespace ::comphelper; -using ::rtl::OUString; //OleNameOverrideContainer @@ -115,8 +114,8 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > OleNameOverrideCont class OleNameOverrideContainer : public OleNameOverrideContainer_BASE { private: - typedef boost::unordered_map< rtl::OUString, uno::Reference< container::XIndexContainer >, ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > NamedIndexToOleName; + typedef boost::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash, + ::std::equal_to< OUString > > NamedIndexToOleName; NamedIndexToOleName IdToOleNameHash; ::osl::Mutex m_aMutex; public: @@ -128,25 +127,25 @@ public: return ( IdToOleNameHash.size() > 0 ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( IdToOleNameHash[ aName ] ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - uno::Sequence< ::rtl::OUString > aResult( IdToOleNameHash.size() ); + uno::Sequence< OUString > aResult( IdToOleNameHash.size() ); NamedIndexToOleName::iterator it = IdToOleNameHash.begin(); NamedIndexToOleName::iterator it_end = IdToOleNameHash.end(); - rtl::OUString* pName = aResult.getArray(); + OUString* pName = aResult.getArray(); for (; it != it_end; ++it, ++pName ) *pName = it->first; return aResult; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() ); @@ -159,7 +158,7 @@ public: return IdToOleNameHash.size(); } // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -169,14 +168,14 @@ public: throw lang::IllegalArgumentException(); IdToOleNameHash[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw container::NoSuchElementException(); IdToOleNameHash.erase( IdToOleNameHash.find( aName ) ); } - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -244,7 +243,7 @@ void ImportExcel8::Boundsheet( void ) aIn.EnableDecryption(); aIn >> nGrbit >> nLen; - rtl::OUString aName( aIn.ReadUniString( nLen ) ); + OUString aName( aIn.ReadUniString( nLen ) ); GetTabInfo().AppendXclTabName( aName, nBdshtTab ); SCTAB nScTab = static_cast< SCTAB >( nBdshtTab ); @@ -477,7 +476,7 @@ XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRan } -void XclImpAutoFilterData::CreateFromDouble( rtl::OUString& rStr, double fVal ) +void XclImpAutoFilterData::CreateFromDouble( OUString& rStr, double fVal ) { rStr += ::rtl::math::doubleToUString(fVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, @@ -633,7 +632,7 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm ) rStrm.Ignore( 4 ); rStrm >> nStrLen[ nE ]; rStrm.Ignore( 3 ); - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); break; case EXC_AFTYPE_BOOLERR: rStrm >> nBoolErr >> nVal; @@ -765,7 +764,7 @@ void XclImpAutoFilterData::CreateScDBData() if( bActive || bCriteria) { ScDocument* pDoc = pExcRoot->pIR->GetDocPtr(); - String aNewName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + String aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); pCurrDBData = new ScDBData(aNewName , Tab(), StartCol(),StartRow(), EndCol(),EndRow() ); if(bCriteria) diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index d788b2dfe914..91a5bc10cdc4 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -83,7 +83,6 @@ using namespace ::oox; using ::com::sun::star::uno::Sequence; -using ::rtl::OString; //--------------------------------------------------------- class ExcDummy_00 - const sal_uInt8 ExcDummy_00::pMyData[] = { @@ -392,9 +391,9 @@ sal_uInt16 ExcBundlesheetBase::GetNum( void ) const ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : ExcBundlesheetBase( rRootData, _nTab ) { - rtl::OUString sTabName = rRootData.pER->GetTabInfo().GetScTabName( _nTab ); + OUString sTabName = rRootData.pER->GetTabInfo().GetScTabName( _nTab ); OSL_ENSURE( sTabName.getLength() < 256, "ExcBundlesheet::ExcBundlesheet - table name too long" ); - aName = rtl::OUStringToOString(sTabName, rRootData.pER->GetTextEncoding()); + aName = OUStringToOString(sTabName, rRootData.pER->GetTextEncoding()); } @@ -678,7 +677,7 @@ bool XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) bool bConflict = false; String sText; const ScQueryEntry::Item& rItem = rItems[0]; - const rtl::OUString& rQueryStr = rItem.maString; + const OUString& rQueryStr = rItem.maString; if (!rQueryStr.isEmpty()) { sText.Assign(rQueryStr); @@ -841,10 +840,10 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) case MultiValue: { rWorksheet->startElement(XML_filters, FSEND); - std::vector<rtl::OUString>::const_iterator itr = maMultiValues.begin(), itrEnd = maMultiValues.end(); + std::vector<OUString>::const_iterator itr = maMultiValues.begin(), itrEnd = maMultiValues.end(); for (; itr != itrEnd; ++itr) { - const char* pz = rtl::OUStringToOString(*itr, RTL_TEXTENCODING_UTF8).getStr(); + const char* pz = OUStringToOString(*itr, RTL_TEXTENCODING_UTF8).getStr(); rWorksheet->singleElement(XML_filter, XML_val, pz, FSEND); } rWorksheet->endElement(XML_filters); diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index a3b0d6b28119..cab727e8b279 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -80,7 +80,7 @@ FltError ExportBiff5::Write() SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg ); sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT ); if( nErr != ERRCODE_NONE ) - pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pDocShell->SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } pExcDoc->ReadDoc(); // ScDoc -> ExcDoc diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index b7ac26ce9d07..1c128616f53e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -713,7 +713,7 @@ void ImportExcel::Boundsheet( void ) aIn >> nGrbit; } - rtl::OUString aName( aIn.ReadByteString( false ) ); + OUString aName( aIn.ReadByteString( false ) ); SCTAB nScTab = static_cast< SCTAB >( nBdshtTab ); if( nScTab > 0 ) diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 8ffa93580ac2..a611374e61b0 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -825,7 +825,7 @@ FltError ImportExcel8::Read( void ) bool bSheetHasCodeName = false; - std::vector<rtl::OUString> aCodeNames; + std::vector<OUString> aCodeNames; std::vector < SCTAB > nTabsWithNoCodeName; while( eAkt != EXC_STATE_END ) @@ -1104,7 +1104,7 @@ FltError ImportExcel8::Read( void ) case 0x0A: // EOF [ 2345 ] { eAkt = EXC_STATE_SHEET; - rtl::OUString sName; + OUString sName; GetDoc().GetName( GetCurrScTab(), sName ); if ( !bSheetHasCodeName ) { @@ -1113,10 +1113,10 @@ FltError ImportExcel8::Read( void ) } else { - rtl::OUString sCodeName; + OUString sCodeName; GetDoc().GetCodeName( GetCurrScTab(), sCodeName ); OSL_TRACE("Have CodeName %s for SheetName %s", - rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); aCodeNames.push_back( sCodeName ); } @@ -1252,12 +1252,12 @@ FltError ImportExcel8::Read( void ) OSL_TRACE("Trying to find suitable codename for %d", *it ); while ( true ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.appendAscii("Sheet"); aBuf.append(static_cast<sal_Int32>(nTab++)); - rtl::OUString sTmpName = aBuf.makeStringAndClear(); - std::vector<rtl::OUString>::iterator codeName_It = aCodeNames.begin(); - std::vector<rtl::OUString>::iterator codeName_It_end = aCodeNames.end(); + OUString sTmpName = aBuf.makeStringAndClear(); + std::vector<OUString>::iterator codeName_It = aCodeNames.begin(); + std::vector<OUString>::iterator codeName_It_end = aCodeNames.end(); // search for codename for ( ; codeName_It != codeName_It_end; ++codeName_It ) { @@ -1267,7 +1267,7 @@ FltError ImportExcel8::Read( void ) if ( codeName_It == codeName_It_end ) // generated codename not found { - OSL_TRACE("Using generated codename %s", rtl::OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Using generated codename %s", OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() ); // Set new codename GetDoc().SetCodeName( *it, sTmpName ); // Record newly used codename diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 56afd712f7b1..2df9da410f56 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -70,7 +70,6 @@ #include "xepage.hxx" #include "xestyle.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1146,7 +1145,7 @@ void XclExpChFrLabelProps::Convert( const ScfPropertySet& rPropSet, bool bShowSe // label value separator maData.maSeparator = rPropSet.GetStringProperty( EXC_CHPROP_LABELSEPARATOR ); if( maData.maSeparator.isEmpty() ) - maData.maSeparator = rtl::OUString(' '); + maData.maSeparator = OUString(' '); } void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm ) @@ -1229,7 +1228,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, if (pSubTitle) { // append subtitle as the 2nd line of the title. - String aSubTitle = rtl::OUString("\n"); + String aSubTitle = OUString("\n"); aSubTitle.Append(*pSubTitle); mxSrcLink->AppendString(aSubTitle); } diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 7ad587475cce..63a4e907ffb0 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -58,9 +58,6 @@ using ::com::sun::star::frame::XModel; using ::com::sun::star::table::CellRangeAddress; using ::com::sun::star::sheet::XAreaLinks; using ::com::sun::star::sheet::XAreaLink; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // Shared string table ======================================================== @@ -367,7 +364,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU { // #n382718# (and #n261623#) Convert smb notation to '\\' aFileName = aUrlObj.GetMainURL( INetURLObject::NO_DECODE ); - aFileName = rtl::OUString( aFileName.GetBuffer() + 4 ); // skip the 'smb:' part + aFileName = OUString( aFileName.GetBuffer() + 4 ); // skip the 'smb:' part aFileName.SearchAndReplaceAll( '/', '\\' ); } @@ -375,7 +372,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU mnFlags |= EXC_HLINK_ABS; mnFlags |= EXC_HLINK_BODY; - rtl::OString aAsciiLink(rtl::OUStringToOString(aFileName, + OString aAsciiLink(OUStringToOString(aFileName, rRoot.GetTextEncoding())); XclExpString aLink( aFileName, EXC_STR_FORCEUNICODE, 255 ); aXclStrm << XclTools::maGuidFileMoniker @@ -903,14 +900,14 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) || eOperation == SC_COND_BOTTOM_PERCENT; sal_Int32 nPercent = eOperation == SC_COND_TOP_PERCENT || eOperation == SC_COND_BOTTOM_PERCENT; - rtl::OString aRank("0"); + OString aRank("0"); if(IsTopBottomRule(eOperation)) { // position and formula grammar are not important // we only store a number there aRank = XclXmlUtils::ToOString(mrFormatEntry.GetExpression(ScAddress(0,0,0), 0)); } - rtl::OString aText; + OString aText; if(IsTextRule(eOperation)) { // we need to write the text without quotes @@ -1049,7 +1046,7 @@ XclExpCfvo::XclExpCfvo(const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, namespace { -rtl::OString getColorScaleType( const ScColorScaleEntry& rEntry, bool bFirst ) +OString getColorScaleType( const ScColorScaleEntry& rEntry, bool bFirst ) { switch(rEntry.GetType()) { @@ -1081,12 +1078,12 @@ void XclExpCfvo::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); - rtl::OString aValue; + OString aValue; if(mrEntry.GetType() == COLORSCALE_FORMULA) { - rtl::OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), maSrcPos, + OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), maSrcPos, mrEntry.GetFormula()->Clone(), GetRoot().GetOpCodeMap() ); - aValue = rtl::OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); + aValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); } else { @@ -1238,17 +1235,17 @@ void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm ) namespace { -rtl::OString createHexStringFromDigit(sal_uInt8 nDigit) +OString createHexStringFromDigit(sal_uInt8 nDigit) { - rtl::OString aString = rtl::OString::valueOf( static_cast<sal_Int32>(nDigit), 16 ); + OString aString = OString::valueOf( static_cast<sal_Int32>(nDigit), 16 ); if(aString.getLength() == 1) aString = aString + OString::number(0); return aString; } -rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16]) +OString createGuidStringFromInt(sal_uInt8 nGuid[16]) { - rtl::OStringBuffer aBuffer; + OStringBuffer aBuffer; aBuffer.append('{'); for(size_t i = 0; i < 16; ++i) { @@ -1257,7 +1254,7 @@ rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16]) aBuffer.append('-'); } aBuffer.append('}'); - rtl::OString aString = aBuffer.makeStringAndClear(); + OString aString = aBuffer.makeStringAndClear(); return aString.toAsciiUpperCase(); } @@ -1570,7 +1567,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : String aToken( aString.GetToken( 0, '\n', nStringIx ) ); if( nToken > 0 ) { - mxString1->Append(rtl::OUString(static_cast<sal_Unicode>('\0'))); + mxString1->Append(OUString(static_cast<sal_Unicode>('\0'))); sFormulaBuf.append( (sal_Unicode) ',' ); } mxString1->Append( aToken ); diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 4221d0c40e90..6a18478e9e30 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -80,9 +80,6 @@ #include <oox/export/utils.hxx> #include <boost/shared_ptr.hpp> -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1225,7 +1222,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos, switch( rRoot.GetBiff() ) { case EXC_BIFF5: - maNoteText = rtl::OUStringToOString(aNoteText, rRoot.GetTextEncoding()); + maNoteText = OUStringToOString(aNoteText, rRoot.GetTextEncoding()); break; case EXC_BIFF8: @@ -1410,7 +1407,7 @@ XclMacroHelper::SetMacroLink( const ScriptEventDescriptor& rEvent, const XclTbxE bool XclMacroHelper::SetMacroLink( const String& rMacroName ) { - OSL_TRACE("SetMacroLink( macroname:=%s )", rtl::OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("SetMacroLink( macroname:=%s )", OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() ); if( rMacroName.Len() ) { sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC ); diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index c4ba7df17a18..58594fe01a13 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -59,16 +59,16 @@ XclExpExtCfvo::XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& if( rEntry.GetType() == COLORSCALE_FORMULA ) { const ScTokenArray* pArr = rEntry.GetFormula(); - rtl::OUString aFormula; + OUString aFormula; if(pArr) { aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), rSrcPos, pArr->Clone(), GetRoot().GetOpCodeMap() ); } - maValue = rtl::OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); + maValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); } else - maValue = rtl::OString::valueOf(rEntry.GetValue()); + maValue = OString::valueOf(rEntry.GetValue()); } namespace { @@ -159,7 +159,7 @@ void XclExpExtDataBar::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElementNS( XML_x14, XML_dataBar ); } -XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ): +XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ): XclExpRoot(rRoot), maId(rId) { @@ -180,7 +180,7 @@ void XclExpExtCfRule::SaveXml( XclExpXmlStream& rStrm ) } -XclExpExtConditionalFormatting::XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ): +XclExpExtConditionalFormatting::XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ): XclExpRoot(rRoot) { maCfRule.reset( new XclExpExtCfRule( *this, rFormat, rPos, rId ) ); @@ -206,7 +206,7 @@ void XclExpExtConditionalFormatting::SaveXml( XclExpXmlStream& rStrm ) XclExpExtCondFormat::XclExpExtCondFormat( const XclExpRoot& rRoot ): XclExpExt( rRoot ) { - maURI = rtl::OString("{78C0D931-6437-407d-A8EE-F0AAD7539E65}"); + maURI = OString("{78C0D931-6437-407d-A8EE-F0AAD7539E65}"); } void XclExpExtCondFormat::SaveXml( XclExpXmlStream& rStrm ) diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 893321b5c263..1ef37c34fd9e 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -2136,7 +2136,7 @@ void XclExpFmlaCompImpl::ProcessExternalName( const XclExpScToken& rTokData ) // insert the new external name and create the tNameX token sal_uInt16 nExtSheet = 0, nExtName = 0; - const ::rtl::OUString* pFile = rExtRefMgr.getExternalFileName( nFileId ); + const OUString* pFile = rExtRefMgr.getExternalFileName( nFileId ); if( pFile && mxData->mpLinkMgr->InsertExtName( nExtSheet, nExtName, *pFile, rName, xArray ) ) { AppendNameXToken( nExtSheet, nExtName, rTokData.mnSpaces ); @@ -2346,7 +2346,7 @@ void XclExpFmlaCompImpl::AppendMacroCallToken( const XclExpExtFuncData& rExtFunc void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces ) { - ::rtl::OUString aXclFuncName; + OUString aXclFuncName; if( mxData->mpLinkMgr && ScGlobal::GetAddInCollection()->GetExcelName( rExtFuncData.maFuncName, GetUILanguage(), aXclFuncName ) ) { sal_uInt16 nExtSheet, nExtName; diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 27821544c5c2..a56fdc390a50 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -47,7 +47,6 @@ #include "xelink.hxx" #include "xehelper.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::i18n::XBreakIterator; @@ -274,9 +273,9 @@ void XclExpAddressConverter::ConvertRangeList( XclRangeList& rXclRanges, namespace { -rtl::OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) +OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) { - const rtl::OUString& aRepr = rUrlField.GetRepresentation(); + const OUString& aRepr = rUrlField.GetRepresentation(); // no representation -> use URL return aRepr.isEmpty() ? rUrlField.GetURL() : aRepr; } @@ -296,9 +295,9 @@ XclExpHyperlinkHelper::~XclExpHyperlinkHelper() { } -rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField ) +OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField ) { - rtl::OUString aUrlRepr; + OUString aUrlRepr; if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 { @@ -555,7 +554,7 @@ void XclExpStringHelper::AppendString( XclExpString& rXclString, const XclExpRoo void XclExpStringHelper::AppendChar( XclExpString& rXclString, const XclExpRoot& rRoot, sal_Unicode cChar ) { if( rRoot.GetBiff() == EXC_BIFF8 ) - rXclString.Append( rtl::OUString(cChar) ); + rXclString.Append( OUString(cChar) ); else rXclString.AppendByte( cChar, rRoot.GetTextEncoding() ); } @@ -848,7 +847,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico else { String aPortionText( mrEE.GetText( aSel ) ); - aPortionText.SearchAndReplaceAll( rtl::OUString('&'), rtl::OUString("&&") ); + aPortionText.SearchAndReplaceAll( OUString('&'), OUString("&&") ); // #i17440# space between font height and numbers in text if( bFontHtChanged && aParaText.Len() && aPortionText.Len() ) { @@ -885,14 +884,14 @@ namespace { /** Encodes special parts of the URL, i.e. directory separators and volume names. @param pTableName Pointer to a table name to be encoded in this URL, or 0. */ -rtl::OUString lclEncodeDosUrl( - XclBiff eBiff, const rtl::OUString& rUrl, const rtl::OUString& rBase, const rtl::OUString* pTableName) +OUString lclEncodeDosUrl( + XclBiff eBiff, const OUString& rUrl, const OUString& rBase, const OUString* pTableName) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if (!rUrl.isEmpty()) { - rtl::OUString aOldUrl = rUrl; + OUString aOldUrl = rUrl; aBuf.append(EXC_URLSTART_ENCODED); if ( aOldUrl.getLength() > 2 && aOldUrl.copy(0,2) == "\\\\" ) @@ -961,16 +960,16 @@ rtl::OUString lclEncodeDosUrl( // ---------------------------------------------------------------------------- -rtl::OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const rtl::OUString& rAbsUrl, const rtl::OUString* pTableName ) +OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName ) { - rtl::OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS); - rtl::OUString aDosBase = INetURLObject(rRoot.GetBasePath()).getFSysPath(INetURLObject::FSYS_DOS); + OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS); + OUString aDosBase = INetURLObject(rRoot.GetBasePath()).getFSysPath(INetURLObject::FSYS_DOS); return lclEncodeDosUrl(rRoot.GetBiff(), aDosUrl, aDosBase, pTableName); } -rtl::OUString XclExpUrlHelper::EncodeDde( const rtl::OUString& rApplic, const rtl::OUString& rTopic ) +OUString XclExpUrlHelper::EncodeDde( const OUString& rApplic, const OUString& rTopic ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rApplic).append(EXC_DDE_DELIM).append(rTopic); return aBuf.makeStringAndClear(); } diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 8c2b451cb7dc..a9ff73ae6187 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -34,7 +34,6 @@ using ::std::auto_ptr; using ::std::find_if; using ::std::vector; -using ::rtl::OUString; using ::com::sun::star::uno::Any; // ============================================================================ @@ -772,10 +771,10 @@ bool XclExpTabInfo::IsMirroredTab( SCTAB nScTab ) const return GetFlag( nScTab, EXC_TABBUF_MIRRORED ); } -rtl::OUString XclExpTabInfo::GetScTabName( SCTAB nScTab ) const +OUString XclExpTabInfo::GetScTabName( SCTAB nScTab ) const { OSL_ENSURE( nScTab < mnScCnt, "XclExpTabInfo::IsActiveTab - sheet out of range" ); - return (nScTab < mnScCnt) ? maTabInfoVec[ nScTab ].maScName : rtl::OUString(); + return (nScTab < mnScCnt) ? maTabInfoVec[ nScTab ].maScName : OUString(); } sal_uInt16 XclExpTabInfo::GetXclTab( SCTAB nScTab ) const @@ -834,7 +833,7 @@ void XclExpTabInfo::CalcXclIndexes() // result: first occur all exported sheets, followed by all external sheets } -typedef ::std::pair< rtl::OUString, SCTAB > XclExpTabName; +typedef ::std::pair< OUString, SCTAB > XclExpTabName; typedef ::std::vector< XclExpTabName > XclExpTabNameVec; inline bool operator<( const XclExpTabName& rArg1, const XclExpTabName& rArg2 ) @@ -1325,14 +1324,14 @@ void XclExpExternSheetBase::WriteExtNameBuffer( XclExpStream& rStrm ) XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, sal_Unicode cCode ) : XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET ) { - Init( rtl::OUString(cCode) ); + Init( OUString(cCode) ); } XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, const String& rTabName ) : XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET ) { // reference to own sheet: \03<sheetname> - Init(rtl::OUString(EXC_EXTSH_TABNAME) + rTabName); + Init(OUString(EXC_EXTSH_TABNAME) + rTabName); } void XclExpExternSheet::Save( XclExpStream& rStrm ) diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 7e7a76025bea..276624cd2e64 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -36,7 +36,6 @@ using namespace ::oox; -using ::rtl::OString; // ============================================================================ // *** Helper classes *** diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index c678691c10e2..8e1ffb114352 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -40,7 +40,6 @@ using namespace ::oox; -using ::rtl::OString; using ::std::set; using ::std::numeric_limits; diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 3402fbcaad9c..4653e2de7fe6 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -56,9 +56,6 @@ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ // Pivot cache @@ -138,7 +135,7 @@ XclExpPCItem::XclExpPCItem( bool bValue ) : // ---------------------------------------------------------------------------- -bool XclExpPCItem::EqualsText( const rtl::OUString& rText ) const +bool XclExpPCItem::EqualsText( const OUString& rText ) const { return rText.isEmpty() ? IsEmpty() : (GetText() && (*GetText() == rText)); } @@ -162,7 +159,7 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const void XclExpPCItem::WriteBody( XclExpStream& rStrm ) { - if( const rtl::OUString* pText = GetText() ) + if( const OUString* pText = GetText() ) { rStrm << XclExpString( *pText ); } @@ -282,7 +279,7 @@ const XclExpPCItem* XclExpPCField::GetItem( sal_uInt16 nItemIdx ) const return GetVisItemList().GetRecord( nItemIdx ).get(); } -sal_uInt16 XclExpPCField::GetItemIndex( const rtl::OUString& rItemName ) const +sal_uInt16 XclExpPCField::GetItemIndex( const OUString& rItemName ) const { const XclExpPCItemList& rItemList = GetVisItemList(); for( size_t nPos = 0, nSize = rItemList.GetSize(); nPos < nSize; ++nPos ) @@ -389,7 +386,7 @@ void XclExpPCField::InitStdGroupField( const XclExpPCField& rBaseField, const Sc // loop over all elements of one group for( size_t nElemIdx = 0, nElemCount = pGroupItem->GetElementCount(); nElemIdx < nElemCount; ++nElemIdx ) { - if (const rtl::OUString* pElemName = pGroupItem->GetElementByIndex(nElemIdx)) + if (const OUString* pElemName = pGroupItem->GetElementByIndex(nElemIdx)) { // try to find the item that is part of the group in the base field sal_uInt16 nBaseItemIdx = rBaseField.GetItemIndex( *pElemName ); @@ -549,7 +546,7 @@ void XclExpPCField::InsertNumDateGroupItems( const ScDPObject& rDPObj, const ScD const ScDPItemData* pData = aDPData.GetMemberById(nDim , aMemberIds[nIdx]); if ( pData ) { - rtl::OUString aStr = pCache->GetFormattedString(nDim, *pData); + OUString aStr = pCache->GetFormattedString(nDim, *pData); InsertGroupItem(new XclExpPCItem(aStr)); } } @@ -974,9 +971,9 @@ XclExpPTItem::XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUs maItemInfo.maVisName.mbUseCache = bUseCache; } -rtl::OUString XclExpPTItem::GetItemName() const +OUString XclExpPTItem::GetItemName() const { - return mpCacheItem ? mpCacheItem->ConvertToText() : rtl::OUString(); + return mpCacheItem ? mpCacheItem->ConvertToText() : OUString(); } void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem ) @@ -1014,9 +1011,9 @@ XclExpPTField::XclExpPTField( const XclExpPivotTable& rPTable, sal_uInt16 nCache // data access ---------------------------------------------------------------- -rtl::OUString XclExpPTField::GetFieldName() const +OUString XclExpPTField::GetFieldName() const { - return mpCacheField ? mpCacheField->GetFieldName() : rtl::OUString(); + return mpCacheField ? mpCacheField->GetFieldName() : OUString(); } sal_uInt16 XclExpPTField::GetFieldIndex() const @@ -1032,7 +1029,7 @@ sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const return static_cast< sal_uInt16 >( maDataInfoVec.size() - 1 ); } -sal_uInt16 XclExpPTField::GetItemIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const +sal_uInt16 XclExpPTField::GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const { for( size_t nPos = 0, nSize = maItemList.GetSize(); nPos < nSize; ++nPos ) if( maItemList.GetRecord( nPos )->GetItemName() == rName ) @@ -1082,11 +1079,11 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim ) if (pLayoutName && !pLayoutName->equals(GetFieldName())) maFieldInfo.SetVisName(*pLayoutName); - const rtl::OUString* pSubtotalName = rSaveDim.GetSubtotalName(); + const OUString* pSubtotalName = rSaveDim.GetSubtotalName(); if (pSubtotalName) { OUString aSubName = lcl_convertCalcSubtotalName(*pSubtotalName); - maFieldExtInfo.mpFieldTotalName.reset(new rtl::OUString(aSubName)); + maFieldExtInfo.mpFieldTotalName.reset(new OUString(aSubName)); } // subtotals @@ -1149,7 +1146,7 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim rDataInfo.SetApiAggFunc( eFunc ); // visible name - const rtl::OUString* pVisName = rSaveDim.GetLayoutName(); + const OUString* pVisName = rSaveDim.GetLayoutName(); if (pVisName) rDataInfo.SetVisName(*pVisName); else @@ -1215,7 +1212,7 @@ void XclExpPTField::Save( XclExpStream& rStrm ) // private -------------------------------------------------------------------- -XclExpPTItem* XclExpPTField::GetItemAcc( const rtl::OUString& rName ) +XclExpPTItem* XclExpPTField::GetItemAcc( const OUString& rName ) { XclExpPTItem* pItem = 0; for( size_t nPos = 0, nSize = maItemList.GetSize(); !pItem && (nPos < nSize); ++nPos ) @@ -1309,12 +1306,12 @@ const XclExpPTField* XclExpPivotTable::GetField( sal_uInt16 nFieldIdx ) const return (nFieldIdx == EXC_SXIVD_DATA) ? &maDataOrientField : maFieldList.GetRecord( nFieldIdx ).get(); } -const XclExpPTField* XclExpPivotTable::GetField( const rtl::OUString& rName ) const +const XclExpPTField* XclExpPivotTable::GetField( const OUString& rName ) const { return const_cast< XclExpPivotTable* >( this )->GetFieldAcc( rName ); } -sal_uInt16 XclExpPivotTable::GetDataFieldIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const +sal_uInt16 XclExpPivotTable::GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const { for( XclPTDataFieldPosVec::const_iterator aIt = maDataFields.begin(), aEnd = maDataFields.end(); aIt != aEnd; ++aIt ) if( const XclExpPTField* pField = GetField( aIt->first ) ) @@ -1492,7 +1489,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) // private -------------------------------------------------------------------- -XclExpPTField* XclExpPivotTable::GetFieldAcc( const rtl::OUString& rName ) +XclExpPTField* XclExpPivotTable::GetFieldAcc( const OUString& rName ) { XclExpPTField* pField = 0; for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos ) @@ -1508,7 +1505,7 @@ XclExpPTField* XclExpPivotTable::GetFieldAcc( const ScDPSaveDimension& rSaveDim return &maDataOrientField; // a real dimension - rtl::OUString aFieldName = ScDPUtil::getSourceDimensionName(rSaveDim.GetName()); + OUString aFieldName = ScDPUtil::getSourceDimensionName(rSaveDim.GetName()); return aFieldName.isEmpty() ? NULL : GetFieldAcc(aFieldName); } @@ -1524,7 +1521,7 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData ) if (!pDim) return; - const rtl::OUString* pLayoutName = pDim->GetLayoutName(); + const OUString* pLayoutName = pDim->GetLayoutName(); if (pLayoutName) maPTInfo.maDataName = *pLayoutName; else diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 54724bbd681c..b7f2f8eb20dc 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -179,7 +179,7 @@ void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) if( mnAttribute == -1 ) return; rStrm.WriteAttributes( - mnAttribute, rtl::OString::valueOf( maValue ).getStr(), + mnAttribute, OString::valueOf( maValue ).getStr(), FSEND ); } diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 475a0c251813..b72503f8f3d4 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -302,7 +302,7 @@ bool XclExpRoot::IsDocumentEncrypted() const return false; } -uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const ::rtl::OUString& aPass ) const +uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const OUString& aPass ) const { uno::Sequence< beans::NamedValue > aEncryptionData; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 2356793ffdef..29d5bd766fc6 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -62,9 +62,6 @@ using ::com::sun::star::registry::InvalidRegistryException; using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::XInterface; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::utl::OStreamWrapper; using ::std::vector; @@ -330,7 +327,7 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF // Xcl has an obscure sense of whether starting a new record or not, // and crashes if it encounters the string header at the very end of a record. // Thus we add 1 to give some room, seems like they do it that way but with another count (10?) -void XclExpStream::WriteByteString( const rtl::OString& rString, sal_uInt16 nMaxLen, bool b16BitCount ) +void XclExpStream::WriteByteString( const OString& rString, sal_uInt16 nMaxLen, bool b16BitCount ) { SetSliceSize( 0 ); sal_Size nLen = ::std::min< sal_Size >( rString.getLength(), nMaxLen ); diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index fa0f1f14b3c6..b1cc1af1e157 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -27,8 +27,6 @@ using namespace ::oox; -using ::rtl::OString; -using ::rtl::OUString; // ============================================================================ @@ -136,7 +134,7 @@ void XclExpString::AssignByte( const String& rString, rtl_TextEncoding eTextEnc, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { // length may differ from length of rString - rtl::OString aByteStr(rtl::OUStringToOString(rString, eTextEnc)); + OString aByteStr(OUStringToOString(rString, eTextEnc)); Build(aByteStr.getStr(), aByteStr.getLength(), nFlags, nMaxLen); } @@ -152,7 +150,7 @@ void XclExpString::AppendByte( const String& rString, rtl_TextEncoding eTextEnc if( rString.Len() > 0 ) { // length may differ from length of rString - rtl::OString aByteStr(rtl::OUStringToOString(rString, eTextEnc)); + OString aByteStr(OUStringToOString(rString, eTextEnc)); BuildAppend(aByteStr.getStr(), aByteStr.getLength()); } } @@ -166,7 +164,7 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc ) } else { - rtl::OString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 + OString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 BuildAppend( aByteStr.getStr(), aByteStr.getLength() ); } } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 34304bfb6b67..b7e054d43afb 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -52,8 +52,6 @@ #include <oox/token/tokens.hxx> #include <boost/ptr_container/ptr_vector.hpp> -using ::rtl::OString; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace oox; @@ -1214,7 +1212,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->singleElement( XML_numFmt, XML_numFmtId, OString::number( mnXclNumFmt ).getStr(), - XML_formatCode, rtl::OUStringToOString(maNumFmtString, RTL_TEXTENCODING_UTF8).getStr(), + XML_formatCode, OUStringToOString(maNumFmtString, RTL_TEXTENCODING_UTF8).getStr(), FSEND ); } @@ -2896,7 +2894,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) pFormatEntry->GetType() != condformat::DATE)) continue; - rtl::OUString aStyleName; + OUString aStyleName; if(pFormatEntry->GetType() == condformat::CONDITION) { const ScCondFormatEntry* pEntry = static_cast<const ScCondFormatEntry*>(pFormatEntry); @@ -2910,7 +2908,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) if (maStyleNameToDxfId.find(aStyleName) == maStyleNameToDxfId.end()) { - maStyleNameToDxfId.insert(std::pair<rtl::OUString, sal_Int32>(aStyleName, nIndex)); + maStyleNameToDxfId.insert(std::pair<OUString, sal_Int32>(aStyleName, nIndex)); SfxStyleSheetBase* pStyle = rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName); if(!pStyle) @@ -2973,9 +2971,9 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) } } -sal_Int32 XclExpDxfs::GetDxfId( const rtl::OUString& rStyleName ) +sal_Int32 XclExpDxfs::GetDxfId( const OUString& rStyleName ) { - std::map<rtl::OUString, sal_Int32>::iterator itr = maStyleNameToDxfId.find(rStyleName); + std::map<OUString, sal_Int32>::iterator itr = maStyleNameToDxfId.find(rStyleName); if(itr!= maStyleNameToDxfId.end()) return itr->second; return -1; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 423798851c24..0c85a4d9ddcd 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -37,9 +37,6 @@ using namespace ::oox; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index ba3a09578e69..763b9e778eb4 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -26,7 +26,6 @@ using namespace ::oox; -using ::rtl::OString; // Workbook view settings records ============================================= diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index aa8d576f1b4c..7f8cc941bfb5 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -81,8 +81,6 @@ #include "xipage.hxx" #include "xiview.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1111,7 +1109,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn // create API struct for label values, set API label separator cssc2::DataPointLabel aPointLabel( bShowValue, bShowPercent, bShowCateg, bShowSymbol ); rPropSet.SetProperty( EXC_CHPROP_LABEL, aPointLabel ); - String aSep = mxLabelProps ? mxLabelProps->maSeparator : rtl::OUString('\n'); + String aSep = mxLabelProps ? mxLabelProps->maSeparator : OUString('\n'); if( aSep.Len() == 0 ) aSep = CREATE_STRING( "; " ); rPropSet.SetStringProperty( EXC_CHPROP_LABELSEPARATOR, aSep ); diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 542a3fe7b7f7..0f423ef5bc13 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -351,7 +351,7 @@ void XclImpHyperlink::ConvertToValidTabName(String& rUrl) // the 1st character must be '#'. return; - String aNewUrl(rtl::OUString('#')), aTabName; + String aNewUrl(OUString('#')), aTabName; bool bInQuote = false; bool bQuoteTabName = false; diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 89d55be8e2f4..ede6c114fb35 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -107,8 +107,6 @@ #include <comphelper/mediadescriptor.hxx> #include <sfx2/docfile.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -390,7 +388,7 @@ void XclImpDrawObjBase::SetAnchor( const XclObjAnchor& rAnchor ) } void XclImpDrawObjBase::SetDffData( - const DffObjData& rDffObjData, const rtl::OUString& rObjName, const rtl::OUString& rHyperlink, + const DffObjData& rDffObjData, const OUString& rObjName, const OUString& rHyperlink, bool bVisible, bool bAutoMargin ) { mnDffShapeId = rDffObjData.nShapeId; @@ -505,7 +503,7 @@ void XclImpDrawObjBase::PostProcessSdrObject( XclImpDffConverter& rDffConv, SdrO void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen ) { - maObjName = rtl::OUString(); + maObjName = OUString(); if( nNameLen > 0 ) { // name length field is repeated before the name @@ -517,7 +515,7 @@ void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen ) void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); // skip padding byte for word boundaries, not contained in nMacroSize if( rStrm.GetRecPos() & 1 ) rStrm.Ignore( 1 ); @@ -525,19 +523,19 @@ void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) void XclImpDrawObjBase::ReadMacro4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); } void XclImpDrawObjBase::ReadMacro5( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); } void XclImpDrawObjBase::ReadMacro8( XclImpStream& rStrm ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); if( rStrm.GetRecLeft() > 6 ) { // macro is stored in a tNameXR token containing a link to a defined name @@ -1453,7 +1451,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& { double fAngle = 180.0; com::sun::star::beans::PropertyValue aTextRotateAngle; - aTextRotateAngle.Name = rtl::OUString( "TextRotateAngle" ); + aTextRotateAngle.Name = OUString( "TextRotateAngle" ); aTextRotateAngle.Value <<= fAngle; SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); aGeometryItem.SetPropertyValue( aTextRotateAngle ); @@ -2228,10 +2226,10 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const if ( xCtrlModel.is() ) { ScfPropertySet aProps( xCtrlModel ); - rtl::OUString sGroupName = rtl::OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) ); + OUString sGroupName = OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) ); aProps.SetStringProperty( "GroupName", sGroupName ); - aProps.SetStringProperty( "RefValue", rtl::OUString::valueOf( nRefVal++ ) ); + aProps.SetStringProperty( "RefValue", OUString::valueOf( nRefVal++ ) ); if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() ) { // propagate cell link info @@ -3207,7 +3205,7 @@ XclImpDffConverter::~XclImpDffConverter() String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ) { - rtl::OUString sOleName; + OUString sOleName; String sCodeName = GetExtDocOptions().GetCodeName( nTab ); if (mxOleCtrlNameOverride.is() && mxOleCtrlNameOverride->hasByName(sCodeName)) @@ -3217,8 +3215,8 @@ String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ) xIdToOleName->getByIndex( nObjId ) >>= sOleName; } OSL_TRACE("XclImpObjectManager::GetOleNameOverride tab %d, ( module %s ) object id ( %d ) is %s", nTab, - rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), nObjId, - rtl::OUStringToOString( sOleName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), nObjId, + OUStringToOString( sOleName, RTL_TEXTENCODING_UTF8 ).getStr() ); return sOleName; } @@ -4191,7 +4189,7 @@ void XclImpObjectManager::ConvertObjects() OUString XclImpObjectManager::GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const { - rtl::OUStringBuffer aDefName; + OUStringBuffer aDefName; DefObjNameMap::const_iterator aIt = maDefObjNames.find( rDrawObj.GetObjType() ); if( aIt != maDefObjNames.end() ) aDefName.append(aIt->second); diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 1656634b0e9f..c002ae9b5197 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -563,7 +563,7 @@ void XclImpHFConverter::InsertField( const SvxFieldItem& rFieldItem ) void XclImpHFConverter::InsertLineBreak() { ESelection& rSel = GetCurrSel(); - mrEE.QuickInsertText( rtl::OUString('\n'), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) ); + mrEE.QuickInsertText( OUString('\n'), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) ); ++rSel.nEndPara; rSel.nEndPos = 0; GetCurrInfo().mnHeight += GetCurrMaxLineHeight(); @@ -761,7 +761,7 @@ void XclImpUrlHelper::DecodeUrl( } void XclImpUrlHelper::DecodeUrl( - ::rtl::OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, const ::rtl::OUString& rEncodedUrl ) + OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, const OUString& rEncodedUrl ) { String aTabName; String aUrl; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 6b4d2c3aece2..a89d36625b5a 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -33,8 +33,6 @@ #include <boost/ptr_container/ptr_vector.hpp> using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index d472e4ed47e5..dcc4168938a0 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -215,10 +215,10 @@ void XclImpPageSettings::Finalize() // *** create page style sheet *** - rtl::OUStringBuffer aStyleName; + OUStringBuffer aStyleName; aStyleName.appendAscii("PageStyle_"); - rtl::OUString aTableName; + OUString aTableName; if( GetDoc().GetName( nScTab, aTableName ) ) aStyleName.append(aTableName); else diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 8ba8d0e69d73..a79d05a3b326 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -53,8 +53,6 @@ using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::sheet::DataPilotFieldOrientation; using ::com::sun::star::sheet::DataPilotFieldOrientation_DATA; using ::com::sun::star::sheet::DataPilotFieldSortInfo; @@ -97,7 +95,7 @@ void lclSetValue( const XclImpRoot& rRoot, const ScAddress& rScPos, double fValu void XclImpPCItem::WriteToSource( const XclImpRoot& rRoot, const ScAddress& rScPos ) const { ScDocument& rDoc = rRoot.GetDoc(); - if( const rtl::OUString* pText = GetText() ) + if( const OUString* pText = GetText() ) rDoc.SetString( rScPos.Col(), rScPos.Row(), rScPos.Tab(), *pText ); else if( const double* pfValue = GetDouble() ) rDoc.SetValue( rScPos.Col(), rScPos.Row(), rScPos.Tab(), *pfValue ); @@ -190,11 +188,11 @@ XclImpPCField::~XclImpPCField() // general field/item access -------------------------------------------------- -const rtl::OUString& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) const +const OUString& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) const { if( IsGroupChildField() && (mnFieldIdx < rVisNames.size()) ) { - const rtl::OUString& rVisName = rVisNames[ mnFieldIdx ]; + const OUString& rVisName = rVisNames[ mnFieldIdx ]; if (!rVisName.isEmpty()) return rVisName; } @@ -705,10 +703,10 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm ) nScTab = rDoc.GetTableCount(); rDoc.MakeTable( nScTab ); - rtl::OUStringBuffer aDummyName(rtl::OUString("DPCache")); + OUStringBuffer aDummyName(OUString("DPCache")); if( maTabName.Len() > 0 ) aDummyName.append( '_' ).append( maTabName ); - rtl::OUString aName = aDummyName.makeStringAndClear(); + OUString aName = aDummyName.makeStringAndClear(); rDoc.CreateValidTabName( aName ); rDoc.RenameTab( nScTab, aName ); // set sheet index to source range @@ -889,7 +887,7 @@ XclImpPTItem::XclImpPTItem( const XclImpPCField* pCacheField ) : { } -const rtl::OUString* XclImpPTItem::GetItemName() const +const OUString* XclImpPTItem::GetItemName() const { if( mpCacheField ) if( const XclImpPCItem* pCacheItem = mpCacheField->GetItem( maItemInfo.mnCacheIdx ) ) @@ -905,7 +903,7 @@ void XclImpPTItem::ReadSxvi( XclImpStream& rStrm ) void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const { - if (const rtl::OUString* pItemName = GetItemName()) + if (const OUString* pItemName = GetItemName()) { ScDPSaveMember& rMember = *rSaveDim.GetMemberByName( *pItemName ); rMember.SetIsVisible( !::get_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN ) ); @@ -931,16 +929,16 @@ const XclImpPCField* XclImpPTField::GetCacheField() const return xPCache ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0; } -rtl::OUString XclImpPTField::GetFieldName() const +OUString XclImpPTField::GetFieldName() const { const XclImpPCField* pField = GetCacheField(); - return pField ? pField->GetFieldName( mrPTable.GetVisFieldNames() ) : rtl::OUString(); + return pField ? pField->GetFieldName( mrPTable.GetVisFieldNames() ) : OUString(); } -rtl::OUString XclImpPTField::GetVisFieldName() const +OUString XclImpPTField::GetVisFieldName() const { - const rtl::OUString* pVisName = maFieldInfo.GetVisName(); - return pVisName ? *pVisName : rtl::OUString(); + const OUString* pVisName = maFieldInfo.GetVisName(); + return pVisName ? *pVisName : OUString(); } const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const @@ -948,7 +946,7 @@ const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : 0; } -const rtl::OUString* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const +const OUString* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const { const XclImpPTItem* pItem = GetItem( nItemIdx ); return pItem ? pItem->GetItemName() : 0; @@ -997,7 +995,7 @@ void XclImpPTField::ConvertPageField( ScDPSaveData& rSaveData ) const OSL_ENSURE( maFieldInfo.mnAxes & EXC_SXVD_AXIS_PAGE, "XclImpPTField::ConvertPageField - no page field" ); if( ScDPSaveDimension* pSaveDim = ConvertRCPField( rSaveData ) ) { - const rtl::OUString* pName = GetItemName( maPageInfo.mnSelItem ); + const OUString* pName = GetItemName( maPageInfo.mnSelItem ); if (pName) pSaveDim->SetCurrentPage(pName); } @@ -1031,7 +1029,7 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& rSaveData ) const if (maDataInfoList.empty()) return; - rtl::OUString aFieldName = GetFieldName(); + OUString aFieldName = GetFieldName(); if (aFieldName.isEmpty()) return; @@ -1095,7 +1093,7 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con ConvertFieldInfo( rSaveDim ); // visible name - if (const rtl::OUString* pVisName = maFieldInfo.GetVisName()) + if (const OUString* pVisName = maFieldInfo.GetVisName()) if (!pVisName->isEmpty()) rSaveDim.SetLayoutName( *pVisName ); @@ -1158,7 +1156,7 @@ void XclImpPTField::ConvertDataField( ScDPSaveDimension& rSaveDim, const XclPTDa void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const { // visible name - const rtl::OUString* pVisName = rDataInfo.GetVisName(); + const OUString* pVisName = rDataInfo.GetVisName(); if (pVisName && !pVisName->isEmpty()) rSaveDim.SetLayoutName(*pVisName); @@ -1176,7 +1174,7 @@ void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const Xcl aFieldRef.ReferenceItemType = rDataInfo.GetApiRefItemType(); if (aFieldRef.ReferenceItemType == sheet::DataPilotFieldReferenceItemType::NAMED) { - const rtl::OUString* pRefItemName = pRefField->GetItemName(rDataInfo.mnRefItem); + const OUString* pRefItemName = pRefField->GetItemName(rDataInfo.mnRefItem); if (pRefItemName) aFieldRef.ReferenceItemName = *pRefItemName; } @@ -1230,11 +1228,11 @@ const XclImpPTField* XclImpPivotTable::GetDataField( sal_uInt16 nDataFieldIdx ) return 0; } -rtl::OUString XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const +OUString XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const { if( const XclImpPTField* pField = GetDataField( nDataFieldIdx ) ) return pField->GetFieldName(); - return rtl::OUString(); + return OUString(); } // records -------------------------------------------------------------------- @@ -1479,7 +1477,7 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), SC_MF_BUTTON); sal_uInt16 nMFlag = SC_MF_BUTTON_POPUP; - rtl::OUString aName = rDoc.GetString(itr->Col(), itr->Row(), itr->Tab()); + OUString aName = rDoc.GetString(itr->Col(), itr->Row(), itr->Tab()); if (rSaveData.HasInvisibleMember(aName)) nMFlag |= SC_MF_HIDDEN_MEMBER; diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index f59542ee562d..206a0930dfda 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -268,7 +268,7 @@ XclImpTabViewSettings& XclImpRoot::GetTabViewSettings() const String XclImpRoot::GetScAddInName( const String& rXclName ) const { - ::rtl::OUString aScName; + OUString aScName; if( ScGlobal::GetAddInCollection()->GetCalcName( rXclName, aScName ) ) return aScName; return rXclName; diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 9d68955eb5ac..33dd89c1e231 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -27,9 +27,6 @@ #include <vector> -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringToOString; using namespace ::com::sun::star; @@ -64,7 +61,7 @@ XclImpDecrypterRef XclImpDecrypter::Clone() const return xNewDecr; } -::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) +::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) { o_rEncryptionData = OnVerifyPassword( rPassword ); mnError = o_rEncryptionData.getLength() ? ERRCODE_NONE : ERRCODE_ABORT; @@ -132,7 +129,7 @@ XclImpBiff5Decrypter* XclImpBiff5Decrypter::OnClone() const return new XclImpBiff5Decrypter( *this ); } -uno::Sequence< beans::NamedValue > XclImpBiff5Decrypter::OnVerifyPassword( const ::rtl::OUString& rPassword ) +uno::Sequence< beans::NamedValue > XclImpBiff5Decrypter::OnVerifyPassword( const OUString& rPassword ) { maEncryptionData.realloc( 0 ); @@ -226,7 +223,7 @@ XclImpBiff8Decrypter* XclImpBiff8Decrypter::OnClone() const return new XclImpBiff8Decrypter( *this ); } -uno::Sequence< beans::NamedValue > XclImpBiff8Decrypter::OnVerifyPassword( const ::rtl::OUString& rPassword ) +uno::Sequence< beans::NamedValue > XclImpBiff8Decrypter::OnVerifyPassword( const OUString& rPassword ) { maEncryptionData.realloc( 0 ); diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index ed27b335eacf..20965db3ace4 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -51,7 +51,6 @@ #include "xlroot.hxx" #include "xlstyle.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 53713923acb5..974155aac6d4 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -29,7 +29,6 @@ #include "xlroot.hxx" #include "xltools.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::drawing::XShape; diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 8a902e09279c..29d78d8ff5cb 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -51,10 +51,10 @@ XclPCItem::~XclPCItem() void XclPCItem::SetEmpty() { meType = EXC_PCITEM_EMPTY; - maText = rtl::OUString(); + maText = OUString(); } -void XclPCItem::SetText( const rtl::OUString& rText ) +void XclPCItem::SetText( const OUString& rText ) { meType = EXC_PCITEM_TEXT; maText = rText; @@ -64,7 +64,7 @@ void XclPCItem::SetDouble( double fValue ) { meType = EXC_PCITEM_DOUBLE; //! TODO convert double to string - maText = rtl::OUString(); + maText = OUString(); mfValue = fValue; } @@ -72,7 +72,7 @@ void XclPCItem::SetDateTime( const DateTime& rDateTime ) { meType = EXC_PCITEM_DATETIME; //! TODO convert date to string - maText = rtl::OUString(); + maText = OUString(); maDateTime = rDateTime; } @@ -86,7 +86,7 @@ void XclPCItem::SetInteger( sal_Int16 nValue ) void XclPCItem::SetError( sal_uInt16 nError ) { meType = EXC_PCITEM_ERROR; - maText = rtl::OUString(); + maText = OUString(); mnError = nError; switch( nError ) { @@ -105,7 +105,7 @@ void XclPCItem::SetBool( bool bValue ) { meType = EXC_PCITEM_BOOL; //! TODO convert boolean to string - maText = rtl::OUString(); + maText = OUString(); mbValue = bValue; } @@ -133,7 +133,7 @@ bool XclPCItem::IsEmpty() const return meType == EXC_PCITEM_EMPTY; } -const rtl::OUString* XclPCItem::GetText() const +const OUString* XclPCItem::GetText() const { return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText : NULL; } @@ -188,7 +188,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPCFieldInfo& rInfo ) if( rStrm.GetRecLeft() >= 3 ) rInfo.maName = rStrm.ReadUniString(); else - rInfo.maName = rtl::OUString(); + rInfo.maName = OUString(); return rStrm; } @@ -398,7 +398,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ) rStrm >> nStrLen; rCachedName.mbUseCache = nStrLen == EXC_PT_NOSTRING; if( rCachedName.mbUseCache ) - rCachedName.maName = rtl::OUString(); + rCachedName.maName = OUString(); else rCachedName.maName = rStrm.ReadUniString( nStrLen ); return rStrm; @@ -415,12 +415,12 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam // ---------------------------------------------------------------------------- -const rtl::OUString* XclPTVisNameInfo::GetVisName() const +const OUString* XclPTVisNameInfo::GetVisName() const { return HasVisName() ? &maVisName.maName : 0; } -void XclPTVisNameInfo::SetVisName( const rtl::OUString& rName ) +void XclPTVisNameInfo::SetVisName( const OUString& rName ) { maVisName.maName = rName; maVisName.mbUseCache = rName.isEmpty(); @@ -640,7 +640,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTFieldExtInfo& rInfo ) rStrm.Ignore(10); if (nNameLen != 0xFF) // Custom field total name is used. Pick it up. - rInfo.mpFieldTotalName.reset(new rtl::OUString(rStrm.ReadUniString(nNameLen, 0))); + rInfo.mpFieldTotalName.reset(new OUString(rStrm.ReadUniString(nNameLen, 0))); return rStrm; } @@ -654,7 +654,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldExtInfo& rInfo ) if (rInfo.mpFieldTotalName.get() && !rInfo.mpFieldTotalName->isEmpty()) { - rtl::OUString aFinalName = *rInfo.mpFieldTotalName; + OUString aFinalName = *rInfo.mpFieldTotalName; if (aFinalName.getLength() >= 254) aFinalName = aFinalName.copy(0, 254); sal_uInt8 nNameLen = static_cast<sal_uInt8>(aFinalName.getLength()); @@ -992,7 +992,7 @@ void XclPTViewEx9Info::Init( const ScDPObject& rDPObj ) const ScDPSaveData* pData = rDPObj.GetSaveData(); if (pData) { - const rtl::OUString* pGrandTotal = pData->GetGrandTotalName(); + const OUString* pGrandTotal = pData->GetGrandTotalName(); if (pGrandTotal) maGrandTotalName = *pGrandTotal; } diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 3e4b44b62928..f8c613cf87e5 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -52,7 +52,6 @@ namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; -using ::rtl::OUString; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; @@ -211,7 +210,7 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData ) aFont.SetCharSet( rFontData.GetFontEncoding() ); aFont.SetWeight( rFontData.GetScWeight() ); pPrinter->SetFont( aFont ); - mrData.mnCharWidth = pPrinter->GetTextWidth( rtl::OUString('0') ); + mrData.mnCharWidth = pPrinter->GetTextWidth( OUString('0') ); } if( mrData.mnCharWidth <= 0 ) { diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index fd02260ae039..56542006028c 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -45,7 +45,7 @@ #include <map> using namespace com::sun::star; -typedef std::map< sal_Int16, rtl::OUString > IdToString; +typedef std::map< sal_Int16, OUString > IdToString; class MSOExcelCommandConvertor : public MSOCommandConvertor { @@ -53,8 +53,8 @@ class MSOExcelCommandConvertor : public MSOCommandConvertor IdToString tcidToOOcmd; public: MSOExcelCommandConvertor(); - virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key ); + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ); }; MSOExcelCommandConvertor::MSOExcelCommandConvertor() @@ -62,27 +62,27 @@ MSOExcelCommandConvertor::MSOExcelCommandConvertor() /* // mso command id to ooo command string // #FIXME and *HUNDREDS* of id's to added here - msoToOOcmd[ 0x20b ] = rtl::OUString(".uno:CloseDoc"); - msoToOOcmd[ 0x50 ] = rtl::OUString(".uno:Open"); + msoToOOcmd[ 0x20b ] = OUString(".uno:CloseDoc"); + msoToOOcmd[ 0x50 ] = OUString(".uno:Open"); // mso tcid to ooo command string // #FIXME and *HUNDREDS* of id's to added here - tcidToOOcmd[ 0x9d9 ] = rtl::OUString(".uno:Print"); + tcidToOOcmd[ 0x9d9 ] = OUString(".uno:Print"); */ } -rtl::OUString MSOExcelCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) +OUString MSOExcelCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = msoToOOcmd.find( key ); if ( it != msoToOOcmd.end() ) sResult = it->second; return sResult; } -rtl::OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) +OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = tcidToOOcmd.find( key ); if ( it != tcidToOOcmd.end() ) sResult = it->second; @@ -167,7 +167,7 @@ bool ScCTB::ImportMenuTB( ScCTBWrapper& rWrapper, const css::uno::Reference< css bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { - static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); + static OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); bool bRes = false; try { @@ -180,16 +180,16 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); WString& name = tb.getName(); // set UI name for toolbar - xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( name.getString() ) ); + xProps->setPropertyValue( OUString("UIName"), uno::makeAny( name.getString() ) ); - rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); + OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) ) return false; } - OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Name of toolbar :-/ %s", OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() ); helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess ); helper.applyIcons(); @@ -305,7 +305,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere else { beans::PropertyValue aProp; - aProp.Name = rtl::OUString("ItemDescriptorContainer"); + aProp.Name = OUString("ItemDescriptorContainer"); aProp.Value <<= xMenuDesc; props.push_back( aProp ); } @@ -316,7 +316,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere { // insert spacer uno::Sequence< beans::PropertyValue > sProps( 1 ); - sProps[ 0 ].Name = rtl::OUString("Type"); + sProps[ 0 ].Name = OUString("Type"); sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) ); } @@ -399,7 +399,7 @@ ScCTBWrapper::Print( FILE* fp ) } } -ScCTB* ScCTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) +ScCTB* ScCTBWrapper::GetCustomizationData( const OUString& sTBName ) { ScCTB* pCTB = NULL; for ( std::vector< ScCTB >::iterator it = rCTB.begin(); it != rCTB.end(); ++it ) @@ -425,7 +425,7 @@ bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) for ( std::vector<ScCTB>::iterator it = rCTB.begin(); it != it_end; ++it ) { // for each customtoolbar - CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) ); + CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) ); helper.setMSOCommandMap( new MSOExcelCommandConvertor() ); // Ignore menu toolbars, excel doesn't ( afaics ) store // menu customizations ( but you can have menus in a customtoolbar diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 41b10028f016..7344a4d4e158 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -79,7 +79,7 @@ public: bool IsMenuToolbar(); bool ImportCustomToolBar( ScCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); - rtl::OUString GetName() { return tb.getName().getString(); } + OUString GetName() { return tb.getName().getString(); } }; @@ -115,7 +115,7 @@ public: bool Read(SvStream &rS); void Print( FILE* ); bool ImportCustomToolBar( SfxObjectShell& rDocSh ); - ScCTB* GetCustomizationData( const rtl::OUString& name ); + ScCTB* GetCustomizationData( const OUString& name ); }; diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 4834122038f8..1bb40c6f4a24 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -38,7 +38,6 @@ #include "xiroot.hxx" #include "xltools.hxx" -using ::rtl::OUString; // GUID import/export ========================================================= @@ -482,21 +481,21 @@ OUString XclTools::GetXclBuiltInDefName( sal_Unicode cBuiltIn ) "XclTools::GetXclBuiltInDefName - built-in defined name list modified" ); if( cBuiltIn < SAL_N_ELEMENTS( ppcDefNames ) ) - return rtl::OUString::createFromAscii(ppcDefNames[cBuiltIn]); + return OUString::createFromAscii(ppcDefNames[cBuiltIn]); else return OUString::number(cBuiltIn); } OUString XclTools::GetBuiltInDefName( sal_Unicode cBuiltIn ) { - rtl::OUStringBuffer aBuf(maDefNamePrefix); + OUStringBuffer aBuf(maDefNamePrefix); aBuf.append(GetXclBuiltInDefName(cBuiltIn)); return aBuf.makeStringAndClear(); } OUString XclTools::GetBuiltInDefNameXml( sal_Unicode cBuiltIn ) { - rtl::OUStringBuffer aBuf(maDefNamePrefixXml); + OUStringBuffer aBuf(maDefNamePrefixXml); aBuf.append(GetXclBuiltInDefName(cBuiltIn)); return aBuf.makeStringAndClear(); } @@ -552,7 +551,7 @@ OUString XclTools::GetBuiltInStyleName( sal_uInt8 nStyleId, const OUString& rNam } else { - rtl::OUStringBuffer aBuf(maStyleNamePrefix1); + OUStringBuffer aBuf(maStyleNamePrefix1); if( nStyleId < SAL_N_ELEMENTS( ppcStyleNames ) ) aBuf.appendAscii(ppcStyleNames[nStyleId]); else if (!rName.isEmpty()) @@ -594,7 +593,7 @@ bool XclTools::IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyl { if( nId != EXC_STYLE_NORMAL ) { - OUString aShortName = rtl::OUString::createFromAscii(ppcStyleNames[nId]); + OUString aShortName = OUString::createFromAscii(ppcStyleNames[nId]); if( String(rStyleName).EqualsIgnoreCaseAscii( aShortName, nPrefixLen, aShortName.getLength() ) && (nNextChar < nPrefixLen + aShortName.getLength())) { @@ -651,9 +650,9 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons const OUString XclTools::maCFStyleNamePrefix1( RTL_CONSTASCII_USTRINGPARAM( "Excel_CondFormat_" ) ); const OUString XclTools::maCFStyleNamePrefix2( RTL_CONSTASCII_USTRINGPARAM( "ConditionalStyle_" ) ); -rtl::OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ) +OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ) { - rtl::OUStringBuffer aBuf(maCFStyleNamePrefix1); + OUStringBuffer aBuf(maCFStyleNamePrefix1); aBuf.append(static_cast<sal_Int32>(nScTab+1)); aBuf.append(sal_Unicode('_')); aBuf.append(static_cast<sal_Int32>(nFormat+1)); @@ -711,7 +710,7 @@ OUString XclTools::GetXclMacroName( const OUString& rSbMacroUrl ) sal_Int32 nPrjDot = rSbMacroUrl.indexOf( '.', maSbMacroPrefix.getLength() ) + 1; return rSbMacroUrl.copy( nPrjDot, nSbMacroUrlLen - nPrjDot - maSbMacroSuffix.getLength() ); } - return rtl::OUString(); + return OUString(); } // read/write colors ---------------------------------------------------------- diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index 58d2737246af..7250053ec69a 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include "address.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::PropertyValue; diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index c97612d8b6cc..47f35c0d2cf1 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -37,7 +37,6 @@ #include <svl/itemset.hxx> #include "miscuno.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -110,7 +109,7 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; - ::rtl::OUString aPassword; + OUString aPassword; SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); @@ -190,7 +189,7 @@ bool ScfPropertySet::GetAnyProperty( Any& rValue, const OUString& rPropName ) co return bHasValue; } -bool ScfPropertySet::GetBoolProperty( const ::rtl::OUString& rPropName ) const +bool ScfPropertySet::GetBoolProperty( const OUString& rPropName ) const { Any aAny; return GetAnyProperty( aAny, rPropName ) && ScUnoHelpFunctions::GetBoolFromAny( aAny ); @@ -203,7 +202,7 @@ OUString ScfPropertySet::GetStringProperty( const OUString& rPropName ) const return aOUString; } -bool ScfPropertySet::GetColorProperty( Color& rColor, const ::rtl::OUString& rPropName ) const +bool ScfPropertySet::GetColorProperty( Color& rColor, const OUString& rPropName ) const { sal_Int32 nApiColor = 0; bool bRet = GetProperty( nApiColor, rPropName ); @@ -247,9 +246,9 @@ void ScfPropertySet::SetAnyProperty( const OUString& rPropName, const Any& rValu } catch (const Exception&) { - OSL_FAIL(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM( + OSL_FAIL(OStringBuffer(RTL_CONSTASCII_STRINGPARAM( "ScfPropertySet::SetAnyProperty - cannot set property \"")) - .append(rtl::OUStringToOString(rPropName, + .append(OUStringToOString(rPropName, RTL_TEXTENCODING_ASCII_US)) .append('"').getStr()); } diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 5cf7042db873..4a9cdcdb0846 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -261,9 +261,9 @@ ScStyleSheet& ScfTools::MakePageStyleSheet( ScStyleSheetPool& rPool, const OUStr // *** byte string import operations *** -------------------------------------- -rtl::OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) +OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) { - rtl::OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); + OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); rnBytesLeft -= aRet.getLength(); //we read this number of bytes anyway if (rStrm.good()) //if the stream is happy we read the null terminator as well --rnBytesLeft; diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 826797db1523..cb4b1645df07 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -144,9 +144,9 @@ FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const String& } -static rtl::OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) +static OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) { - rtl::OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup); + OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup); aByteStr.append(' '); if( nSpan > 1 ) { @@ -196,9 +196,9 @@ static void lcl_AddStamp( String& rStr, const String& rName, } -static rtl::OString lcl_makeHTMLColorTriplet(const Color& rColor) +static OString lcl_makeHTMLColorTriplet(const Color& rColor) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("\"#")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("\"#")); // <font COLOR="#00FF40">hallo</font> sal_Char buf[64]; sal_Char* p = buf; @@ -415,7 +415,7 @@ void ScHTMLExport::WriteOverview() OUT_STR( ScGlobal::GetRscString( STR_OVERVIEW ) ); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head1 ); - rtl::OUString aStr; + OUString aStr; const SCTAB nCount = pDoc->GetTableCount(); for ( SCTAB nTab = 0; nTab < nCount; nTab++ ) @@ -486,10 +486,10 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) } -rtl::OString ScHTMLExport::BorderToStyle(const char* pBorderName, +OString ScHTMLExport::BorderToStyle(const char* pBorderName, const SvxBorderLine* pLine, bool& bInsertSemicolon) { - rtl::OStringBuffer aOut; + OStringBuffer aOut; if ( pLine ) { @@ -637,7 +637,7 @@ void ScHTMLExport::WriteTables() { const SCTAB nTabCount = pDoc->GetTableCount(); const OUString aStrTable( ScResId( SCSTR_TABLE ) ); - rtl::OUString aStr; + OUString aStr; OUString aStrOut; SCCOL nStartCol; SCROW nStartRow; @@ -708,7 +708,7 @@ void ScHTMLExport::WriteTables() } // <TABLE ...> - rtl::OStringBuffer aByteStrOut(OOO_STRING_SVTOOLS_HTML_table); + OStringBuffer aByteStrOut(OOO_STRING_SVTOOLS_HTML_table); bTabHasGraphics = bTabAlignedLeft = false; if ( bAll && pDrawLayer ) @@ -1086,7 +1086,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) if ( bSetFont ) { - rtl::OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font); + OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font); if ( bSetFontName ) { aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_face). @@ -1094,7 +1094,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) xub_StrLen nFonts = comphelper::string::getTokenCount(rFontItem.GetFamilyName(), ';'); if ( nFonts == 1 ) { - rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( + OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( rFontItem.GetFamilyName(), eDestEnc, &aNonConvertibleChars); aStr.append(aTmpStr); } @@ -1103,7 +1103,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) const String& rList = rFontItem.GetFamilyName(); for ( sal_Int32 j = 0, nPos = 0; j < (sal_Int32)nFonts; j++ ) { - rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( + OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( rList.GetToken( 0, ';', nPos ), eDestEnc, &aNonConvertibleChars); aStr.append(aTmpStr); diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 0d31c275b3a4..67f7642a1f81 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -123,7 +123,7 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) { SdrObject* pObject = pE->pObject; - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).append('='). append(static_cast<sal_Int32>(pE->aSize.Width())); aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height).append('='). @@ -135,7 +135,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_vspace).append('='). append(static_cast<sal_Int32>(pE->aSpace.Height())); } - rtl::OString aOpt = aBuf.makeStringAndClear(); + OString aOpt = aBuf.makeStringAndClear(); switch ( pObject->GetObjIdentifier() ) { case OBJ_GRAF: @@ -182,7 +182,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf, - const rtl::OString& rImgOptions, sal_uLong nXOutFlags ) + const OString& rImgOptions, sal_uLong nXOutFlags ) { // Embedded graphic -> create an image file if( !rLinkName.Len() ) diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 5510241440ae..40d4fd173625 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -65,11 +65,11 @@ using namespace ::com::sun::star; ScHTMLStyles::ScHTMLStyles() : maEmpty() {} void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pClassName, size_t nClassName, - const rtl::OUString& aProp, const rtl::OUString& aValue) + const OUString& aProp, const OUString& aValue) { if (pElemName) { - rtl::OUString aElem(pElemName, nElemName, RTL_TEXTENCODING_UTF8); + OUString aElem(pElemName, nElemName, RTL_TEXTENCODING_UTF8); aElem = aElem.toAsciiLowerCase(); if (pClassName) { @@ -90,7 +90,7 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla } NamePropsType* pClsProps = itrElem->second; - rtl::OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); + OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); aClass = aClass.toAsciiLowerCase(); insertProp(*pClsProps, aClass, aProp, aValue); } @@ -105,15 +105,15 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla if (pClassName) { // Class name only. Add it to the global. - rtl::OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); + OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); aClass = aClass.toAsciiLowerCase(); insertProp(maGlobalProps, aClass, aProp, aValue); } } } -const rtl::OUString& ScHTMLStyles::getPropertyValue( - const rtl::OUString& rElem, const rtl::OUString& rClass, const rtl::OUString& rPropName) const +const OUString& ScHTMLStyles::getPropertyValue( + const OUString& rElem, const OUString& rClass, const OUString& rPropName) const { // First, look into the element-class storage. { @@ -158,8 +158,8 @@ const rtl::OUString& ScHTMLStyles::getPropertyValue( } void ScHTMLStyles::insertProp( - NamePropsType& rStore, const rtl::OUString& aName, - const rtl::OUString& aProp, const rtl::OUString& aValue) + NamePropsType& rStore, const OUString& aName, + const OUString& aProp, const OUString& aValue) { NamePropsType::iterator itr = rStore.find(aName); if (itr == rStore.end()) @@ -294,11 +294,11 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = rtl::OUString( "text/html; charset=" ); + String aContentType = OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } @@ -1060,12 +1060,12 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) break; case HTML_O_SDVAL: { - pActEntry->pValStr = new rtl::OUString( rOption.GetString() ); + pActEntry->pValStr = new OUString( rOption.GetString() ); } break; case HTML_O_SDNUM: { - pActEntry->pNumStr = new rtl::OUString( rOption.GetString() ); + pActEntry->pNumStr = new OUString( rOption.GetString() ); } break; } @@ -1397,7 +1397,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) if ( !pActEntry->bHasGraphic ) { // ALT text only if not any image loaded if (!pActEntry->aAltText.isEmpty()) - pActEntry->aAltText += rtl::OUString("; "); + pActEntry->aAltText += OUString("; "); pActEntry->aAltText += rOption.GetString(); } @@ -1443,7 +1443,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) if ( !pActEntry->bHasGraphic ) { // discard any ALT text in this cell if we have any image pActEntry->bHasGraphic = true; - pActEntry->aAltText = rtl::OUString(); + pActEntry->aAltText = OUString(); } pImage->aFilterName = rFilter.GetImportFormatName( nFormat ); pImage->pGraphic = pGraphic; @@ -1523,7 +1523,7 @@ void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) { case HTML_O_NAME: { - pActEntry->pName = new rtl::OUString(rOption.GetString()); + pActEntry->pName = new OUString(rOption.GetString()); } break; } @@ -1612,7 +1612,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) case HTML_TITLE_ON: { bInTitle = true; - aString = rtl::OUString(); + aString = OUString(); } break; case HTML_TITLE_OFF: @@ -2158,9 +2158,9 @@ namespace { * Decode a numbert format string stored in Excel-generated HTML's CSS * region. */ -rtl::OUString decodeNumberFormat(const rtl::OUString& rFmt) +OUString decodeNumberFormat(const OUString& rFmt) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; const sal_Unicode* p = rFmt.getStr(); sal_Int32 n = rFmt.getLength(); for (sal_Int32 i = 0; i < n; ++i, ++p) @@ -2186,7 +2186,7 @@ rtl::OUString decodeNumberFormat(const rtl::OUString& rFmt) } if (nDigitCount) { - sal_Int32 nVal = rtl::OUString(p1, nDigitCount).toInt32(16); + sal_Int32 nVal = OUString(p1, nDigitCount).toInt32(16); aBuf.append(static_cast<sal_Unicode>(nVal)); } } @@ -2206,7 +2206,7 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) // read needed options from the <td> tag ScHTMLSize aSpanSize( 1, 1 ); SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<rtl::OUString> pValStr, pNumStr; + ::std::auto_ptr<OUString> pValStr, pNumStr; SAL_WNODEPRECATED_DECLARATIONS_POP const HTMLOptions& rOptions = static_cast<HTMLParser*>(rInfo.pParser)->GetOptions(); HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end(); @@ -2222,21 +2222,21 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) aSpanSize.mnRows = static_cast<SCROW>( getLimitedValue<sal_Int32>( itr->GetString().ToInt32(), 1, 256 ) ); break; case HTML_O_SDVAL: - pValStr.reset(new rtl::OUString(itr->GetString())); + pValStr.reset(new OUString(itr->GetString())); break; case HTML_O_SDNUM: - pNumStr.reset(new rtl::OUString(itr->GetString())); + pNumStr.reset(new OUString(itr->GetString())); break; case HTML_O_CLASS: { // Pick up the number format associated with this class (if // any). - rtl::OUString aElem("td"); - rtl::OUString aClass = itr->GetString(); - rtl::OUString aProp("mso-number-format"); + OUString aElem("td"); + OUString aClass = itr->GetString(); + OUString aProp("mso-number-format"); const ScHTMLStyles& rStyles = mpParser->GetStyles(); - const rtl::OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); - rtl::OUString aNumFmt = decodeNumberFormat(rVal); + const OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); + OUString aNumFmt = decodeNumberFormat(rVal); nNumberFormat = GetFormatTable()->GetEntryKey(aNumFmt); if (nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND) @@ -2940,11 +2940,11 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = rtl::OUString( "text/html; charset=" ); + String aContentType = OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } @@ -3121,7 +3121,7 @@ void ScHTMLQueryParser::TitleOff( const ImportInfo& rInfo ) { if( mbTitleOn ) { - rtl::OUString aTitle = maTitle.makeStringAndClear().trim(); + OUString aTitle = maTitle.makeStringAndClear().trim(); if (!aTitle.isEmpty() && mpDoc->GetDocumentShell()) { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( @@ -3236,8 +3236,8 @@ public: const SelectorName& rSelName = *itr; const MemStr& rElem = rSelName.first; const MemStr& rClass = rSelName.second; - rtl::OUString aName(maPropName.mp, maPropName.mn, RTL_TEXTENCODING_UTF8); - rtl::OUString aValue(maPropValue.mp, maPropValue.mn, RTL_TEXTENCODING_UTF8); + OUString aName(maPropName.mp, maPropName.mn, RTL_TEXTENCODING_UTF8); + OUString aValue(maPropValue.mp, maPropValue.mn, RTL_TEXTENCODING_UTF8); mrStyles.add(rElem.mp, rElem.mn, rClass.mp, rClass.mn, aName, aValue); } maPropName = MemStr(); @@ -3247,9 +3247,9 @@ public: } -void ScHTMLQueryParser::ParseStyle(const rtl::OUString& rStrm) +void ScHTMLQueryParser::ParseStyle(const OUString& rStrm) { - rtl::OString aStr = rtl::OUStringToOString(rStrm, RTL_TEXTENCODING_UTF8); + OString aStr = OUStringToOString(rStrm, RTL_TEXTENCODING_UTF8); CSSHandler aHdl(GetStyles()); orcus::css_parser<CSSHandler> aParser(aStr.getStr(), aStr.getLength(), aHdl); try diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 90576467d949..dded94eb74aa 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -209,7 +209,7 @@ public: */ static bool parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRow, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStart = 0, sal_Int32 nLength = SAL_MAX_INT32 ); @@ -234,7 +234,7 @@ public: static bool parseOoxRange2d( sal_Int32& ornStartColumn, sal_Int32& ornStartRow, sal_Int32& ornEndColumn, sal_Int32& ornEndRow, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStart = 0, sal_Int32 nLength = SAL_MAX_INT32 ); @@ -313,7 +313,7 @@ public: */ bool convertToCellAddressUnchecked( ::com::sun::star::table::CellAddress& orAddress, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -327,7 +327,7 @@ public: */ bool convertToCellAddress( ::com::sun::star::table::CellAddress& orAddress, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); @@ -340,7 +340,7 @@ public: @return A valid API cell address struct. */ ::com::sun::star::table::CellAddress createValidCellAddress( - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); @@ -445,7 +445,7 @@ public: */ bool convertToCellRangeUnchecked( ::com::sun::star::table::CellRangeAddress& orRange, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet ); /** Tries to convert the passed string to a cell range address. @@ -474,7 +474,7 @@ public: */ bool convertToCellRange( ::com::sun::star::table::CellRangeAddress& orRange, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); @@ -549,7 +549,7 @@ public: */ void convertToCellRangeList( ApiCellRangeList& orRanges, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 6cfc7c55cad9..05c3e1dade56 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -46,8 +46,8 @@ struct ApiFilterSettings explicit ApiFilterSettings(); void appendField( bool bAnd, sal_Int32 nOperator, double fValue ); - void appendField( bool bAnd, sal_Int32 nOperator, const ::rtl::OUString& rValue ); - void appendField( bool bAnd, const std::vector<rtl::OUString>& rValues ); + void appendField( bool bAnd, sal_Int32 nOperator, const OUString& rValue ); + void appendField( bool bAnd, const std::vector<OUString>& rValues ); }; // ============================================================================ @@ -89,7 +89,7 @@ public: virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); private: - typedef ::std::vector< ::rtl::OUString > FilterValueVector; + typedef ::std::vector< OUString > FilterValueVector; FilterValueVector maValues; sal_Int32 mnCalendarType; diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 03949a55ac30..de43c47fed97 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -45,7 +45,7 @@ public: inline BiffDecoderBase* clone() { return implClone(); } /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); /** Returns true, if the decoder has been initialized correctly. */ @@ -64,7 +64,7 @@ private: /** Derived classes implement password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ) = 0; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0; virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of decryption of a memory block. */ @@ -93,7 +93,7 @@ private: virtual BiffDecoder_XOR* implClone(); /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); @@ -124,7 +124,7 @@ private: virtual BiffDecoder_RCF* implClone(); /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of decryption of a memory block. */ diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx index 6aac201cfd79..cd5f1e3e7878 100644 --- a/sc/source/filter/inc/biffhelper.hxx +++ b/sc/source/filter/inc/biffhelper.hxx @@ -605,7 +605,7 @@ public: // BIFF12 import ---------------------------------------------------------- /** Reads a BIFF12 string with leading 16-bit or 32-bit length field. */ - static ::rtl::OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true, bool bAllowNulChars = false ); + static OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true, bool bAllowNulChars = false ); // BIFF2-BIFF8 import ----------------------------------------------------- @@ -635,8 +635,8 @@ private: // ---------------------------------------------------------------------------- -/** BIFF12 stream operator for an ::rtl::OUString, reads 32-bit string length and Unicode array. */ -inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, ::rtl::OUString& orString ) +/** BIFF12 stream operator for an OUString, reads 32-bit string length and Unicode array. */ +inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, OUString& orString ) { orString = BiffHelper::readString( rStrm ); return rStrm; diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 942e2aff6a2b..645a7c941f84 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -243,7 +243,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OString readByteString( bool b16BitLen, bool bAllowNulChars = false ); + OString readByteString( bool b16BitLen, bool bAllowNulChars = false ); /** Reads 8/16 bit string length and character array, and returns a Unicode string. @param b16BitLen @@ -254,7 +254,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readByteStringUC( bool b16BitLen, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); + OUString readByteStringUC( bool b16BitLen, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); // Unicode strings -------------------------------------------------------- @@ -267,7 +267,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniStringChars( sal_uInt16 nChars, bool b16BitChars, bool bAllowNulChars = false ); + OUString readUniStringChars( sal_uInt16 nChars, bool b16BitChars, bool bAllowNulChars = false ); /** Reads 8-bit flags, extended header, nChar characters, extended data of a BIFF8 string, and returns the string. @@ -276,7 +276,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniStringBody( sal_uInt16 nChars, bool bAllowNulChars = false ); + OUString readUniStringBody( sal_uInt16 nChars, bool bAllowNulChars = false ); /** Reads 16-bit character count, 8-bit flags, extended header, character array, extended data of a BIFF8 string, and returns the string. @@ -284,7 +284,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniString( bool bAllowNulChars = false ); + OUString readUniString( bool bAllowNulChars = false ); // ------------------------------------------------------------------------ private: diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index ac067ff71bd2..fa7a995de489 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -32,11 +32,11 @@ class ChartsheetFragment : public WorksheetFragmentBase public: explicit ChartsheetFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index 626aad0f4e42..5aa3e65485f6 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -34,7 +34,7 @@ struct CommentModel ::com::sun::star::table::CellRangeAddress maRange; /// Position of the comment in the worksheet. RichStringRef mxText; /// Formatted text of the comment (not used in BIFF8). - ::rtl::OUString maAuthor; /// Comment author (BIFF8 only). + OUString maAuthor; /// Comment author (BIFF8 only). sal_Int32 mnAuthorId; /// Identifier of the comment's author (OOXML and BIFF12 only). sal_uInt16 mnObjId; /// Drawing object identifier (BIFF8 only). sal_Bool mbAutoFill; /// Auto Selection of comment object's fill style @@ -85,7 +85,7 @@ public: explicit CommentsBuffer( const WorksheetHelper& rHelper ); /** Appends a new author to the list of comment authors. */ - void appendAuthor( const ::rtl::OUString& rAuthor ); + void appendAuthor( const OUString& rAuthor ); /** Creates and returns a new comment. */ CommentRef createComment(); @@ -93,7 +93,7 @@ public: void finalizeImport(); private: - typedef ::std::vector< ::rtl::OUString > OUStringVector; + typedef ::std::vector< OUString > OUStringVector; typedef RefVector< Comment > CommentVector; OUStringVector maAuthors; diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index fe0ff51b46df..fe534f129a4a 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -33,10 +33,10 @@ class CommentsFragment : public WorksheetFragmentBase public: explicit CommentsFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 25bae462410a..e81ca732f899 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -49,7 +49,7 @@ struct CondFormatRuleModel typedef ::std::vector< ApiTokenSequence > ApiTokenSequenceVector; ApiTokenSequenceVector maFormulas; /// Formulas for rule conditions. - ::rtl::OUString maText; /// Text for 'contains' rules. + OUString maText; /// Text for 'contains' rules. sal_Int32 mnPriority; /// Priority of this rule. sal_Int32 mnType; /// Type of the rule. sal_Int32 mnOperator; /// In cell-is rules: Comparison operator. @@ -81,7 +81,7 @@ struct ColorScaleRuleModelEntry bool mbMax; bool mbPercent; bool mbPercentile; - rtl::OUString maFormula; + OUString maFormula; ColorScaleRuleModelEntry(): maColor(), @@ -140,7 +140,7 @@ public: private: std::vector< ColorScaleRuleModelEntry > maEntries; ScIconSetFormatData* mpFormatData; - rtl::OUString maIconSetType; + OUString maIconSetType; }; @@ -156,7 +156,7 @@ public: /** Imports rule settings from the cfRule element. */ void importCfRule( const AttributeList& rAttribs ); /** Appends a new condition formula string. */ - void appendFormula( const ::rtl::OUString& rFormula ); + void appendFormula( const OUString& rFormula ); /** Imports rule settings from a CFRULE record. */ void importCfRule( SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index 89c1e944181a..167a3a3025e2 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -73,7 +73,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index bd8c62bb079e..fdcba12e0f3a 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -46,9 +46,9 @@ struct WebPrModel typedef ::std::vector< ::com::sun::star::uno::Any > TablesVector; TablesVector maTables; /// Names or indexes of the web query tables. - ::rtl::OUString maUrl; /// Source URL to refresh the data. - ::rtl::OUString maPostMethod; /// POST method to query data. - ::rtl::OUString maEditPage; /// Web page showing query data (for XML queries). + OUString maUrl; /// Source URL to refresh the data. + OUString maPostMethod; /// POST method to query data. + OUString maEditPage; /// Web page showing query data (for XML queries). sal_Int32 mnHtmlFormat; /// Plain text, rich text, or HTML. bool mbXml; /// True = XML query, false = HTML query. bool mbSourceData; /// True = import XML source data referred by HTML table. @@ -71,11 +71,11 @@ struct ConnectionModel typedef ::std::auto_ptr< WebPrModel > WebPrModelPtr; WebPrModelPtr mxWebPr; /// Special settings for web queries. - ::rtl::OUString maName; /// Unique name of this connection. - ::rtl::OUString maDescription; /// User description of this connection. - ::rtl::OUString maSourceFile; /// URL of a source data file. - ::rtl::OUString maSourceConnFile; /// URL of a source connection file. - ::rtl::OUString maSsoId; /// Single sign-on identifier. + OUString maName; /// Unique name of this connection. + OUString maDescription; /// User description of this connection. + OUString maSourceFile; /// URL of a source data file. + OUString maSourceConnFile; /// URL of a source connection file. + OUString maSsoId; /// Single sign-on identifier. sal_Int32 mnId; /// Unique connection identifier. sal_Int32 mnType; /// Data source type. sal_Int32 mnReconnectMethod; /// Reconnection method. diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index d110865dedce..91c0bb1d6170 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -52,7 +52,7 @@ class ConnectionsFragment : public WorkbookFragmentBase public: explicit ConnectionsFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 3b81404dd6c8..d45783e746cb 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -55,8 +55,8 @@ const sal_Unicode BIFF_DEFNAME_UNKNOWN = '\x0E'; struct DefinedNameModel { - ::rtl::OUString maName; /// The original name. - ::rtl::OUString maFormula; /// The formula string. + OUString maName; /// The original name. + OUString maFormula; /// The formula string. sal_Int32 mnSheet; /// Sheet index for local names. sal_Int32 mnFuncGroupId; /// Function group identifier. bool mbMacro; /// True = Macro name (VBA or sheet macro). @@ -76,12 +76,12 @@ public: explicit DefinedNameBase( const WorkbookHelper& rHelper ); /** Returns the original name as imported from or exported to the file. */ - inline const ::rtl::OUString& getModelName() const { return maModel.maName; } + inline const OUString& getModelName() const { return maModel.maName; } /** Returns the name as used in the Calc document. */ - inline const ::rtl::OUString& getCalcName() const { return maCalcName; } + inline const OUString& getCalcName() const { return maCalcName; } /** Returns the original name as imported from or exported to the file. */ - const ::rtl::OUString& getUpcaseModelName() const; + const OUString& getUpcaseModelName() const; /** Returns an Any with a SingleReference or ComplexReference, or an empty Any. */ ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddr ) const; @@ -95,8 +95,8 @@ protected: protected: DefinedNameModel maModel; /// Model data for this defined name. - mutable ::rtl::OUString maUpModelName; /// Model name converted to uppercase ASCII. - ::rtl::OUString maCalcName; /// Final name used in the Calc document. + mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. + OUString maCalcName; /// Final name used in the Calc document. ::com::sun::star::uno::Any maRefAny; /// Single cell/range reference. }; @@ -110,7 +110,7 @@ public: /** Sets the attributes for this defined name from the passed attribute set. */ void importDefinedName( const AttributeList& rAttribs ); /** Sets the formula string from the body of the definedName element. */ - void setFormula( const ::rtl::OUString& rFormula ); + void setFormula( const OUString& rFormula ); /** Imports the defined name from a DEFINEDNAME record in the passed stream. */ void importDefinedName( SequenceInputStream& rStrm ); @@ -181,7 +181,7 @@ public: @param nSheet The sheet index for local names or -1 for global names. If no local name is found, tries to find a matching global name. @return Reference to the defined name or empty reference. */ - DefinedNameRef getByModelName( const ::rtl::OUString& rModelName, sal_Int16 nCalcSheet = -1 ) const; + DefinedNameRef getByModelName( const OUString& rModelName, sal_Int16 nCalcSheet = -1 ) const; /** Returns a built-in defined name by its built-in identifier. @param nSheet The sheet index of the built-in name. @return Reference to the defined name or empty reference. */ @@ -191,7 +191,7 @@ private: DefinedNameRef createDefinedName(); private: - typedef ::std::pair< sal_Int16, ::rtl::OUString > SheetNameKey; + typedef ::std::pair< sal_Int16, OUString > SheetNameKey; typedef ::std::pair< sal_Int16, sal_Unicode > BuiltinKey; typedef RefVector< DefinedName > DefNameVector; diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index a8a0a568fd59..b9dabff235ed 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -72,9 +72,9 @@ private: SvNumberFormatter* pNumFormatter; SvStream& rIn; sal_Bool bPlain; - rtl::OUString aLookAheadLine; + OUString aLookAheadLine; - bool ReadNextLine( rtl::OUString& rStr ); + bool ReadNextLine( OUString& rStr ); bool LookAhead(); DATASET GetNumberDataset( const sal_Unicode* pPossibleNumericData ); static inline sal_Bool IsBOT( const sal_Unicode* pRef ); diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index de19882ecfe5..be11622aece9 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -98,9 +98,9 @@ public: /** Imports the shape client data from the xdr:clientData element. */ void importClientData( const AttributeList& rAttribs ); /** Sets an attribute of the cell-dependent anchor position from xdr:from and xdr:to elements. */ - void setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue ); + void setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const OUString& rValue ); /** Imports the client anchor settings from a VML element. */ - void importVmlAnchor( const ::rtl::OUString& rAnchor ); + void importVmlAnchor( const OUString& rAnchor ); /** Calculates the resulting shape anchor in EMUs. */ ::oox::drawingml::EmuRectangle calcAnchorRectEmu( diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 0799d6f8f862..29902b763b58 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -47,11 +47,11 @@ namespace xls { class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: - explicit ShapeMacroAttacher( const ::rtl::OUString& rMacroName, + explicit ShapeMacroAttacher( const OUString& rMacroName, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); private: - virtual void attachMacro( const ::rtl::OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ); private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; @@ -73,7 +73,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); private: - ::rtl::OUString maMacroName; + OUString maMacroName; }; // ============================================================================ @@ -113,11 +113,11 @@ class DrawingFragment : public WorksheetFragmentBase public: explicit DrawingFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); private: @@ -136,12 +136,12 @@ private: class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: - explicit VmlControlMacroAttacher( const ::rtl::OUString& rMacroName, + explicit VmlControlMacroAttacher( const OUString& rMacroName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rxCtrlFormIC, sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: - virtual void attachMacro( const ::rtl::OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ); private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; @@ -164,12 +164,12 @@ public: virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const; /** Returns additional base names for automatic shape name creation. */ - virtual ::rtl::OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const; + virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const; /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( ::com::sun::star::awt::Rectangle& orShapeRect, - const ::rtl::OUString& rShapeAnchor ) const; + const OUString& rShapeAnchor ) const; /** Creates a UNO control shape for legacy drawing controls. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > @@ -186,7 +186,7 @@ public: private: /** Converts the passed VML textbox text color to an OLE color. */ - sal_uInt32 convertControlTextColor( const ::rtl::OUString& rTextColor ) const; + sal_uInt32 convertControlTextColor( const OUString& rTextColor ) const; /** Converts the passed VML textbox font to an ActiveX form control font. */ void convertControlFontData( ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, @@ -194,7 +194,7 @@ private: /** Converts the caption, the font settings, and the horizontal alignment from the passed VML textbox to ActiveX form control settings. */ void convertControlText( - ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, ::rtl::OUString& rCaption, + ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, OUString& rCaption, const ::oox::vml::TextBox* pTextBox, sal_Int32 nTextHAlign ) const; /** Converts the passed VML shape background formatting to ActiveX control formatting. */ void convertControlBackground( @@ -213,7 +213,7 @@ class VmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetH public: explicit VmlDrawingFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual void finalizeImport(); diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 9c85a2fbb53d..791d8bb572b2 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -146,9 +146,9 @@ protected: private: ShapeAnchor maAnchor; /// Position of the drawing object. - ::rtl::OUString maObjName; /// Name of the object. - ::rtl::OUString maMacroName; /// Name of an attached macro. - ::rtl::OUString maHyperlink; /// On-click hyperlink URL. + OUString maObjName; /// Name of the object. + OUString maMacroName; /// Name of an attached macro. + OUString maHyperlink; /// On-click hyperlink URL. sal_uInt16 mnObjId; /// The object identifier (unique per drawing). sal_uInt16 mnObjType; /// The object type from OBJ record. bool mbHidden; /// True = object is hidden. diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 2ca73b985a12..62b0673059a9 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -35,10 +35,10 @@ const sal_Char nHoriVerti = nHorizontal | nVertical; struct ScHTMLImage { - rtl::OUString aURL; + OUString aURL; Size aSize; Point aSpace; - rtl::OUString aFilterName; + OUString aFilterName; Graphic* pGraphic; // wird von WriteToDocument uebernommen sal_Char nDir; // 1==hori, 2==verti, 3==beides @@ -54,10 +54,10 @@ struct ScEEParseEntry { SfxItemSet aItemSet; ESelection aSel; // Selection in EditEngine - rtl::OUString* pValStr; // HTML evtl. SDVAL String - rtl::OUString* pNumStr; // HTML evtl. SDNUM String - rtl::OUString* pName; // HTML evtl. Anchor/RangeName - rtl::OUString aAltText; // HTML IMG ALT Text + OUString* pValStr; // HTML evtl. SDVAL String + OUString* pNumStr; // HTML evtl. SDNUM String + OUString* pName; // HTML evtl. Anchor/RangeName + OUString aAltText; // HTML IMG ALT Text boost::ptr_vector< ScHTMLImage > maImageList; // Grafiken in dieser Zelle SCCOL nCol; // relativ zum Beginn des Parse SCROW nRow; diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 5e826bd3e4a9..fc108c311f09 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -67,7 +67,7 @@ public: private: virtual GraphicHelper* implCreateGraphicHelper() const; virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; }; } // namespace xls diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index 8175e41124e0..ed2805869254 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -66,7 +66,7 @@ class WorkbookFragmentBase : public ::oox::core::FragmentHandler2, public Workbo public: explicit WorkbookFragmentBase( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); }; // ============================================================================ @@ -80,7 +80,7 @@ class WorksheetFragmentBase : public ::oox::core::FragmentHandler2, public Works public: explicit WorksheetFragmentBase( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); }; // ============================================================================ @@ -135,7 +135,7 @@ public: /** Opens the stream with the passed full name. */ explicit BiffFragmentHandler( const ::oox::core::FilterBase& rFilter, - const ::rtl::OUString& rStrmName ); + const OUString& rStrmName ); virtual ~BiffFragmentHandler(); @@ -178,7 +178,7 @@ class BiffWorkbookFragmentBase : public BiffFragmentHandler, public WorkbookHelp protected: explicit BiffWorkbookFragmentBase( const WorkbookHelper& rHelper, - const ::rtl::OUString& rStrmName, + const OUString& rStrmName, bool bCloneDecoder = false ); }; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 2568ef8b3f65..1b7786fa6aaf 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -105,7 +105,7 @@ public: struct ExternalTabInfo { ScRange maRange; - ::rtl::OUString maTabName; + OUString maTabName; sal_uInt16 mnFileId; bool mbExternal; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 94bc2a6558f4..d4a54cc20013 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -70,7 +70,7 @@ private: private: // represents codename ( and associated modules ) // not speficied directly in the binary format - std::vector<rtl::OUString> maAutoGeneratedCodeNames; + std::vector<OUString> maAutoGeneratedCodeNames; ExcScenarioList maScenList; }; @@ -89,7 +89,7 @@ private: bool bCriteria:1; bool bAutoOrAdvanced:1; - void CreateFromDouble( rtl::OUString& rStr, double fVal ); + void CreateFromDouble( OUString& rStr, double fVal ); void SetCellAttribs(); void InsertQueryParam(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 45dba0db12d5..fe70907bd330 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -271,7 +271,7 @@ public: class ExcBundlesheet : public ExcBundlesheetBase { private: - rtl::OString aName; + OString aName; virtual void SaveCont( XclExpStream& rStrm ); @@ -383,7 +383,7 @@ private: sal_uInt16 nCol; sal_uInt16 nFlags; ExcFilterCondition aCond[ 2 ]; - std::vector<rtl::OUString> maMultiValues; + std::vector<OUString> maMultiValues; bool AddCondition( ScQueryConnect eConn, sal_uInt8 nType, sal_uInt8 nOp, double fVal, String* pText, diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 7160d8aebdf2..17519c17dc20 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -104,9 +104,9 @@ public: /** Returns the complete DDE link data of this DDE item. */ bool getDdeLinkData( - ::rtl::OUString& orDdeServer, - ::rtl::OUString& orDdeTopic, - ::rtl::OUString& orDdeItem ); + OUString& orDdeServer, + OUString& orDdeTopic, + OUString& orDdeItem ); private: /** Sets the size of the result matrix. */ @@ -236,11 +236,11 @@ public: inline bool isInternalLink() const { return (meLinkType == LINKTYPE_SELF) || (meLinkType == LINKTYPE_INTERNAL); } /** Returns the relation identifier for the external link fragment. */ - inline const ::rtl::OUString& getRelId() const { return maRelId; } + inline const OUString& getRelId() const { return maRelId; } /** Returns the class name of this external link. */ - inline const ::rtl::OUString& getClassName() const { return maClassName; } + inline const OUString& getClassName() const { return maClassName; } /** Returns the target URL of this external link. */ - inline const ::rtl::OUString& getTargetUrl() const { return maTargetUrl; } + inline const OUString& getTargetUrl() const { return maTargetUrl; } /** Returns the link info needed by the XML formula parser. */ ::com::sun::star::sheet::ExternalLinkInfo getLinkInfo() const; @@ -262,12 +262,12 @@ public: ExternalNameRef getNameByIndex( sal_Int32 nIndex ) const; private: - void setExternalTargetUrl( const ::rtl::OUString& rTargetUrl, const ::rtl::OUString& rTargetType ); - void setDdeOleTargetUrl( const ::rtl::OUString& rClassName, const ::rtl::OUString& rTargetUrl, ExternalLinkType eLinkType ); - void parseExternalReference( const ::oox::core::Relations& rRelations, const ::rtl::OUString& rRelId ); + void setExternalTargetUrl( const OUString& rTargetUrl, const OUString& rTargetType ); + void setDdeOleTargetUrl( const OUString& rClassName, const OUString& rTargetUrl, ExternalLinkType eLinkType ); + void parseExternalReference( const ::oox::core::Relations& rRelations, const OUString& rRelId ); /** Creates an external locument link and the sheet cache for the passed sheet name. */ - void insertExternalSheet( const ::rtl::OUString& rSheetName ); + void insertExternalSheet( const OUString& rSheetName ); ExternalNameRef createExternalName(); @@ -278,9 +278,9 @@ private: ExternalLinkType meLinkType; /// Type of this link object. FunctionLibraryType meFuncLibType; /// Type of the function library, if link type is LINKTYPE_LIBRARY. - ::rtl::OUString maRelId; /// Relation identifier for the external link fragment. - ::rtl::OUString maClassName; /// DDE service, OLE class name. - ::rtl::OUString maTargetUrl; /// Target link, DDE topic, OLE target. + OUString maRelId; /// Relation identifier for the external link fragment. + OUString maClassName; /// DDE service, OLE class name. + OUString maTargetUrl; /// Target link, DDE topic, OLE target. ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > mxDocLink; /// Interface for an external document. Int16Vector maCalcSheets; /// Internal sheet indexes. diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 08f382064e4e..c6e20186740b 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -45,7 +45,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -81,12 +81,12 @@ class ExternalLinkFragment : public WorkbookFragmentBase public: explicit ExternalLinkFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, ExternalLink& rExtLink ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -99,7 +99,7 @@ private: private: ExternalLink& mrExtLink; ExternalNameRef mxExtName; - ::rtl::OUString maResultValue; + OUString maResultValue; sal_Int32 mnResultType; }; diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index 9663cfae25a8..de1d14dd71f9 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -68,7 +68,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); private: void* mpTarget; diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 7c744c36159c..b4b696af1c7f 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -64,7 +64,7 @@ public: VectorToSequence( const ::std::vector< Type >& rVector ); /** Returns the service name provided via the XServiceName interface, or an empty string on error. */ - static ::rtl::OUString GetServiceName( XInterfaceRef xInt ); + static OUString GetServiceName( XInterfaceRef xInt ); /** Returns the multi service factory from a document shell. */ static XServiceFactoryRef GetServiceFactory( SfxObjectShell* pShell ); @@ -72,21 +72,21 @@ public: /** Creates an instance from the passed service name, using the passed service factory. */ static XInterfaceRef CreateInstance( XServiceFactoryRef xFactory, - const ::rtl::OUString& rServiceName ); + const OUString& rServiceName ); /** Creates an instance from the passed service name, using the service factory of the passed object. */ static XInterfaceRef CreateInstance( SfxObjectShell* pShell, - const ::rtl::OUString& rServiceName ); + const OUString& rServiceName ); /** Creates an instance from the passed service name, using the process service factory. */ - static XInterfaceRef CreateInstance( const ::rtl::OUString& rServiceName ); + static XInterfaceRef CreateInstance( const OUString& rServiceName ); /** Opens a password dialog and returns the encryption data. @return The encryption data or an empty sequence on 'Cancel' or any error. */ static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, - const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 ); + const ::std::vector< OUString >* pDefaultPasswords = 0 ); }; template< typename Type > @@ -122,7 +122,7 @@ public: ::com::sun::star::beans::XMultiPropertySet > XMultiPropSetRef; typedef ::com::sun::star::uno::Any UnoAny; typedef ::com::sun::star::uno::Sequence< UnoAny > UnoAnySequence; - typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > OUStringSequence; + typedef ::com::sun::star::uno::Sequence< OUString > OUStringSequence; public: inline explicit ScfPropertySet() {} @@ -148,33 +148,33 @@ public: inline XPropertySetRef GetApiPropertySet() const { return mxPropSet; } /** Returns the service name provided via the XServiceName interface, or an empty string on error. */ - ::rtl::OUString GetServiceName() const; + OUString GetServiceName() const; // Get properties --------------------------------------------------------- /** Returns true, if the property set contains the specified property. */ - bool HasProperty( const ::rtl::OUString& rPropName ) const; + bool HasProperty( const OUString& rPropName ) const; /** Gets the specified property from the property set. @return true, if the Any could be filled with the property value. */ - bool GetAnyProperty( UnoAny& rValue, const ::rtl::OUString& rPropName ) const; + bool GetAnyProperty( UnoAny& rValue, const OUString& rPropName ) const; /** Gets the specified property from the property set. @return true, if the passed variable could be filled with the property value. */ template< typename Type > - inline bool GetProperty( Type& rValue, const ::rtl::OUString& rPropName ) const + inline bool GetProperty( Type& rValue, const OUString& rPropName ) const { UnoAny aAny; return GetAnyProperty( aAny, rPropName ) && (aAny >>= rValue); } /** Gets the specified Boolean property from the property set. @return true = property contains true; false = property contains false or error occurred. */ - bool GetBoolProperty( const ::rtl::OUString& rPropName ) const; + bool GetBoolProperty( const OUString& rPropName ) const; /** Gets the specified Boolean property from the property set. */ - rtl::OUString GetStringProperty( const ::rtl::OUString& rPropName ) const; + OUString GetStringProperty( const OUString& rPropName ) const; /** Gets the specified color property from the property set. @return true, if the passed color variable could be filled with the property value. */ - bool GetColorProperty( Color& rColor, const ::rtl::OUString& rPropName ) const; + bool GetColorProperty( Color& rColor, const OUString& rPropName ) const; /** Gets the specified properties from the property set. Tries to use the XMultiPropertySet interface. @param rPropNames The property names. MUST be ordered alphabetically. @@ -184,23 +184,23 @@ public: // Set properties --------------------------------------------------------- /** Puts the passed Any into the property set. */ - void SetAnyProperty( const ::rtl::OUString& rPropName, const UnoAny& rValue ); + void SetAnyProperty( const OUString& rPropName, const UnoAny& rValue ); /** Puts the passed value into the property set. */ template< typename Type > - inline void SetProperty( const ::rtl::OUString& rPropName, const Type& rValue ) + inline void SetProperty( const OUString& rPropName, const Type& rValue ) { SetAnyProperty( rPropName, ::com::sun::star::uno::makeAny( rValue ) ); } /** Puts the passed Boolean value into the property set. */ - inline void SetBoolProperty( const ::rtl::OUString& rPropName, bool bValue ) + inline void SetBoolProperty( const OUString& rPropName, bool bValue ) { SetAnyProperty( rPropName, ::comphelper::makeBoolAny( bValue ) ); } /** Puts the passed string into the property set. */ - inline void SetStringProperty( const ::rtl::OUString& rPropName, const String& rValue ) - { SetProperty( rPropName, ::rtl::OUString( rValue ) ); } + inline void SetStringProperty( const OUString& rPropName, const String& rValue ) + { SetProperty( rPropName, OUString( rValue ) ); } /** Puts the passed color into the property set. */ - inline void SetColorProperty( const ::rtl::OUString& rPropName, const Color& rColor ) + inline void SetColorProperty( const OUString& rPropName, const Color& rColor ) { SetProperty( rPropName, ScfApiHelper::ConvertToApiColor( rColor ) ); } /** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface. @@ -268,7 +268,7 @@ public: void WriteValue( const UnoAny& rAny ); /** Writes a tools string to the value sequence. */ inline void WriteValue( const String& rString ) - { WriteValue( ::rtl::OUString( rString ) ); } + { WriteValue( OUString( rString ) ); } /** Writes a color value to the value sequence. */ inline void WriteValue( const Color& rColor ) { WriteValue( ScfApiHelper::ConvertToApiColor( rColor ) ); } @@ -284,7 +284,7 @@ private: UnoAny* GetNextAny(); private: - typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > OUStringSequence; + typedef ::com::sun::star::uno::Sequence< OUString > OUStringSequence; typedef ::com::sun::star::uno::Sequence< UnoAny > UnoAnySequence; OUStringSequence maNameSeq; /// Sequence of property names. diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 082f3c604965..cb2785ecdca0 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -484,10 +484,10 @@ enum FunctionLibraryType */ struct FunctionInfo { - ::rtl::OUString maOdfFuncName; /// ODF function name. - ::rtl::OUString maOoxFuncName; /// OOXML function name. - ::rtl::OUString maBiffMacroName; /// Expected macro name in EXTERN.CALL function. - ::rtl::OUString maExtProgName; /// Programmatic function name for external functions. + OUString maOdfFuncName; /// ODF function name. + OUString maOoxFuncName; /// OOXML function name. + OUString maBiffMacroName; /// Expected macro name in EXTERN.CALL function. + OUString maExtProgName; /// Programmatic function name for external functions. FunctionLibraryType meFuncLibType; /// The external library this function is part of. sal_Int32 mnApiOpCode; /// API function opcode. sal_uInt16 mnBiff12FuncId; /// BIFF12 function identifier. @@ -544,7 +544,7 @@ public: virtual ~FunctionProvider(); /** Returns the function info for an OOXML function name, or 0 on error. */ - const FunctionInfo* getFuncInfoFromOoxFuncName( const ::rtl::OUString& rFuncName ) const; + const FunctionInfo* getFuncInfoFromOoxFuncName( const OUString& rFuncName ) const; /** Returns the function info for a BIFF12 function index, or 0 on error. */ const FunctionInfo* getFuncInfoFromBiff12FuncId( sal_uInt16 nFuncId ) const; @@ -554,11 +554,11 @@ public: /** Returns the function info for a macro function referred by the EXTERN.CALL function, or 0 on error. */ - const FunctionInfo* getFuncInfoFromMacroName( const ::rtl::OUString& rFuncName ) const; + const FunctionInfo* getFuncInfoFromMacroName( const OUString& rFuncName ) const; /** Returns the library type associated with the passed URL of a function library (function add-in). */ - FunctionLibraryType getFuncLibTypeFromLibraryName( const ::rtl::OUString& rLibraryName ) const; + FunctionLibraryType getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const; protected: /** Returns the list of all function infos. */ @@ -616,7 +616,7 @@ public: /** Calls the XFormulaParser::parseFormula() function of the API parser. */ ApiTokenSequence parseFormula( - const ::rtl::OUString& rFormula, + const OUString& rFormula, const ::com::sun::star::table::CellAddress& rRefPos ); private: @@ -641,7 +641,7 @@ public: @param rAddress The cell address containing column and row index. @param bAbsolute True = adds dollar signs before column and row. */ - static ::rtl::OUString generateAddress2dString( + static OUString generateAddress2dString( const ::com::sun::star::table::CellAddress& rAddress, bool bAbsolute ); @@ -651,7 +651,7 @@ public: @param rAddress The cell address containing column and row index. @param bAbsolute True = adds dollar signs before column and row. */ - static ::rtl::OUString generateAddress2dString( + static OUString generateAddress2dString( const BinAddress& rAddress, bool bAbsolute ); @@ -664,14 +664,14 @@ public: @return The string enclosed in double quotes, where all contained quote characters are doubled. */ - static ::rtl::OUString generateApiString( const ::rtl::OUString& rString ); + static OUString generateApiString( const OUString& rString ); /** Generates an array string in Calc formula notation from the passed matrix with Any's containing double values or strings. @param rMatrix The matrix containing double values or strings. */ - static ::rtl::OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); + static OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); // ------------------------------------------------------------------------ @@ -750,7 +750,7 @@ public: contains the string extracted from the token sequence. */ bool extractString( - ::rtl::OUString& orString, + OUString& orString, const ApiTokenSequence& rTokens ) const; /** Tries to extract information about a special token used for array diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index a0b96ce6d558..73009f552891 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -34,18 +34,18 @@ private: struct SharedFormulaEntry { ::com::sun::star::table::CellAddress maAddress; - rtl::OUString maTokenStr; + OUString maTokenStr; sal_Int32 mnSharedId; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaTokens > mxFormulaTokens; - SharedFormulaEntry( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& rTokenStr, sal_Int32 nSharedId ) : maAddress( rAddress ), maTokenStr( rTokenStr ), mnSharedId( nSharedId ) {} + SharedFormulaEntry( const ::com::sun::star::table::CellAddress& rAddress, const OUString& rTokenStr, sal_Int32 nSharedId ) : maAddress( rAddress ), maTokenStr( rTokenStr ), mnSharedId( nSharedId ) {} }; struct TokenAddressItem { - ::rtl::OUString maTokenStr; + OUString maTokenStr; ::com::sun::star::table::CellAddress maCellAddress; - TokenAddressItem( const rtl::OUString& rTokenStr, const ::com::sun::star::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} + TokenAddressItem( const OUString& rTokenStr, const ::com::sun::star::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} }; struct TokenRangeAddressItem @@ -69,7 +69,7 @@ typedef ::std::map< sal_Int32, SharedIdToTokenIndex > SheetToSharedIdToTokenInde typedef ::std::pair< ::com::sun::star::table::CellAddress, double > ValueAddressPair; typedef ::std::map< sal_Int32, std::vector< ValueAddressPair > > FormulaValueMap; - void createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); ::com::sun::star::uno::Reference< com::sun::star::table::XCellRange > getRange( const ::com::sun::star::table::CellRangeAddress& rRange); com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet > mxCurrSheet; FormulaDataMap cellFormulas; @@ -87,11 +87,11 @@ typedef ::std::map< sal_Int32, std::vector< ValueAddressPair > > FormulaValueMap public: explicit FormulaBuffer( const WorkbookHelper& rHelper ); void finalizeImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& ); + void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& ); void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId ); void setCellFormulaValue( const ::com::sun::star::table::CellAddress& rAddress, double fValue ); - void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); - void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); }; } } diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index 68fffcc03e3d..33135ab0e5d3 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -56,7 +56,7 @@ protected: @param rTokenData The string that has been found in an OPCODE_BAD token preceding the function parentheses. */ - virtual const FunctionInfo* resolveBadFuncName( const ::rtl::OUString& rTokenData ) const; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; /** Derived classed may try to find the name of a defined name with the passed index extracted from an OPCODE_NAME token. @@ -64,7 +64,7 @@ protected: @param nTokenIndex The index of the defined name that has been found in an OPCODE_NAME token preceding the function parentheses. */ - virtual ::rtl::OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; private: typedef ::std::vector< const ApiToken* > ParameterPosVector; @@ -108,7 +108,7 @@ public: /** Converts an OOXML formula string. */ ApiTokenSequence importFormula( const ::com::sun::star::table::CellAddress& rBaseAddr, - const ::rtl::OUString& rFormulaString ) const; + const OUString& rFormulaString ) const; /** Imports and converts a BIFF12 token array from the passed stream. */ ApiTokenSequence importFormula( @@ -135,13 +135,13 @@ public: ApiTokenSequence convertNameToFormula( sal_Int32 nTokenIndex ) const; /** Converts the passed XML formula to an OLE link target. */ - ::rtl::OUString importOleTargetLink( const ::rtl::OUString& rFormulaString ); + OUString importOleTargetLink( const OUString& rFormulaString ); /** Imports and converts an OLE link target from the passed stream. */ - ::rtl::OUString importOleTargetLink( SequenceInputStream& rStrm ); + OUString importOleTargetLink( SequenceInputStream& rStrm ); /** Converts the passed formula to a macro name for a drawing shape. */ - ::rtl::OUString importMacroName( const ::rtl::OUString& rFormulaString ); + OUString importMacroName( const OUString& rFormulaString ); private: ::std::auto_ptr< FormulaParserImpl > mxImpl; diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index fa5aee6d13fe..cfa80fe86dc4 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -224,11 +224,11 @@ public: // *** byte string import operations *** -------------------------------------- /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - static rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); + static OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - inline static rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) + inline static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) { - return rtl::OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); + return OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); } /** Appends a zero terminated byte string. */ @@ -273,7 +273,7 @@ typedef ::std::vector< sal_Int16 > ScfInt16Vec; typedef ::std::vector< sal_uInt16 > ScfUInt16Vec; typedef ::std::vector< sal_Int32 > ScfInt32Vec; typedef ::std::vector< sal_uInt32 > ScfUInt32Vec; -typedef ::std::vector< ::rtl::OUString > ScfStringVec; +typedef ::std::vector< OUString > ScfStringVec; // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 71fc58bb099a..585f7a21a0b5 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -123,7 +123,7 @@ class ScHTMLExport : public ScExportBase void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); void WriteGraphEntry( ScHTMLGraphEntry* ); void WriteImage( String& rLinkName, - const Graphic&, const rtl::OString& rImgOptions, + const Graphic&, const OString& rImgOptions, sal_uLong nXOutFlags = 0 ); // nXOutFlags fuer XOutBitmap::WriteGraphic @@ -143,7 +143,7 @@ class ScHTMLExport : public ScExportBase SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - rtl::OString BorderToStyle(const char* pBorderName, + OString BorderToStyle(const char* pBorderName, const ::editeng::SvxBorderLine* pLine, bool& bInsertSemicolon); sal_uInt16 GetFontSizeNumber( sal_uInt16 nHeight ); diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 88ce724f0124..cbae0643b5e8 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -50,30 +50,30 @@ class ScHTMLTable; */ class ScHTMLStyles { - typedef ::boost::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash> PropsType; - typedef ::boost::ptr_map<rtl::OUString, PropsType> NamePropsType; - typedef ::boost::ptr_map<rtl::OUString, NamePropsType> ElemsType; + typedef ::boost::unordered_map<OUString, OUString, OUStringHash> PropsType; + typedef ::boost::ptr_map<OUString, PropsType> NamePropsType; + typedef ::boost::ptr_map<OUString, NamePropsType> ElemsType; NamePropsType maGlobalProps; /// global properties (for a given class for all elements) NamePropsType maElemGlobalProps; /// element global properties (no class specified) ElemsType maElemProps; /// element to class to properties (both element and class are given) - const rtl::OUString maEmpty; /// just a persistent empty string. + const OUString maEmpty; /// just a persistent empty string. public: ScHTMLStyles(); void add(const char* pElemName, size_t nElemName, const char* pClassName, size_t nClassName, - const rtl::OUString& aProp, const rtl::OUString& aValue); + const OUString& aProp, const OUString& aValue); /** * Find best-matching property value for given element and class names. */ - const rtl::OUString& getPropertyValue( - const rtl::OUString& rElem, const rtl::OUString& rClass, const rtl::OUString& rPropName) const; + const OUString& getPropertyValue( + const OUString& rElem, const OUString& rClass, const OUString& rPropName) const; private: static void insertProp( - NamePropsType& rProps, const rtl::OUString& aName, - const rtl::OUString& aProp, const rtl::OUString& aValue); + NamePropsType& rProps, const OUString& aName, + const OUString& aProp, const OUString& aValue); }; /** Base class for HTML parser classes. */ @@ -165,9 +165,9 @@ class ScHTMLLayoutParser : public ScHTMLParser { private: Size aPageSize; - rtl::OUString aBaseURL; + OUString aBaseURL; ScHTMLTableStack aTableStack; - rtl::OUString aString; + OUString aString; ScRangeListRef xLockedList; // je Table OuterMap* pTables; ScHTMLColOffset* pColOffset; @@ -382,7 +382,7 @@ public: virtual ~ScHTMLTable(); /** Returns the name of the table, specified in the TABLE tag. */ - inline const rtl::OUString& GetTableName() const { return maTableName; } + inline const OUString& GetTableName() const { return maTableName; } /** Returns the unique identifier of the table. */ inline ScHTMLTableId GetTableId() const { return maTableId.mnTableId; } /** Returns the table size. */ @@ -565,7 +565,7 @@ private: private: ScHTMLTable* mpParentTable; /// Pointer to parent table. ScHTMLTableMapPtr mxNestedTables; /// Table of nested HTML tables. - rtl::OUString maTableName; /// Table name from <table id> option. + OUString maTableName; /// Table name from <table id> option. ScHTMLTableAutoId maTableId; /// Unique identifier of this table. SfxItemSet maTableItemSet; /// Items for the entire table. SfxItemSetPtr mxRowItemSet; /// Items for the current table row. @@ -653,14 +653,14 @@ private: /** Closes the current table, regardless on opening tag. */ void CloseTable( const ImportInfo& rInfo ); - void ParseStyle(const rtl::OUString& rStrm); + void ParseStyle(const OUString& rStrm); DECL_LINK( HTMLImportHdl, const ImportInfo* ); private: typedef ::std::auto_ptr< ScHTMLGlobalTable > ScHTMLGlobalTablePtr; - rtl::OUStringBuffer maTitle; /// The title of the document. + OUStringBuffer maTitle; /// The title of the document. ScHTMLGlobalTablePtr mxGlobTable; /// Contains the entire imported document. ScHTMLTable* mpCurrTable; /// Pointer to current table (performance). ScHTMLTableId mnUnusedId; /// First unused table identifier. diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index af1d7df7cfb6..32c36111c69b 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -38,7 +38,7 @@ namespace xls { struct NumFmtModel { ::com::sun::star::lang::Locale maLocale; - ::rtl::OUString maFmtCode; + OUString maFmtCode; sal_Int16 mnPredefId; explicit NumFmtModel(); @@ -63,7 +63,7 @@ public: explicit NumberFormat( const WorkbookHelper& rHelper ); /** Sets the passed format code. */ - void setFormatCode( const ::rtl::OUString& rFmtCode ); + void setFormatCode( const OUString& rFmtCode ); /** Sets the passed format code, encoded in UTF-8. */ void setFormatCode( const ::com::sun::star::lang::Locale& rLocale, @@ -96,7 +96,7 @@ public: explicit NumberFormatsBuffer( const WorkbookHelper& rHelper ); /** Inserts a new number format. */ - NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const ::rtl::OUString& rFmtCode ); + NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode ); /** Inserts a new number format code. */ NumberFormatRef importNumFmt( const AttributeList& rAttribs ); @@ -119,7 +119,7 @@ private: typedef RefMap< sal_Int32, NumberFormat > NumberFormatMap; NumberFormatMap maNumFmts; /// List of number formats. - ::rtl::OUString maLocaleStr; /// Current office locale. + OUString maLocaleStr; /// Current office locale. sal_Int32 mnHighestId; }; diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index a97a50c5d4b9..de5f988f03dc 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -18,23 +18,23 @@ class ScOrcusFiltersImpl : public ScOrcusFilters { public: - static rtl::OString toSystemPath(const rtl::OUString& rPath); + static OString toSystemPath(const OUString& rPath); - virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const; - virtual bool importGnumeric(ScDocument& rDoc, const rtl::OUString& rPath) const; + virtual bool importCSV(ScDocument& rDoc, const OUString& rPath) const; + virtual bool importGnumeric(ScDocument& rDoc, const OUString& rPath) const; - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const; }; class ScOrcusXMLContextImpl : public ScOrcusXMLContext { ScDocument& mrDoc; - rtl::OUString maPath; + OUString maPath; orcus::xmlns_repository maNsRepo; /// XML namespace repository for this context. public: - ScOrcusXMLContextImpl(ScDocument& rDoc, const rtl::OUString& rPath); + ScOrcusXMLContextImpl(ScDocument& rDoc, const OUString& rPath); virtual ~ScOrcusXMLContextImpl(); virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam); diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 9ba982353c1a..47f6239b97fe 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -35,14 +35,14 @@ class HeaderFooterParser; /** Holds page style data for a single sheet. */ struct PageSettingsModel { - ::rtl::OUString maGraphicUrl; /// URL of the graphic object. - ::rtl::OUString maBinSettPath; /// Relation identifier of binary printer settings. - ::rtl::OUString maOddHeader; /// Header string for odd pages. - ::rtl::OUString maOddFooter; /// Footer string for odd pages. - ::rtl::OUString maEvenHeader; /// Header string for even pages. - ::rtl::OUString maEvenFooter; /// Footer string for even pages. - ::rtl::OUString maFirstHeader; /// Header string for first page of the sheet. - ::rtl::OUString maFirstFooter; /// Footer string for first page of the sheet. + OUString maGraphicUrl; /// URL of the graphic object. + OUString maBinSettPath; /// Relation identifier of binary printer settings. + OUString maOddHeader; /// Header string for odd pages. + OUString maOddFooter; /// Footer string for odd pages. + OUString maEvenHeader; /// Header string for even pages. + OUString maEvenFooter; /// Footer string for even pages. + OUString maFirstHeader; /// Header string for first page of the sheet. + OUString maFirstFooter; /// Footer string for first page of the sheet. double mfLeftMargin; /// Margin between left edge of page and begin of sheet area. double mfRightMargin; /// Margin between end of sheet area and right edge of page. double mfTopMargin; /// Margin between top egde of page and begin of sheet area. @@ -99,7 +99,7 @@ public: /** Imports header and footer settings from a headerFooter element. */ void importHeaderFooter( const AttributeList& rAttribs ); /** Imports header/footer characters from a headerFooter element. */ - void importHeaderFooterCharacters( const ::rtl::OUString& rChars, sal_Int32 nElement ); + void importHeaderFooterCharacters( const OUString& rChars, sal_Int32 nElement ); /** Imports the picture element. */ void importPicture( const ::oox::core::Relations& rRelations, const AttributeList& rAttribs ); @@ -124,7 +124,7 @@ public: private: /** Imports the binary picture data from the fragment with the passed identifier. */ - void importPictureData( const ::oox::core::Relations& rRelations, const ::rtl::OUString& rRelId ); + void importPictureData( const ::oox::core::Relations& rRelations, const OUString& rRelId ); private: PageSettingsModel maModel; @@ -162,8 +162,8 @@ private: void convertHeaderFooterData( PropertySet& rPropSet, HFHelperData& orHFData, - const ::rtl::OUString rOddContent, - const ::rtl::OUString rEvenContent, + const OUString rOddContent, + const OUString rEvenContent, bool bUseEvenContent, double fPageMargin, double fContentMargin ); @@ -171,7 +171,7 @@ private: sal_Int32 writeHeaderFooter( PropertySet& rPropSet, sal_Int32 nPropId, - const ::rtl::OUString& rContent ); + const OUString& rContent ); private: typedef ::std::auto_ptr< HeaderFooterParser > HeaderFooterParserPtr; diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 7491a97941ba..484e25fd5b58 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -40,7 +40,7 @@ class WorksheetHelper; // ============================================================================ -typedef ::std::pair< sal_Int32, rtl::OUString > IdCaptionPair; +typedef ::std::pair< sal_Int32, OUString > IdCaptionPair; typedef ::std::vector< IdCaptionPair > IdCaptionPairList; class PivotCacheItem @@ -92,14 +92,14 @@ public: /** Returns the value of the item. */ inline const ::com::sun::star::uno::Any& getValue() const { return maValue; } /** Returns the string representation of the item. */ - ::rtl::OUString getName() const; + OUString getName() const; /** Returns true if the item is unused. */ inline bool isUnused() const { return mbUnused; } private: friend class PivotCacheItemList; // #FIXME hack Sets the value of this item to the given string ( and overwrites type if necessary - void setStringValue( const rtl::OUString& sName ); + void setStringValue( const OUString& sName ); ::com::sun::star::uno::Any maValue; /// Value of the item. sal_Int32 mnType; /// Value type (OOXML token identifier). bool mbUnused; @@ -127,7 +127,7 @@ public: /** Returns the specified item. */ const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const; /** Returns the names of all items. */ - void getCacheItemNames( ::std::vector< ::rtl::OUString >& orItemNames ) const; + void getCacheItemNames( ::std::vector< OUString >& orItemNames ) const; void applyItemCaptions( const IdCaptionPairList& vCaptions ); private: @@ -145,10 +145,10 @@ private: struct PCFieldModel { - ::rtl::OUString maName; /// Fixed name of the cache field. - ::rtl::OUString maCaption; /// Caption of the ccahe field. - ::rtl::OUString maPropertyName; /// OLAP property name. - ::rtl::OUString maFormula; /// Formula of a calculated field. + OUString maName; /// Fixed name of the cache field. + OUString maCaption; /// Caption of the ccahe field. + OUString maPropertyName; /// OLAP property name. + OUString maFormula; /// Formula of a calculated field. sal_Int32 mnNumFmtId; /// Number format for all items. sal_Int32 mnSqlType; /// Data type from ODBC data source. sal_Int32 mnHierarchy; /// Hierarchy this field is part of. @@ -208,10 +208,10 @@ struct PCFieldGroupModel /** Helper struct for mapping original item names from/to group item names. */ struct PivotCacheGroupItem { - ::rtl::OUString maOrigName; - ::rtl::OUString maGroupName; + OUString maOrigName; + OUString maGroupName; - inline explicit PivotCacheGroupItem( const ::rtl::OUString& rItemName ) : + inline explicit PivotCacheGroupItem( const OUString& rItemName ) : maOrigName( rItemName ), maGroupName( rItemName ) {} }; @@ -278,7 +278,7 @@ public: inline bool hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; } /** Returns the name of the cache field. */ - inline const ::rtl::OUString& getName() const { return maFieldModel.maName; } + inline const OUString& getName() const { return maFieldModel.maName; } /** Returns the index of the parent group field that groups the items of this field. */ inline sal_Int32 getParentGroupField() const { return maFieldGroupModel.mnParentField; } /** Returns the index of the base field grouping is based on. */ @@ -287,7 +287,7 @@ public: /** Returns the shared or group item with the specified index. */ const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const; /** Returns the names of all shared or group items. */ - void getCacheItemNames( ::std::vector< ::rtl::OUString >& orItemNames ) const; + void getCacheItemNames( ::std::vector< OUString >& orItemNames ) const; /** Returns shared or group items. */ PivotCacheItemList getCacheItems() const; @@ -295,10 +295,10 @@ public: void convertNumericGrouping( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxDPField ) const; /** Creates inplace date grouping settings or a new date group field. */ - ::rtl::OUString createDateGroupField( + OUString createDateGroupField( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField ) const; /** Creates a new grouped DataPilot field and returns its name. */ - ::rtl::OUString createParentGroupField( + OUString createParentGroupField( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ) const; @@ -341,8 +341,8 @@ private: struct PCDefinitionModel { - ::rtl::OUString maRelId; /// Relation identifier for cache records fragment. - ::rtl::OUString maRefreshedBy; /// Name of user who last refreshed the cache. + OUString maRelId; /// Relation identifier for cache records fragment. + OUString maRefreshedBy; /// Name of user who last refreshed the cache. double mfRefreshedDate; /// Date/time of last refresh. sal_Int32 mnRecords; /// Number of data records in the cache. sal_Int32 mnMissItemsLimit; /// Limit for discarding unused items. @@ -375,9 +375,9 @@ struct PCSourceModel struct PCWorksheetSourceModel { - ::rtl::OUString maRelId; /// Relation identifier for an external document URL. - ::rtl::OUString maSheet; /// Sheet name for cell range or sheet-local defined names. - ::rtl::OUString maDefName; /// Defined name containing a cell range if present. + OUString maRelId; /// Relation identifier for an external document URL. + OUString maSheet; /// Sheet name for cell range or sheet-local defined names. + OUString maDefName; /// Defined name containing a cell range if present. ::com::sun::star::table::CellRangeAddress maRange; /// Source cell range of the data. @@ -422,7 +422,7 @@ public: inline const ::com::sun::star::table::CellRangeAddress& getSourceRange() const { return maSheetSrcModel.maRange; } /** Returns the relation identifier of the pivot cache records fragment. */ - inline const ::rtl::OUString& getRecordsRelId() const { return maDefModel.maRelId; } + inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; } /** Returns the number of pivot cache fields. */ sal_Int32 getCacheFieldCount() const; @@ -467,7 +467,7 @@ private: PCSourceModel maSourceModel; /// Pivot cache source settings. PCWorksheetSourceModel maSheetSrcModel; /// Sheet source data if cache type is sheet. ValueRangeSet maColSpans; /// Column spans used by SheetDataBuffer for optimized cell import. - ::rtl::OUString maTargetUrl; /// URL of an external source document. + OUString maTargetUrl; /// URL of an external source document. mutable sal_Int32 mnCurrRow; /// Current row index in dummy sheet. bool mbValidSource; /// True = pivot cache is based on supported data source. bool mbDummySheet; /// True = pivot cache is based on a dummy sheet. @@ -481,7 +481,7 @@ public: explicit PivotCacheBuffer( const WorkbookHelper& rHelper ); /** Registers a pivot cache definition fragment. The fragment will be loaded on demand (OOXML/BIFF12 only). */ - void registerPivotCacheFragment( sal_Int32 nCacheId, const ::rtl::OUString& rFragmentPath ); + void registerPivotCacheFragment( sal_Int32 nCacheId, const OUString& rFragmentPath ); /** Imports and stores a pivot cache definition fragment on first call, returns the imported cache on subsequent calls with the same identifier. */ @@ -492,7 +492,7 @@ private: PivotCache& createPivotCache( sal_Int32 nCacheId ); private: - typedef ::std::map< sal_Int32, ::rtl::OUString > FragmentPathMap; + typedef ::std::map< sal_Int32, OUString > FragmentPathMap; typedef RefMap< sal_Int32, PivotCache > PivotCacheMap; typedef ::std::vector< sal_Int32 > PivotCacheIdVector; diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index c617d98626f2..de973aefd604 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -54,7 +54,7 @@ class PivotCacheDefinitionFragment : public WorkbookFragmentBase public: explicit PivotCacheDefinitionFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, PivotCache& rPivotCache ); protected: @@ -74,7 +74,7 @@ class PivotCacheRecordsFragment : public WorksheetFragmentBase public: explicit PivotCacheRecordsFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, const PivotCache& rPivotCache ); protected: @@ -102,7 +102,7 @@ class BiffPivotCacheFragment : public BiffWorkbookFragmentBase public: explicit BiffPivotCacheFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rStrmName, + const OUString& rStrmName, PivotCache& rPivotCache ); /** Imports the entire fragment, returns true, if EOF record has been reached. */ diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 3de6ad11b83d..f1c1e6dd2f42 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -42,7 +42,7 @@ struct PTFieldItemModel { sal_Int32 mnCacheItem; /// Index to shared item in pivot cache. sal_Int32 mnType; /// Type of the item. - rtl::OUString msCaption; /// User caption of the item + OUString msCaption; /// User caption of the item bool mbShowDetails; /// True = show item details (items of child fields). bool mbHidden; /// True = item is hidden. @@ -95,7 +95,7 @@ struct PTFieldModel struct PTPageFieldModel { - ::rtl::OUString maName; /// Unique name of the page field. + OUString maName; /// Unique name of the page field. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnItem; /// Index of field item that is shown by the page field. @@ -106,7 +106,7 @@ struct PTPageFieldModel struct PTDataFieldModel { - ::rtl::OUString maName; /// Name of the data field. + OUString maName; /// Name of the data field. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnSubtotal; /// Subtotal aggregation function. sal_Int32 mnShowDataAs; /// Show data as, based on another field. @@ -161,7 +161,7 @@ public: PivotCacheGroupItemVector& orItemNames ); /** Returns the name of the DataPilot field in the fields collection. */ - inline const ::rtl::OUString& getDPFieldName() const { return maDPFieldName; } + inline const OUString& getDPFieldName() const { return maDPFieldName; } /** Converts dimension and other settings for a row field. */ void convertRowField(); @@ -185,7 +185,7 @@ private: PivotTable& mrPivotTable; /// The parent pivot table object. ItemModelVector maItems; /// All items of this field. PTFieldModel maModel; /// Pivot field settings. - ::rtl::OUString maDPFieldName; /// Name of the field in DataPilot field collection. + OUString maDPFieldName; /// Name of the field in DataPilot field collection. sal_Int32 mnFieldIndex; /// Zero-based index of this field. }; @@ -193,10 +193,10 @@ private: struct PTFilterModel { - ::rtl::OUString maName; /// Name of the field filter. - ::rtl::OUString maDescription; /// Description of the field filter. - ::rtl::OUString maStrValue1; /// First string value for label filter. - ::rtl::OUString maStrValue2; /// Second string value for label filter. + OUString maName; /// Name of the field filter. + OUString maDescription; /// Description of the field filter. + OUString maStrValue1; /// First string value for label filter. + OUString maStrValue2; /// Second string value for label filter. double mfValue; /// Number of items or percent or sum to be shown. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnMemPropField; /// Member property field. @@ -239,17 +239,17 @@ private: struct PTDefinitionModel : public AutoFormatModel { - ::rtl::OUString maName; - ::rtl::OUString maDataCaption; - ::rtl::OUString maGrandTotalCaption; - ::rtl::OUString maRowHeaderCaption; - ::rtl::OUString maColHeaderCaption; - ::rtl::OUString maErrorCaption; - ::rtl::OUString maMissingCaption; - ::rtl::OUString maPageStyle; - ::rtl::OUString maPivotTableStyle; - ::rtl::OUString maVacatedStyle; - ::rtl::OUString maTag; + OUString maName; + OUString maDataCaption; + OUString maGrandTotalCaption; + OUString maRowHeaderCaption; + OUString maColHeaderCaption; + OUString maErrorCaption; + OUString maMissingCaption; + OUString maPageStyle; + OUString maPivotTableStyle; + OUString maVacatedStyle; + OUString maTag; sal_Int32 mnCacheId; sal_Int32 mnDataPosition; sal_Int32 mnPageWrap; @@ -352,7 +352,7 @@ public: /** Returns the associated data pilot field for the specified pivot table field. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > - getDataPilotField( const ::rtl::OUString& rFieldName ) const; + getDataPilotField( const OUString& rFieldName ) const; /** Returns the associated data pilot field for the specified pivot table field. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > getDataPilotField( sal_Int32 nFieldIdx ) const; diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index c86a4d4de02b..b9a7f22ea4e3 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -75,7 +75,7 @@ class PivotTableFragment : public WorksheetFragmentBase public: explicit PivotTableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/querytablebuffer.hxx b/sc/source/filter/inc/querytablebuffer.hxx index a0fd51754101..4cbae0fd8950 100644 --- a/sc/source/filter/inc/querytablebuffer.hxx +++ b/sc/source/filter/inc/querytablebuffer.hxx @@ -30,7 +30,7 @@ namespace xls { struct QueryTableModel : public AutoFormatModel { - ::rtl::OUString maDefName; /// Defined name containing the target cell range. + OUString maDefName; /// Defined name containing the target cell range. sal_Int32 mnConnId; /// Identifier of the external connection used to query the data. sal_Int32 mnGrowShrinkType; /// Behaviour when source data size changes. bool mbHeaders; /// True = source data contains a header row. diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index b54af742bec4..e442bb6990e3 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -34,7 +34,7 @@ class QueryTableFragment : public WorksheetFragmentBase public: explicit QueryTableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index a0f8761a1fe1..96065d3fbe23 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -55,7 +55,7 @@ public: explicit RichStringPortion( const WorkbookHelper& rHelper ); /** Sets text data for this portion. */ - void setText( const ::rtl::OUString& rText ); + void setText( const OUString& rText ); /** Creates and returns a new font formatting object. */ FontRef createFont(); /** Links this portion to a font object from the global font list. */ @@ -65,7 +65,7 @@ public: void finalizeImport(); /** Returns the text data of this portion. */ - inline const ::rtl::OUString& getText() const { return maText; } + inline const OUString& getText() const { return maText; } /** Returns true, if the portion fontains font formatting. */ inline bool hasFont() const { return mxFont.get() != 0; } @@ -81,7 +81,7 @@ public: const Font* pFont ) const; private: - ::rtl::OUString maText; /// Portion text. + OUString maText; /// Portion text. FontRef mxFont; /// Embedded portion font, may be empty. sal_Int32 mnFontId; /// Link to global font list. }; @@ -173,14 +173,14 @@ public: explicit RichStringPhonetic( const WorkbookHelper& rHelper ); /** Sets text data for this phonetic portion. */ - void setText( const ::rtl::OUString& rText ); + void setText( const OUString& rText ); /** Imports attributes of a phonetic run (rPh element). */ void importPhoneticRun( const AttributeList& rAttribs ); /** Sets the associated range in base text for this phonetic portion. */ void setBaseRange( sal_Int32 nBasePos, sal_Int32 nBaseEnd ); private: - ::rtl::OUString maText; /// Portion text. + OUString maText; /// Portion text. sal_Int32 mnBasePos; /// Start position in base text. sal_Int32 mnBaseEnd; /// One-past-end position in base text. }; @@ -244,7 +244,7 @@ public: /** Tries to extract a plain string from this object. Returns the string, if there is only one unformatted portion. */ bool extractPlainString( - ::rtl::OUString& orString, + OUString& orString, const Font* pFirstPortionFont = 0 ) const; /** Converts the string and writes it into the passed XText. @@ -265,9 +265,9 @@ private: RichStringPhoneticRef createPhonetic(); /** Create base text portions from the passed string and character formatting. */ - void createTextPortions( const ::rtl::OUString& rText, FontPortionModelList& rPortions ); + void createTextPortions( const OUString& rText, FontPortionModelList& rPortions ); /** Create phonetic text portions from the passed string and portion data. */ - void createPhoneticPortions( const ::rtl::OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ); + void createPhoneticPortions( const OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ); private: typedef RefVector< RichStringPortion > PortionVector; diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index f79ca3caaa8a..feed7f5d3e3c 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -36,7 +36,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); private: RichStringRef mxString; /// Processed string. diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index 26e2d7386bb3..b0e7dc889d6f 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -33,7 +33,7 @@ namespace xls { struct ScenarioCellModel { ::com::sun::star::table::CellAddress maPos; - ::rtl::OUString maValue; + OUString maValue; sal_Int32 mnNumFmtId; bool mbDeleted; @@ -44,9 +44,9 @@ struct ScenarioCellModel struct ScenarioModel { - ::rtl::OUString maName; /// Name of the scenario. - ::rtl::OUString maComment; /// Comment. - ::rtl::OUString maUser; /// Name of user created the scenario. + OUString maName; /// Name of the scenario. + OUString maComment; /// Comment. + OUString maUser; /// Name of user created the scenario. bool mbLocked; /// True = input cell values locked. bool mbHidden; /// True = scenario is hidden. diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index 325fdca387f7..4986b6f71c0b 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -32,7 +32,7 @@ class SharedStringsFragment : public WorkbookFragmentBase public: explicit SharedStringsFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 62f42daeed19..103418aa7d7a 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -69,8 +69,8 @@ struct CellFormulaModel /** Stores data about table operations. */ struct DataTableModel { - ::rtl::OUString maRef1; /// First reference cell for table operations. - ::rtl::OUString maRef2; /// Second reference cell for table operations. + OUString maRef1; /// First reference cell for table operations. + OUString maRef2; /// Second reference cell for table operations. bool mb2dTable; /// True = 2-dimensional data table. bool mbRowTable; /// True = row oriented data table. bool mbRef1Deleted; /// True = first reference cell deleted. @@ -118,7 +118,7 @@ public: /** Inserts a value cell into the sheet. */ void setValueCell( const CellModel& rModel, double fValue ); /** Inserts a simple string cell into the sheet. */ - void setStringCell( const CellModel& rModel, const ::rtl::OUString& rText ); + void setStringCell( const CellModel& rModel, const OUString& rText ); /** Inserts a rich-string cell into the sheet. */ void setStringCell( const CellModel& rModel, const RichStringRef& rxString ); /** Inserts a shared string cell into the sheet. */ @@ -128,7 +128,7 @@ public: /** Inserts a boolean cell into the sheet and adjusts number format. */ void setBooleanCell( const CellModel& rModel, bool bValue ); /** Inserts an error cell from the passed error code into the sheet. */ - void setErrorCell( const CellModel& rModel, const ::rtl::OUString& rErrorCode ); + void setErrorCell( const CellModel& rModel, const OUString& rErrorCode ); /** Inserts an error cell from the passed BIFF error code into the sheet. */ void setErrorCell( const CellModel& rModel, sal_uInt8 nErrorCode ); /** Inserts a formula cell into the sheet. */ diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 52d20da27985..9054f5b9bd83 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -59,7 +59,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -110,9 +110,9 @@ private: void importSharedFmla( SequenceInputStream& rStrm ); private: - ::rtl::OUString maCellValue; /// Cell value string (OOXML only). + OUString maCellValue; /// Cell value string (OOXML only). RichStringRef mxInlineStr; /// Inline rich string (OOXML only). - ::rtl::OUString maFormulaStr; + OUString maFormulaStr; DataTableModel maTableData; /// Settings for table operations. BinAddress maCurrPos; /// Current cell position (BIFF12 only). bool mbHasFormula; /// True = current cell has formula data (OOXML only). diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index c9223c436395..77654c7b2af4 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -152,7 +152,7 @@ private: /** Contains all XML font attributes, e.g. from a font or rPr element. */ struct FontModel { - ::rtl::OUString maName; /// Font name. + OUString maName; /// Font name. Color maColor; /// Font color. sal_Int32 mnScheme; /// Major/minor scheme font. sal_Int32 mnFamily; /// Font family. @@ -209,7 +209,7 @@ struct ApiFontUsedFlags /** Contains API font name, family, and charset for a script type. */ struct ApiScriptFontName { - ::rtl::OUString maName; /// Font name. + OUString maName; /// Font name. sal_Int16 mnFamily; /// Font family. sal_Int16 mnTextEnc; /// Font text encoding. @@ -786,7 +786,7 @@ typedef ::boost::shared_ptr< Dxf > DxfRef; /** Contains attributes of a cell style, e.g. from the cellStyle element. */ struct CellStyleModel { - ::rtl::OUString maName; /// Cell style name. + OUString maName; /// Cell style name. sal_Int32 mnXfId; /// Formatting for this cell style. sal_Int32 mnBuiltinId; /// Identifier for builtin styles. sal_Int32 mnLevel; /// Level for builtin column/row styles. @@ -818,16 +818,16 @@ public: void createCellStyle(); /** Stores tha passed final style name and creates the cell style, if it is user-defined or modified built-in. */ - void finalizeImport( const ::rtl::OUString& rFinalName ); + void finalizeImport( const OUString& rFinalName ); /** Returns the cell style model structure. */ inline const CellStyleModel& getModel() const { return maModel; } /** Returns the final style name used in the document. */ - inline const ::rtl::OUString& getFinalStyleName() const { return maFinalName; } + inline const OUString& getFinalStyleName() const { return maFinalName; } inline ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; } private: CellStyleModel maModel; - ::rtl::OUString maFinalName; /// Final style name used in API. + OUString maFinalName; /// Final style name used in API. bool mbCreated; /// True = style sheet created. ::ScStyleSheet* mpStyleSheet; /// Calc cell style sheet. @@ -853,16 +853,16 @@ public: /** Returns the XF identifier associated to the default cell style. */ sal_Int32 getDefaultXfId() const; /** Returns the default style sheet for unused cells. */ - ::rtl::OUString getDefaultStyleName() const; + OUString getDefaultStyleName() const; /** Creates the style sheet described by the style XF with the passed identifier. */ - ::rtl::OUString createCellStyle( sal_Int32 nXfId ) const; + OUString createCellStyle( sal_Int32 nXfId ) const; ::ScStyleSheet* getCellStyleSheet( sal_Int32 nXfId ) const; private: /** Inserts the passed cell style object into the internal maps. */ void insertCellStyle( CellStyleRef xCellStyle ); /** Creates the style sheet described by the passed cell style object. */ - ::rtl::OUString createCellStyle( const CellStyleRef& rxCellStyle ) const; + OUString createCellStyle( const CellStyleRef& rxCellStyle ) const; ::ScStyleSheet* getCellStyleSheet( const CellStyleRef& rxCellStyle ) const; private: @@ -901,7 +901,7 @@ public: @param opnFontId (out-param) The identifier of the new font object. */ FontRef createFont( sal_Int32* opnFontId = 0 ); /** Creates a number format. */ - NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const ::rtl::OUString& rFmtCode ); + NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode ); sal_Int32 nextFreeNumFmtId(); /** Creates a new empty border object. @param opnBorderId (out-param) The identifier of the new border object. */ @@ -960,12 +960,12 @@ public: bool equalFills( sal_Int32 nFillId1, sal_Int32 nFillId2 ) const; /** Returns the default style sheet for unused cells. */ - ::rtl::OUString getDefaultStyleName() const; + OUString getDefaultStyleName() const; /** Creates the style sheet described by the style XF with the passed identifier. */ - ::rtl::OUString createCellStyle( sal_Int32 nXfId ) const; + OUString createCellStyle( sal_Int32 nXfId ) const; ::ScStyleSheet* getCellStyleSheet( sal_Int32 nXfId ) const; /** Creates the style sheet described by the DXF with the passed identifier. */ - ::rtl::OUString createDxfStyle( sal_Int32 nDxfId ) const; + OUString createDxfStyle( sal_Int32 nDxfId ) const; void writeFontToItemSet( SfxItemSet& rItemSet, sal_Int32 nFontId, bool bSkipPoolDefs = false ) const; /** Writes the font attributes of the specified font data to the passed property map. */ @@ -993,7 +993,7 @@ private: typedef RefVector< Fill > FillVector; typedef RefVector< Xf > XfVector; typedef RefVector< Dxf > DxfVector; - typedef ::std::map< sal_Int32, ::rtl::OUString > DxfStyleMap; + typedef ::std::map< sal_Int32, OUString > DxfStyleMap; ColorPalette maPalette; /// Color palette. FontVector maFonts; /// List of font objects. diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index 093a13e63195..5e8f1770c34d 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -129,7 +129,7 @@ class StylesFragment : public WorkbookFragmentBase public: explicit StylesFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index 5ed673bb9bf3..9d4a2c7cd7ed 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -33,8 +33,8 @@ struct TableModel { ::com::sun::star::table::CellRangeAddress maRange; /// Original (unchecked) range of the table. - ::rtl::OUString maProgName; /// Programmatical name. - ::rtl::OUString maDisplayName; /// Display name. + OUString maProgName; /// Programmatical name. + OUString maDisplayName; /// Display name. sal_Int32 mnId; /// Unique table identifier. sal_Int32 mnType; /// Table type (worksheet, query, etc.). sal_Int32 mnHeaderRows; /// Number of header rows. @@ -65,7 +65,7 @@ public: /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */ inline sal_Int32 getTokenIndex() const { return mnTokenIndex; } /** Returns the original display name of the table. */ - inline const ::rtl::OUString& getDisplayName() const { return maModel.maDisplayName; } + inline const OUString& getDisplayName() const { return maModel.maDisplayName; } /** Returns the original (unchecked) total range of the table. */ inline const ::com::sun::star::table::CellRangeAddress& getOriginalRange() const { return maModel.maRange; } @@ -83,7 +83,7 @@ public: private: TableModel maModel; AutoFilterBuffer maAutoFilters; /// Filter settings for this table. - ::rtl::OUString maDBRangeName; /// Name of the databae range in the Calc document. + OUString maDBRangeName; /// Name of the databae range in the Calc document. ::com::sun::star::table::CellRangeAddress maDestRange; /// Validated range of the table in the worksheet. sal_Int32 mnTokenIndex; /// Token index used in API token array. @@ -107,7 +107,7 @@ public: /** Returns a table by its identifier. */ TableRef getTable( sal_Int32 nTableId ) const; /** Returns a table by its display name. */ - TableRef getTable( const ::rtl::OUString& rDispName ) const; + TableRef getTable( const OUString& rDispName ) const; private: /** Inserts the passed table into the maps according to its identifier and name. */ @@ -116,7 +116,7 @@ private: private: typedef RefVector< Table > TableVector; typedef RefMap< sal_Int32, Table > TableIdMap; - typedef RefMap< ::rtl::OUString, Table > TableNameMap; + typedef RefMap< OUString, Table > TableNameMap; TableVector maTables; TableIdMap maIdTables; diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 77ed04d73f3f..92bc84e55075 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -34,7 +34,7 @@ class TableFragment : public WorksheetFragmentBase public: explicit TableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 4056430b8e72..88921d1ceb5b 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -86,18 +86,18 @@ public: ::com::sun::star::util::DateTime calcDateTimeFromSerial( double fSerial ) const; /** Returns a BIFF error code from the passed error string. */ - sal_uInt8 calcBiffErrorCode( const ::rtl::OUString& rErrorCode ) const; + sal_uInt8 calcBiffErrorCode( const OUString& rErrorCode ) const; private: /** Adds an error code to the internal maps. */ - void addErrorCode( sal_uInt8 nErrorCode, const ::rtl::OUString& rErrorCode ); + void addErrorCode( sal_uInt8 nErrorCode, const OUString& rErrorCode ); /** Returns the conversion coefficient for the passed unit. */ double getCoefficient( Unit eUnit ) const; private: typedef ::std::vector< double > DoubleVector; - typedef ::std::map< ::rtl::OUString, sal_uInt8 > OoxErrorCodeMap; - typedef ::std::map< sal_uInt8, ::rtl::OUString > BiffErrorCodeMap; + typedef ::std::map< OUString, sal_uInt8 > OoxErrorCodeMap; + typedef ::std::map< sal_uInt8, OUString > BiffErrorCodeMap; DoubleVector maCoeffs; /// Coefficients for unit conversion. OoxErrorCodeMap maOoxErrCodes; /// Maps error code strings to BIFF error constants. diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index ae90b5128036..88042abee875 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -35,11 +35,11 @@ class WorkbookFragment : public WorkbookFragmentBase public: explicit WorkbookFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -55,7 +55,7 @@ private: void importPivotCache( SequenceInputStream& rStrm ); void importExternalLinkFragment( ExternalLink& rExtLink ); - void importPivotCacheDefFragment( const ::rtl::OUString& rRelId, sal_Int32 nCacheId ); + void importPivotCacheDefFragment( const OUString& rRelId, sal_Int32 nCacheId ); private: DefinedNameRef mxCurrName; diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 0e1b87d70a70..fa1ce19529b6 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -77,7 +77,7 @@ enum FilterType /** Functor for case-insensitive string comparison, usable in maps etc. */ struct IgnoreCaseCompare { - bool operator()( const ::rtl::OUString& rName1, const ::rtl::OUString& rName2 ) const; + bool operator()( const OUString& rName1, const OUString& rName2 ) const; }; // ============================================================================ @@ -157,7 +157,7 @@ public: getSheetFromDoc( sal_Int16 nSheet ) const; /** Returns a reference to the specified spreadsheet in the document model. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > - getSheetFromDoc( const ::rtl::OUString& rSheet ) const; + getSheetFromDoc( const OUString& rSheet ) const; /** Returns the XCellRange interface for the passed cell range address. */ ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > @@ -169,13 +169,13 @@ public: getStyleFamily( bool bPageStyles ) const; /** Returns the specified cell or page style from the Calc document. */ ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > - getStyleObject( const ::rtl::OUString& rStyleName, bool bPageStyle ) const; + getStyleObject( const OUString& rStyleName, bool bPageStyle ) const; /** Creates and returns a defined name on-the-fly in the Calc document. The name will not be buffered in the global defined names buffer. @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createNamedRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0 ) const; @@ -184,7 +184,7 @@ public: The name will not be buffered in the global defined names buffer. @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createLocalNamedRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0, sal_Int32 nTab = -1 ) const; @@ -194,7 +194,7 @@ public: @param orName (in/out-parameter) Returns the resulting used name. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange > createDatabaseRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::table::CellRangeAddress& rRangeAddr ) const; /** Creates and returns an unnamed database range on-the-fly in the Calc document. @@ -206,7 +206,7 @@ public: /** Creates and returns a com.sun.star.style.Style object for cells or pages. */ ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > createStyleObject( - ::rtl::OUString& orStyleName, + OUString& orStyleName, bool bPageStyle ) const; // buffers ---------------------------------------------------------------- diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 8fb3ec8a4ffe..6d2423a7cbaf 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -32,7 +32,7 @@ namespace xls { /** Settings for workbook write protection. */ struct FileSharingModel { - ::rtl::OUString maUserName; /// User who added the write protection password. + OUString maUserName; /// User who added the write protection password. sal_uInt16 mnPasswordHash; /// Hash value of the write protection password. bool mbRecommendReadOnly; /// True = recommend read-only mode on opening. @@ -44,7 +44,7 @@ struct FileSharingModel /** Global workbook settings. */ struct WorkbookSettingsModel { - ::rtl::OUString maCodeName; /// VBA codename for the workbook. + OUString maCodeName; /// VBA codename for the workbook. sal_Int32 mnShowObjectMode; /// Specifies how objects are shown. sal_Int32 mnUpdateLinksMode; /// Specifies how external links are updated. sal_Int32 mnDefaultThemeVer; /// Default theme version. diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index d58a49017c46..54b47d15177b 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -37,8 +37,8 @@ namespace xls { /** Contains data from the 'sheet' element describing a sheet in the workbook. */ struct SheetInfoModel { - ::rtl::OUString maRelId; /// Relation identifier for the sheet substream. - ::rtl::OUString maName; /// Original name of the sheet. + OUString maRelId; /// Relation identifier for the sheet substream. + OUString maName; /// Original name of the sheet. sal_Int64 mnBiffHandle; /// BIFF record handle of the sheet substream. sal_Int32 mnSheetId; /// Sheet identifier. sal_Int32 mnState; /// Visibility state. @@ -65,41 +65,41 @@ public: void importSheet( SequenceInputStream& rStrm ); /** Inserts a new empty sheet into the document. Looks for an unused name. @return Index of the new sheet in the Calc document. */ - sal_Int16 insertEmptySheet( const ::rtl::OUString& rPreferredName, bool bVisible ); + sal_Int16 insertEmptySheet( const OUString& rPreferredName, bool bVisible ); /** Returns the number of original sheets contained in the workbook. */ sal_Int32 getWorksheetCount() const; /** Returns the OOXML relation identifier of the specified worksheet. */ - ::rtl::OUString getWorksheetRelId( sal_Int32 nWorksheet ) const; + OUString getWorksheetRelId( sal_Int32 nWorksheet ) const; /** Returns the Calc index of the specified worksheet. */ sal_Int16 getCalcSheetIndex( sal_Int32 nWorksheet ) const; /** Returns the finalized name of the specified worksheet. */ - ::rtl::OUString getCalcSheetName( sal_Int32 nWorksheet ) const; + OUString getCalcSheetName( sal_Int32 nWorksheet ) const; /** Returns the Calc index of the sheet with the passed original worksheet name. */ - sal_Int16 getCalcSheetIndex( const ::rtl::OUString& rWorksheetName ) const; + sal_Int16 getCalcSheetIndex( const OUString& rWorksheetName ) const; /** Returns the finalized name of the sheet with the passed worksheet name. */ - ::rtl::OUString getCalcSheetName( const ::rtl::OUString& rWorksheetName ) const; + OUString getCalcSheetName( const OUString& rWorksheetName ) const; /** Converts sSheetNameRef (e.g. '#SheetName!A1' to '#SheetName.A1' ) if sSheetNameRef doesn't start with '#' it is ignored and not modified */ - void convertSheetNameRef( ::rtl::OUString& sSheetNameRef ) const; + void convertSheetNameRef( OUString& sSheetNameRef ) const; private: struct SheetInfo : public SheetInfoModel { - ::rtl::OUString maCalcName; - ::rtl::OUString maCalcQuotedName; + OUString maCalcName; + OUString maCalcQuotedName; sal_Int16 mnCalcSheet; - explicit SheetInfo( const SheetInfoModel& rModel, sal_Int16 nCalcSheet, const ::rtl::OUString& rCalcName ); + explicit SheetInfo( const SheetInfoModel& rModel, sal_Int16 nCalcSheet, const OUString& rCalcName ); }; - typedef ::std::pair< sal_Int16, ::rtl::OUString > IndexNamePair; + typedef ::std::pair< sal_Int16, OUString > IndexNamePair; /** Creates a new sheet in the Calc document. Does not insert anything in the own lists. */ - IndexNamePair createSheet( const ::rtl::OUString& rPreferredName, sal_Int32 nSheetPos, bool bVisible ); + IndexNamePair createSheet( const OUString& rPreferredName, sal_Int32 nSheetPos, bool bVisible ); /** Creates a new sheet in the Calc document and inserts the related SheetInfo. */ void insertSheet( const SheetInfoModel& rModel ); @@ -107,7 +107,7 @@ private: typedef RefVector< SheetInfo > SheetInfoVector; SheetInfoVector maSheetInfos; - typedef RefMap< ::rtl::OUString, SheetInfo, IgnoreCaseCompare > SheetInfoMap; + typedef RefMap< OUString, SheetInfo, IgnoreCaseCompare > SheetInfoMap; SheetInfoMap maSheetInfosByName; }; diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index 25dbdf7cf9ca..49f23c7b1bfe 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -34,7 +34,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -56,11 +56,11 @@ class WorksheetFragment : public WorksheetFragmentBase public: explicit WorksheetFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -114,7 +114,7 @@ private: void importControl( SequenceInputStream& rStrm ); /** Imports the binary data of an embedded OLE object from the fragment with the passed ID. */ - void importEmbeddedOleData( StreamDataSequence& orEmbeddedData, const ::rtl::OUString& rRelId ); + void importEmbeddedOleData( StreamDataSequence& orEmbeddedData, const OUString& rRelId ); }; } // namespace xls diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 2efa6e4a19cd..53b7ed1084c1 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -57,7 +57,7 @@ class SheetViewSettings; class VmlDrawing; class WorksheetSettings; -typedef ::std::map< rtl::OUString, void* > ExtLst; +typedef ::std::map< OUString, void* > ExtLst; // ============================================================================ // ============================================================================ @@ -139,7 +139,7 @@ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo { ::com::sun::star::table::CellRangeAddress maRange; /// The cell area containing the hyperlink. - ::rtl::OUString maTooltip; /// Additional tooltip text. + OUString maTooltip; /// Additional tooltip text. explicit HyperlinkModel(); }; @@ -152,10 +152,10 @@ struct ValidationModel ApiCellRangeList maRanges; ApiTokenSequence maTokens1; ApiTokenSequence maTokens2; - ::rtl::OUString maInputTitle; - ::rtl::OUString maInputMessage; - ::rtl::OUString maErrorTitle; - ::rtl::OUString maErrorMessage; + OUString maInputTitle; + OUString maInputMessage; + OUString maErrorTitle; + OUString maErrorMessage; sal_Int32 mnType; sal_Int32 mnOperator; sal_Int32 mnErrorStyle; @@ -247,9 +247,9 @@ public: /** Inserts the data validation settings into the spreadsheet. */ void setValidation( const ValidationModel& rModel ); /** Sets the path to the DrawingML fragment of this sheet. */ - void setDrawingPath( const ::rtl::OUString& rDrawingPath ); + void setDrawingPath( const OUString& rDrawingPath ); /** Sets the path to the legacy VML drawing fragment of this sheet. */ - void setVmlDrawingPath( const ::rtl::OUString& rVmlDrawingPath ); + void setVmlDrawingPath( const OUString& rVmlDrawingPath ); /** Extends the used area of this sheet by the passed cell position. */ void extendUsedArea( const ::com::sun::star::table::CellAddress& rAddress ); @@ -288,7 +288,7 @@ public: /** Inserts a string cell directly into the Calc sheet. */ void putString( const ::com::sun::star::table::CellAddress& rAddress, - const ::rtl::OUString& rText ) const; + const OUString& rText ) const; /** Inserts a rich-string cell directly into the Calc sheet. */ void putRichString( const ::com::sun::star::table::CellAddress& rAddress, @@ -306,10 +306,10 @@ public: /** Final import of drawing objects. Has to be called after all content has been imported */ void finalizeDrawingImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); + void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, sal_Int32 ); - void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); - void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); void setCellFormulaValue( const ::com::sun::star::table::CellAddress& rAddress, double fValue ); private: diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index a6209aa27cbe..9fc17a3bf253 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -31,7 +31,7 @@ namespace xls { /** Sheet and outline settings. */ struct SheetSettingsModel { - ::rtl::OUString maCodeName; /// VBA module codename. + OUString maCodeName; /// VBA module codename. Color maTabColor; /// Sheet tab color. bool mbFilterMode; /// True = sheet contains active filter. bool mbApplyStyles; /// True = automatic styles when creating outlines. diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 10f27f4f1402..3ccdf7306b55 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -94,7 +94,7 @@ public: /** Returns chart type info for a unique chart type identifier. */ const XclChTypeInfo& GetChartTypeInfo( XclChTypeId eType ) const; /** Returns the first fitting chart type info for the passed service name. */ - const XclChTypeInfo& GetChartTypeInfo( const ::rtl::OUString& rServiceName ) const; + const XclChTypeInfo& GetChartTypeInfo( const OUString& rServiceName ) const; /** Returns an info struct about auto formatting for the passed object type. */ const XclChFormatInfo& GetFormatInfo( XclChObjectType eObjType ) const; @@ -758,7 +758,7 @@ public: /** Converts the passed data series for stock charts. */ bool ConvertStockSeries( XDataSeriesRef xDataSeries, - const ::rtl::OUString& rValueRole, + const OUString& rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol ); /** Converts the passed error bar settings (called at trend line child series). */ bool ConvertTrendLine( const XclExpChSeries& rParent, XRegressionCurveRef xRegCurve ); @@ -777,11 +777,11 @@ private: void CreateTrendLines( XDataSeriesRef xDataSeries ); /** Tries to create positive and negative error bar series objects (called at parent series). */ void CreateErrorBars( const ScfPropertySet& rPropSet, - const ::rtl::OUString& rBarPropName, + const OUString& rBarPropName, sal_uInt8 nPosBarId, sal_uInt8 nNegBarId ); /** Tries to create an error bar series object (called at parent series). */ void CreateErrorBar( const ScfPropertySet& rPropSet, - const ::rtl::OUString& rShowPropName, sal_uInt8 nBarId ); + const OUString& rShowPropName, sal_uInt8 nBarId ); virtual void WriteBody( XclExpStream& rStrm ); @@ -979,7 +979,7 @@ private: XDataSeriesRef xDataSeries ); /** Creates a single data series of a stock chart. */ bool CreateStockSeries( XDataSeriesRef xDataSeries, - const ::rtl::OUString& rValueRole, bool bCloseSymbol ); + const OUString& rValueRole, bool bCloseSymbol ); virtual void WriteBody( XclExpStream& rStrm ); diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 1328a403de61..b972da45773c 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -129,7 +129,7 @@ private: SvStreamPtr mxVarData; /// Buffer stream with variable data. sal_uInt32 mnFlags; /// Option flags. XclExpStringRef mxTextMark; /// Location within mxRepr - ::rtl::OUString msTarget; /// Target URL + OUString msTarget; /// Target URL }; typedef XclExpRecordList< XclExpHyperlink > XclExpHyperlinkList; @@ -278,7 +278,7 @@ private: const ScDataBarFormat& mrFormat; sal_Int32 mnPriority; - rtl::OString maGuid; + OString maGuid; }; class XclExpIconSet : public XclExpRecord, protected XclExpRoot @@ -349,9 +349,9 @@ private: XclExpString maErrorText; /// The error text. XclExpStringRef mxString1; /// String for first condition formula. XclTokenArrayRef mxTokArr1; /// Formula for first condition. - ::rtl::OUString msFormula1; /// OOXML Formula for first condition. + OUString msFormula1; /// OOXML Formula for first condition. XclTokenArrayRef mxTokArr2; /// Formula for second condition. - ::rtl::OUString msFormula2; /// OOXML Formula for second condition. + OUString msFormula2; /// OOXML Formula for second condition. sal_uInt32 mnFlags; /// Miscellaneous flags. sal_uLong mnScHandle; /// The core handle for quick list search. }; diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 6eb9e7636470..205b4cbf04ab 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -368,7 +368,7 @@ private: private: XclExpString maAuthor; /// Name of the author. String maOrigNoteText; /// Original main text of the note. - rtl::OString maNoteText; /// Main text of the note (<=BIFF7). + OString maNoteText; /// Main text of the note (<=BIFF7). XclExpStringRef mpNoteContents; /// Text and formatting data (OOXML) ScAddress maScPos; /// Calc cell address of the note. sal_uInt16 mnObjId; /// Escher object ID (BIFF8). diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index fe0ccdef75cd..c32e23e6f978 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -34,7 +34,7 @@ public: virtual XclExpExtType GetType() = 0; protected: - rtl::OString maURI; + OString maURI; }; class XclExpExtCfvo : public XclExpRecordBase, protected XclExpRoot @@ -45,7 +45,7 @@ public: private: ScColorScaleEntryType meType; - rtl::OString maValue; + OString maValue; bool mbFirst; }; @@ -90,12 +90,12 @@ typedef boost::shared_ptr<XclExpExtDataBar> XclExpExtDataBarRef; class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot { public: - XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ); + XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); virtual void SaveXml( XclExpXmlStream& rStrm ); private: XclExpExtDataBarRef maDataBar; - rtl::OString maId; + OString maId; }; typedef boost::shared_ptr<XclExpExt> XclExpExtRef; @@ -104,7 +104,7 @@ typedef boost::shared_ptr<XclExpExtCfRule> XclExpExtCfRuleRef; class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExpRoot { public: - explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ); + explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); virtual void SaveXml( XclExpXmlStream& rStrm ); private: diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index b5e5a89eb854..04ecc2b0e001 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -184,7 +184,7 @@ public: /** Processes the passed URL field (tries to create a HLINK record). @return The representation string of the URL field. */ - rtl::OUString ProcessUrlField( const SvxURLField& rUrlField ); + OUString ProcessUrlField( const SvxURLField& rUrlField ); /** Returns true, if a single HLINK record has been created. */ bool HasLinkRecord() const; @@ -402,9 +402,9 @@ class XclExpUrlHelper : boost::noncopyable public: /** Encodes and returns the URL passed in rAbsUrl to an Excel like URL. @param pTableName Optional pointer to a table name to be encoded in this URL. */ - static rtl::OUString EncodeUrl( const XclExpRoot& rRoot, const rtl::OUString& rAbsUrl, const rtl::OUString* pTableName = 0 ); + static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = 0 ); /** Encodes and returns the passed DDE link to an Excel like DDE link. */ - static rtl::OUString EncodeDde( const rtl::OUString& rApplic, const rtl::OUString& rTopic ); + static OUString EncodeDde( const OUString& rApplic, const OUString& rTopic ); private: /** We don't want anybody to instantiate this class, since it is just a diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index f19a8e840440..56cb6f6e358f 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -66,7 +66,7 @@ public: /** Returns true, if the specified Calc sheet is displayed in right-to-left mode. */ bool IsMirroredTab( SCTAB nScTab ) const; /** Returns the Calc name of the specified sheet. */ - rtl::OUString GetScTabName( SCTAB nScTab ) const; + OUString GetScTabName( SCTAB nScTab ) const; /** Returns the Excel sheet index for a given Calc sheet. */ sal_uInt16 GetXclTab( SCTAB nScTab ) const; @@ -104,7 +104,7 @@ private: /** Data structure with infoemation about one Calc sheet. */ struct XclExpTabInfoEntry { - rtl::OUString maScName; + OUString maScName; sal_uInt16 mnXclTab; sal_uInt8 mnFlags; inline explicit XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( 0 ) {} diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 080eab7aef29..4a7a53fc8ac5 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -49,7 +49,7 @@ public: inline sal_uInt16 GetTypeFlag() const { return mnTypeFlag; } - bool EqualsText( const rtl::OUString& rText ) const; + bool EqualsText( const OUString& rText ) const; bool EqualsDouble( double fValue ) const; bool EqualsDateTime( const DateTime& rDateTime ) const; bool EqualsBool( bool bValue ) const; @@ -85,14 +85,14 @@ public: void ConvertToNumGroup( const ScDPObject& rDPObj, const ScDPSaveNumGroupDimension& rNumGroupDim ); /** Returns the name of this cache field. */ - inline const rtl::OUString& GetFieldName() const { return maFieldInfo.maName; } + inline const OUString& GetFieldName() const { return maFieldInfo.maName; } /** Returns the number of visible items of this field. */ sal_uInt16 GetItemCount() const; /** Returns the specified pivot cache item (returns visible items in groupings). */ const XclExpPCItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the index of a pivot cache item, or EXC_PC_NOITEM on error. */ - sal_uInt16 GetItemIndex( const rtl::OUString& rItemName ) const; + sal_uInt16 GetItemIndex( const OUString& rItemName ) const; /** Returns the size an item index needs to write out. */ sal_Size GetIndexSize() const; @@ -230,8 +230,8 @@ private: XclPCInfo maPCInfo; /// Pivot cache settings (SXDB record). XclExpPCFieldList maFieldList; /// List of all pivot cache fields. - rtl::OUString maTabName; /// Name of source data sheet. - rtl::OUString maSrcRangeName; /// Range name for source data. + OUString maTabName; /// Name of source data sheet. + OUString maSrcRangeName; /// Range name for source data. ScRange maOrigSrcRange; /// The original sheet source range. ScRange maExpSrcRange; /// The exported sheet source range. ScRange maDocSrcRange; /// The range used to build the cache fields and items. @@ -257,7 +257,7 @@ public: explicit XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUseCache ); /** Returns the internal name of this item. */ - rtl::OUString GetItemName() const; + OUString GetItemName() const; /** Fills this item with properties from the passed save member. */ void SetPropertiesFromMember( const ScDPSaveMember& rSaveMem ); @@ -281,7 +281,7 @@ public: // data access ------------------------------------------------------------ /** Returns the name of this field. */ - rtl::OUString GetFieldName() const; + OUString GetFieldName() const; /** Returns the pivot table field list index of this field. */ sal_uInt16 GetFieldIndex() const; @@ -290,7 +290,7 @@ public: /** Returns the list index of an item by its name. @param nDefaultIdx This value will be returned, if the item could not be found. */ - sal_uInt16 GetItemIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const; + sal_uInt16 GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; // fill data -------------------------------------------------------------- @@ -315,7 +315,7 @@ public: // ------------------------------------------------------------------------ private: /** Returns an item by its name. */ - XclExpPTItem* GetItemAcc( const rtl::OUString& rName ); + XclExpPTItem* GetItemAcc( const OUString& rName ); /** Appends a special item describing a field subtotal entry. */ void AppendSubtotalItem( sal_uInt16 nItemType ); @@ -355,11 +355,11 @@ public: /** Returns a pivot table field by its name. */ const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const; /** Returns a pivot table field by its name. */ - const XclExpPTField* GetField( const rtl::OUString& rName ) const; + const XclExpPTField* GetField( const OUString& rName ) const; /** Returns the data-field-only index of the first data field with the passed name. @param nDefaultIdx This value will be returned, if the field could not be found. */ - sal_uInt16 GetDataFieldIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const; + sal_uInt16 GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; /** Writes the entire pivot table. */ virtual void Save( XclExpStream& rStrm ); @@ -368,7 +368,7 @@ public: // ------------------------------------------------------------------------ private: /** Returns a pivot table field by its name. */ - XclExpPTField* GetFieldAcc( const rtl::OUString& rName ); + XclExpPTField* GetFieldAcc( const OUString& rName ); /** Returns a pivot table field corresponding to the passed save dimension. */ XclExpPTField* GetFieldAcc( const ScDPSaveDimension& rSaveDim ); diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index ddaad2054465..27f272e478d6 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -222,7 +222,7 @@ void XclExpValueRecord< Type >::SaveXml( XclExpXmlStream& rStrm ) if( mnAttribute == -1 ) return; rStrm.WriteAttributes( - mnAttribute, rtl::OString::valueOf( (sal_Int32) maValue ).getStr(), + mnAttribute, OString::valueOf( (sal_Int32) maValue ).getStr(), FSEND ); } diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 5eb6e5371eb3..a0978a72b4da 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -162,7 +162,7 @@ public: bool IsDocumentEncrypted() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const ::rtl::OUString& aPass ) const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ) const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData() const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateDefaultEncryptionData() const; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 2fb371249ab8..0ac31d4617f1 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -134,9 +134,9 @@ public: // *** write 8-bit-strings *** // (slice length setting has no effect here -> disabled automatically) - /** Writes string length field and rtl::OString buffer. */ + /** Writes string length field and OString buffer. */ void WriteByteString( - const rtl::OString& rString, + const OString& rString, sal_uInt16 nMaxLen = 0x00FF, bool b16BitCount = false ); @@ -269,27 +269,27 @@ class XclXmlUtils XclXmlUtils(const XclXmlUtils&); XclXmlUtils& operator=(const XclXmlUtils&); public: - static void GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& sType, ::rtl::OUString& rValue); - static ::rtl::OUString GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId ); - - static ::rtl::OString ToOString( const Color& rColor ); - static ::rtl::OString ToOString( const ::rtl::OUString& s ); - static ::rtl::OString ToOString( const ScfUInt16Vec& rBuffer ); - static ::rtl::OString ToOString( const String& s ); - static ::rtl::OString ToOString( const ScAddress& rRange ); - static ::rtl::OString ToOString( const ScRange& rRange ); - static ::rtl::OString ToOString( const ScRangeList& rRangeList ); - static ::rtl::OString ToOString( const XclAddress& rAddress ); - static ::rtl::OString ToOString( const XclExpString& s ); - static ::rtl::OString ToOString( const XclRange& rRange ); - static ::rtl::OString ToOString( const XclRangeList& rRangeList ); - - static ::rtl::OUString ToOUString( const char* s ); - static ::rtl::OUString ToOUString( const ScfUInt16Vec& rBuffer, sal_Int32 nStart = 0, sal_Int32 nLength = -1 ); - static ::rtl::OUString ToOUString( const String& s ); - static ::rtl::OUString ToOUString( ScDocument& rDocument, const ScAddress& rAddress, + static void GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& sType, OUString& rValue); + static OUString GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId ); + + static OString ToOString( const Color& rColor ); + static OString ToOString( const OUString& s ); + static OString ToOString( const ScfUInt16Vec& rBuffer ); + static OString ToOString( const String& s ); + static OString ToOString( const ScAddress& rRange ); + static OString ToOString( const ScRange& rRange ); + static OString ToOString( const ScRangeList& rRangeList ); + static OString ToOString( const XclAddress& rAddress ); + static OString ToOString( const XclExpString& s ); + static OString ToOString( const XclRange& rRange ); + static OString ToOString( const XclRangeList& rRangeList ); + + static OUString ToOUString( const char* s ); + static OUString ToOUString( const ScfUInt16Vec& rBuffer, sal_Int32 nStart = 0, sal_Int32 nLength = -1 ); + static OUString ToOUString( const String& s ); + static OUString ToOUString( ScDocument& rDocument, const ScAddress& rAddress, ScTokenArray* pTokenArray, const ScCompiler::OpCodeMapPtr & xOpCodeMap ); - static ::rtl::OUString ToOUString( const XclExpString& s ); + static OUString ToOUString( const XclExpString& s ); static const char* ToPsz( bool b ); static sax_fastparser::FSHelperPtr WriteElement( sax_fastparser::FSHelperPtr pStream, sal_Int32 nElement, sal_Int32 nValue ); @@ -311,7 +311,7 @@ public: void PushStream( sax_fastparser::FSHelperPtr aStream ); void PopStream(); - sax_fastparser::FSHelperPtr GetStreamForPath( const ::rtl::OUString& rPath ); + sax_fastparser::FSHelperPtr GetStreamForPath( const OUString& rPath ); sax_fastparser::FSHelperPtr& WriteAttributes( sal_Int32 nAttribute, const char* value, FSEND_t ) { return WriteAttributesInternal( nAttribute, value, FSEND_internal ); } @@ -319,12 +319,12 @@ public: { return WriteAttributesInternal( nAttribute, value.getStr(), FSEND_internal ); } sax_fastparser::FSHelperPtr CreateOutputStream ( - const ::rtl::OUString& sFullStream, - const ::rtl::OUString& sRelativeStream, + const OUString& sFullStream, + const OUString& sRelativeStream, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, - ::rtl::OUString* pRelationshipId = NULL ); + OUString* pRelationshipId = NULL ); // ignore virtual bool exportDocument() throw(); @@ -368,12 +368,12 @@ public: private: virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; ScDocShell *getDocShell(); sax_fastparser::FSHelperPtr& WriteAttributesInternal( sal_Int32 nAttribute, ... ); - typedef std::map< ::rtl::OUString, - std::pair< ::rtl::OUString, + typedef std::map< OUString, + std::pair< OUString, sax_fastparser::FSHelperPtr > > XclExpXmlPathToStateMap; const XclExpRoot* mpRoot; diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 2731e324f7b9..de23884c7c85 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -65,7 +65,7 @@ public: @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string. */ explicit XclExpString( - const ::rtl::OUString& rString, + const OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); @@ -83,7 +83,7 @@ public: @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string. */ void Assign( - const ::rtl::OUString& rString, + const OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index aa1f6f59d4ff..a0903bcc49b4 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -268,9 +268,9 @@ struct XclExpNumFmt { sal_uLong mnScNumFmt; /// Core index of the number format. sal_uInt16 mnXclNumFmt; /// Resulting Excel format index. - rtl::OUString maNumFmtString; /// format string + OUString maNumFmtString; /// format string - inline explicit XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16 nXclNumFmt, const rtl::OUString& rFrmt ) : + inline explicit XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) : mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ), maNumFmtString( rFrmt ) {} void SaveXml( XclExpXmlStream& rStrm ); @@ -753,12 +753,12 @@ public: XclExpDxfs( const XclExpRoot& rRoot ); virtual ~XclExpDxfs() {} - sal_Int32 GetDxfId(const rtl::OUString& rName); + sal_Int32 GetDxfId(const OUString& rName); virtual void SaveXml( XclExpXmlStream& rStrm); private: typedef boost::ptr_vector<XclExpDxf> DxfContainer; - std::map<rtl::OUString, sal_Int32> maStyleNameToDxfId; + std::map<OUString, sal_Int32> maStyleNameToDxfId; DxfContainer maDxf; SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion. boost::scoped_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table. diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 7c444126822b..c1a2cbcc57fe 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -422,7 +422,7 @@ public: void ConvertNumFmt( ScfPropertySet& rPropSet, bool bPercent ) const; /** Creates a data sequence containing the link into the Calc document. */ - XDataSequenceRef CreateDataSequence( const ::rtl::OUString& rRole ) const; + XDataSequenceRef CreateDataSequence( const OUString& rRole ) const; /** Creates a sequence of formatted string objects. */ XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot, sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const; @@ -834,9 +834,9 @@ public: inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } /** Creates a labeled data sequence object from value data link. */ - XLabeledDataSeqRef CreateValueSequence( const ::rtl::OUString& rValueRole ) const; + XLabeledDataSeqRef CreateValueSequence( const OUString& rValueRole ) const; /** Creates a labeled data sequence object from category data link. */ - XLabeledDataSeqRef CreateCategSequence( const ::rtl::OUString& rCategRole ) const; + XLabeledDataSeqRef CreateCategSequence( const OUString& rCategRole ) const; /** Creates a data series object with initialized source links. */ XDataSeriesRef CreateDataSeries() const; @@ -1390,7 +1390,7 @@ public: const ::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument>& xChartDoc, XclImpDffConverter& rDffConv, - const ::rtl::OUString& rObjName, + const OUString& rObjName, const Rectangle& rChartRect ) const; private: @@ -1488,7 +1488,7 @@ public: /** Creates the chart object in the passed component. */ void Convert( XModelRef xModel, XclImpDffConverter& rDffConv, - const ::rtl::OUString& rObjName, + const OUString& rObjName, const Rectangle& rChartRect ) const; private: diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 07655516b419..088c6d500e34 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -72,7 +72,7 @@ public: void SetAnchor( const XclObjAnchor& rAnchor ); /** Sets shape data from DFF stream. */ void SetDffData( - const DffObjData& rDffObjData, const rtl::OUString& rObjName, const rtl::OUString& rHyperlink, + const DffObjData& rDffObjData, const OUString& rObjName, const OUString& rHyperlink, bool bVisible, bool bAutoMargin ); /** If set to false, the SdrObject will not be created, processed, or inserted into the draw page. */ @@ -87,9 +87,9 @@ public: /** Returns the Excel object type from OBJ record. */ inline sal_uInt16 GetObjType() const { return mnObjType; } /** Returns the name of this object, may generate a default name. */ - virtual rtl::OUString GetObjName() const; + virtual OUString GetObjName() const; /** Returns associated macro name, if set, otherwise zero length string. */ - inline const rtl::OUString& GetMacroName() const { return maMacroName; } + inline const OUString& GetMacroName() const { return maMacroName; } /** Returns the shape identifier used in the DFF stream. */ inline sal_uInt32 GetDffShapeId() const { return mnDffShapeId; } @@ -185,9 +185,9 @@ private: sal_uInt16 mnObjType; /// The Excel object type from OBJ record. sal_uInt32 mnDffShapeId; /// Shape ID from DFF stream. sal_uInt32 mnDffFlags; /// Shape flags from DFF stream. - rtl::OUString maObjName; /// Name of the object. - rtl::OUString maMacroName; /// Name of an attached macro. - rtl::OUString maHyperlink; /// On-click hyperlink URL. + OUString maObjName; /// Name of the object. + OUString maMacroName; /// Name of an attached macro. + OUString maHyperlink; /// On-click hyperlink URL. bool mbHasAnchor; /// true = maAnchor is initialized. bool mbHidden; /// true = Object is hidden. bool mbVisible; /// true = Object is visible. @@ -526,7 +526,7 @@ public: void SetDffProperties( const DffPropSet& rDffPropSet ); /** Returns the service name of the control component to be created. */ - inline ::rtl::OUString GetServiceName() const { return DoGetServiceName(); } + inline OUString GetServiceName() const { return DoGetServiceName(); } /** Fills the passed macro event descriptor. */ bool FillMacroDescriptor( ::com::sun::star::script::ScriptEventDescriptor& rDescriptor ) const; @@ -543,7 +543,7 @@ protected: virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; /** Derived classes return the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const = 0; + virtual OUString DoGetServiceName() const = 0; /** Derived classes return the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const = 0; }; @@ -560,7 +560,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -581,7 +581,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -606,7 +606,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -628,7 +628,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -649,7 +649,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -669,7 +669,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -693,7 +693,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -744,7 +744,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -763,7 +763,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -809,7 +809,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -839,7 +839,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -861,7 +861,7 @@ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper public: explicit XclImpPictureObj( const XclImpRoot& rRoot ); /** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/ - virtual rtl::OUString GetObjName() const; + virtual OUString GetObjName() const; /** Returns the graphic imported from the IMGDATA record. */ inline const Graphic& GetGraphic() const { return maGraphic; } @@ -1085,7 +1085,7 @@ private: typedef boost::shared_ptr< XclImpDffConvData > XclImpDffConvDataRef; typedef ::std::vector< XclImpDffConvDataRef > XclImpDffConvDataStack; - const ::rtl::OUString maStdFormName; /// Standard name of control forms. + const OUString maStdFormName; /// Standard name of control forms. SotStorageStreamRef mxCtlsStrm; /// The 'Ctls' stream for OCX form controls. ScfProgressBarRef mxProgress; /// The progress bar used in ProcessObj(). XclImpDffConvDataStack maDataStack; /// Stack for registered drawing managers. @@ -1216,7 +1216,7 @@ public: void ConvertObjects(); /** Returns the default name for the passed object. */ - rtl::OUString GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const; + OUString GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const; /** Returns the used area in the sheet with the passed index. */ ScRange GetUsedArea( SCTAB nScTab ) const; /** Sets the container to receive overridden shape/ctrl names from diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 8057fff9925f..52f7d255a26e 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -267,10 +267,10 @@ public: const String& rEncodedUrl ); static void DecodeUrl( - ::rtl::OUString& rUrl, + OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, - const ::rtl::OUString& rEncodedUrl ); + const OUString& rEncodedUrl ); /** Decodes the passed URL to OLE or DDE link components. @descr For DDE links: Decodes to application name and topic. diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index 013cd3a31fb9..09b009869600 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -135,8 +135,8 @@ public: * reference, since OLE link doesn't work cross-platform, and is not very * reliable even on Windows. */ - bool CreateOleData(ScDocument& rDoc, const ::rtl::OUString& rUrl, - sal_uInt16& rFileId, ::rtl::OUString& rTabName, ScRange& rRange) const; + bool CreateOleData(ScDocument& rDoc, const OUString& rUrl, + sal_uInt16& rFileId, OUString& rTabName, ScRange& rRange) const; bool HasFormulaTokens() const; diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 504d6485193f..b670e38b82ea 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -77,7 +77,7 @@ public: // general field/item access ---------------------------------------------- /** Returns the name of the field, uses the passed visible name if supported. */ - const rtl::OUString& GetFieldName( const ScfStringVec& rVisNames ) const; + const OUString& GetFieldName( const ScfStringVec& rVisNames ) const; /** Returns the base field if this is a grouping field. */ const XclImpPCField* GetGroupBaseField() const; @@ -158,7 +158,7 @@ public: /** Returns the data source range read from the DCONREF record. */ inline const ScRange& GetSourceRange() const { return maSrcRange; } - const ::rtl::OUString& GetSourceRangeName() const { return maSrcRangeName; } + const OUString& GetSourceRangeName() const { return maSrcRangeName; } /** Returns the number of pivot cache fields. */ sal_uInt16 GetFieldCount() const; @@ -193,7 +193,7 @@ private: ScRange maSrcRange; /// Source range in the spreadsheet. String maUrl; /// URL of the source data. String maTabName; /// Sheet name of the source data. - ::rtl::OUString maSrcRangeName; /// Name of the source data range. + OUString maSrcRangeName; /// Name of the source data range. sal_uInt16 mnStrmId; /// Pivot cache stream identifier. sal_uInt16 mnSrcType; /// Source data type. bool mbSelfRef; /// true = Source data from own document. @@ -215,7 +215,7 @@ public: explicit XclImpPTItem( const XclImpPCField* pCacheField ); /** Returns the internal name of the item or 0, if no name could be found. */ - const rtl::OUString* GetItemName() const; + const OUString* GetItemName() const; /** Reads an SXVI record containing data of this item. */ void ReadSxvi( XclImpStream& rStrm ); @@ -242,14 +242,14 @@ public: /** Returns the corresponding pivot cache field of this field. */ const XclImpPCField* GetCacheField() const; /** Returns the name of this field that is used to create the Calc dimensions. */ - rtl::OUString GetFieldName() const; + OUString GetFieldName() const; /** Returns the internally set visible name of this field. */ - rtl::OUString GetVisFieldName() const; + OUString GetVisFieldName() const; /** Returns the specified item. */ const XclImpPTItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the internal name of the specified item. */ - const rtl::OUString* GetItemName( sal_uInt16 nItemIdx ) const; + const OUString* GetItemName( sal_uInt16 nItemIdx ) const; /** Returns the flags of the axes this field is part of. */ inline sal_uInt16 GetAxes() const { return maFieldInfo.mnAxes; } @@ -326,7 +326,7 @@ public: const String& GetFieldName( sal_uInt16 nFieldIdx ) const; const XclImpPTField* GetDataField( sal_uInt16 nDataFieldIdx ) const; - rtl::OUString GetDataFieldName( sal_uInt16 nDataFieldIdx ) const; + OUString GetDataFieldName( sal_uInt16 nDataFieldIdx ) const; // records ---------------------------------------------------------------- diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 0a0585bf7eed..0a2199bd06fa 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -57,7 +57,7 @@ public: XclImpDecrypterRef Clone() const; /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Updates the decrypter on start of a new record or after seeking stream. */ @@ -76,7 +76,7 @@ private: /** Derived classes implement password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ) = 0; + OnVerifyPassword( const OUString& rPassword ) = 0; virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of updating the decrypter. */ @@ -106,7 +106,7 @@ private: virtual XclImpBiff5Decrypter* OnClone() const; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ); + OnVerifyPassword( const OUString& rPassword ); virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); @@ -137,7 +137,7 @@ private: virtual XclImpBiff8Decrypter* OnClone() const; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ); + OnVerifyPassword( const OUString& rPassword ); virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 6afb2ed8df45..0df3408de43f 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -885,7 +885,7 @@ struct XclChObjectLink struct XclChFrLabelProps { - rtl::OUString maSeparator; /// Separator between label values. + OUString maSeparator; /// Separator between label values. sal_uInt16 mnFlags; /// Flags indicating which values to be displayed. explicit XclChFrLabelProps(); @@ -1155,7 +1155,7 @@ public: /** Returns true, if the passed marker type is filled. */ static bool HasMarkerFillColor( sal_uInt16 nMarkerType ); /** Returns the role name for a manual data source for error bars. */ - static ::rtl::OUString GetErrorBarValuesRole( sal_uInt8 nBarType ); + static OUString GetErrorBarValuesRole( sal_uInt8 nBarType ); }; // Chart formatting info provider ============================================= @@ -1311,7 +1311,7 @@ public: /** Returns the first fitting chart type info for an Excel chart type record identifier. */ const XclChTypeInfo& GetTypeInfoFromRecId( sal_uInt16 nRecId ) const; /** Returns the first fitting chart type info for the passed service name. */ - const XclChTypeInfo& GetTypeInfoFromService( const ::rtl::OUString& rServiceName ) const; + const XclChTypeInfo& GetTypeInfoFromService( const OUString& rServiceName ) const; private: typedef ::std::map< XclChTypeId, const XclChTypeInfo* > XclChTypeInfoMap; @@ -1352,18 +1352,18 @@ public: public: explicit XclChObjectTable( XServiceFactoryRef xFactory, - const ::rtl::OUString& rServiceName, const ::rtl::OUString& rObjNameBase ); + const OUString& rServiceName, const OUString& rObjNameBase ); /** Returns a named formatting object from the chart document. */ - ::com::sun::star::uno::Any GetObject( const ::rtl::OUString& rObjName ); + ::com::sun::star::uno::Any GetObject( const OUString& rObjName ); /** Insertes a named formatting object into the chart document. */ - ::rtl::OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); + OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); private: XServiceFactoryRef mxFactory; /// Factory to create the container. XNameContainerRef mxContainer; /// Container for the objects. - ::rtl::OUString maServiceName; /// Service name to create the container. - ::rtl::OUString maObjNameBase; /// Base of names for inserted objects. + OUString maServiceName; /// Service name to create the container. + OUString maObjNameBase; /// Base of names for inserted objects. sal_Int32 mnIndex; /// Index to create unique identifiers. }; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 1e993942071d..364fed962601 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -377,7 +377,7 @@ public: /** Sets the item to 'empty' type. */ void SetEmpty(); /** Sets the item to 'text' type and adds the passed text. */ - void SetText( const rtl::OUString& rText ); + void SetText( const OUString& rText ); /** Sets the item to 'double' type and adds the passed value. */ void SetDouble( double fValue ); /** Sets the item to 'date/time' type and adds the passed date. */ @@ -392,7 +392,7 @@ public: /** Returns the current item type. */ inline XclPCItemType GetType() const { return meType; } /** Returns the text representation of the item. */ - inline const rtl::OUString& ConvertToText() const { return maText; } + inline const OUString& ConvertToText() const { return maText; } /** Returns true, if the passed iterm equals this item. */ bool IsEqual( const XclPCItem& rItem ) const; @@ -400,7 +400,7 @@ public: /** Returns true, if the item type is 'empty'. */ bool IsEmpty() const; /** Returns pointer to text, if the item type is 'text', otherwise 0. */ - const rtl::OUString* GetText() const; + const OUString* GetText() const; /** Returns pointer to value, if the item type is 'double', otherwise 0. */ const double* GetDouble() const; /** Returns pointer to date, if the item type is 'date/time', otherwise 0. */ @@ -414,7 +414,7 @@ public: private: XclPCItemType meType; /// Type of the item. - rtl::OUString maText; /// Text representation of the item. + OUString maText; /// Text representation of the item. DateTime maDateTime; /// Value of a date/time item. union { @@ -433,7 +433,7 @@ inline bool operator!=( const XclPCItem& rLeft, const XclPCItem& rRight ) { retu /** Contains data for a pivot cache field (SXFIELD record). */ struct XclPCFieldInfo { - rtl::OUString maName; /// Name of the pivot cache field. + OUString maName; /// Name of the pivot cache field. sal_uInt16 mnFlags; /// Various flags. sal_uInt16 mnGroupChild; /// Field containing grouping info for this field. sal_uInt16 mnGroupBase; /// Base field if this field contains grouping info. @@ -530,7 +530,7 @@ struct XclPCInfo sal_uInt16 mnStdFields; /// Number of standard pivot cache fields. sal_uInt16 mnTotalFields; /// Number of all fields (standard, grouped, calculated). sal_uInt16 mnSrcType; /// Database type. - rtl::OUString maUserName; /// Name of user who last modified the cache. + OUString maUserName; /// Name of user who last modified the cache. explicit XclPCInfo(); }; @@ -547,7 +547,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ); /** A name for various pivot table info structs. Includes 'use cache' state. */ struct XclPTCachedName { - rtl::OUString maName; /// The visible name, if used. + OUString maName; /// The visible name, if used. bool mbUseCache; /// true = Use name in cache instead of maName. inline explicit XclPTCachedName() : mbUseCache( true ) {} @@ -566,9 +566,9 @@ struct XclPTVisNameInfo /** Returns true, if the name is set explicitly (maVisName.mbUseCache is false). */ inline bool HasVisName() const { return !maVisName.mbUseCache; } /** Returns the name, if set explicitly (maVisName.mbUseCache is false). */ - const rtl::OUString* GetVisName() const; + const OUString* GetVisName() const; /** Sets the visible name and enables usage of cache if name is empty. */ - void SetVisName( const rtl::OUString& rName ); + void SetVisName( const OUString& rName ); }; // Field item settings ======================================================== @@ -626,7 +626,7 @@ struct XclPTFieldExtInfo sal_uInt16 mnSortField; /// Index to data field sorting bases on. sal_uInt16 mnShowField; /// Index to data field AutoShow bases on. sal_uInt16 mnNumFmt; - boost::scoped_ptr<rtl::OUString> mpFieldTotalName; + boost::scoped_ptr<OUString> mpFieldTotalName; explicit XclPTFieldExtInfo(); @@ -707,8 +707,8 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTDataFieldInfo& rInfo ) /** Contains data for a pivot table (SXVIEW record). */ struct XclPTInfo { - rtl::OUString maTableName; /// The name of the pivot table. - rtl::OUString maDataName; /// The visible name of the data field. + OUString maTableName; /// The name of the pivot table. + OUString maDataName; /// The visible name of the data field. XclRange maOutXclRange; /// Output range. XclAddress maDataXclPos; /// First cell containing data. sal_uInt16 mnFirstHeadRow; /// First heading row. @@ -758,7 +758,7 @@ struct XclPTViewEx9Info sal_uInt32 mbReport; /// 2 for report* fmts ? sal_uInt8 mnAutoFormat; /// AutoFormat ID sal_uInt8 mnGridLayout; /// 0 == gridlayout, 0x10 == modern - rtl::OUString maGrandTotalName; + OUString maGrandTotalName; explicit XclPTViewEx9Info(); void Init( const ScDPObject& rDPObj ); diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index daa35e604f23..d0cc23e76bc1 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -164,26 +164,26 @@ public: // font names ------------------------------------------------------------- /** Returns the matching Excel font name for a passed Calc font name. */ - static rtl::OUString GetXclFontName( const rtl::OUString& rFontName ); + static OUString GetXclFontName( const OUString& rFontName ); // built-in defined names ------------------------------------------------- /** Returns the raw English UI representation of a built-in defined name used in NAME records. @param cBuiltIn Excel index of the built-in name. */ - static rtl::OUString GetXclBuiltInDefName( sal_Unicode cBuiltIn ); + static OUString GetXclBuiltInDefName( sal_Unicode cBuiltIn ); /** Returns the Calc UI representation of a built-in defined name used in NAME records. @descr Adds a prefix to the representation returned by GetXclBuiltInDefName(). @param cBuiltIn Excel index of the built-in name. */ - static rtl::OUString GetBuiltInDefName( sal_Unicode cBuiltIn ); + static OUString GetBuiltInDefName( sal_Unicode cBuiltIn ); /** Returns the Excel built-in name with OOXML prefix @descr Adds the "_xlnm." prefix to the representation returned by GetXclBuiltInDefName() @param cBuiltIn Excel index of the built in name.*/ - static rtl::OUString GetBuiltInDefNameXml( sal_Unicode cBuiltIn ); + static OUString GetBuiltInDefNameXml( sal_Unicode cBuiltIn ); /** Returns the Excel built-in name index of the passed defined name from Calc. @descr Ignores any characters following a valid representation of a built-in name. @param pcBuiltIn (out-param) If not 0, the index of the built-in name will be returned here. @return true = passed string is a built-in name; false = user-defined name. */ - static sal_Unicode GetBuiltInDefNameIndex( const rtl::OUString& rDefName ); + static sal_Unicode GetBuiltInDefNameIndex( const OUString& rDefName ); // built-in style names --------------------------------------------------- @@ -192,12 +192,12 @@ public: @param rName Default name for unknown styles. @param nLevel The zero-based outline level for RowLevel and ColLevel styles. @return The style name or an empty string, if the parameters are not valid. */ - static rtl::OUString GetBuiltInStyleName( sal_uInt8 nStyleId, const rtl::OUString& rName, sal_uInt8 nLevel ); + static OUString GetBuiltInStyleName( sal_uInt8 nStyleId, const OUString& rName, sal_uInt8 nLevel ); /** Returns true, if the passed string is a name of an Excel built-in style. @param pnStyleId If not 0, the found style identifier will be returned here. @param pnNextChar If not 0, the index of the char after the evaluated substring will be returned here. */ - static bool IsBuiltInStyleName( const rtl::OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 ); + static bool IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 ); /** Returns the Excel built-in style identifier of a passed style name. @param rnStyleId The style identifier is returned here. @param rnLevel The zero-based outline level for RowLevel and ColLevel styles is returned here. @@ -205,7 +205,7 @@ public: @return true = passed string is a built-in style name, false = user style. */ static bool GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, - const rtl::OUString& rStyleName ); + const OUString& rStyleName ); // conditional formatting style names ------------------------------------- @@ -214,10 +214,10 @@ public: @param nFormat The zero-based index of the conditional formatting. @param nCondition The zero-based index of the condition. @return A style sheet name in the form "Excel_CondFormat_<sheet>_<format>_<condition>". */ - static rtl::OUString GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ); + static OUString GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ); /** Returns true, if the passed string is a name of a conditional format style created by Excel import. @param pnNextChar If not 0, the index of the char after the evaluated substring will be returned here. */ - static bool IsCondFormatStyleName( const rtl::OUString& rStyleName ); + static bool IsCondFormatStyleName( const OUString& rStyleName ); // stream handling -------------------------------------------------------- @@ -227,20 +227,20 @@ public: // Basic macro names ------------------------------------------------------ /** Returns the full StarBasic macro URL from an Excel macro name. */ - static ::rtl::OUString GetSbMacroUrl( const rtl::OUString& rMacroName, SfxObjectShell* pDocShell = 0 ); + static OUString GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell = 0 ); /** Returns the Excel macro name from a full StarBasic macro URL. */ - static ::rtl::OUString GetXclMacroName( const ::rtl::OUString& rSbMacroUrl ); + static OUString GetXclMacroName( const OUString& rSbMacroUrl ); // ------------------------------------------------------------------------ private: - static const ::rtl::OUString maDefNamePrefix; /// Prefix for built-in defined names. - static const ::rtl::OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX - static const ::rtl::OUString maStyleNamePrefix1; /// Prefix for built-in cell style names. - static const ::rtl::OUString maStyleNamePrefix2; /// Prefix for built-in cell style names from OOX filter. - static const ::rtl::OUString maCFStyleNamePrefix1; /// Prefix for cond. formatting style names. - static const ::rtl::OUString maCFStyleNamePrefix2; /// Prefix for cond. formatting style names from OOX filter. - static const ::rtl::OUString maSbMacroPrefix; /// Prefix for StarBasic macros. - static const ::rtl::OUString maSbMacroSuffix; /// Suffix for StarBasic macros. + static const OUString maDefNamePrefix; /// Prefix for built-in defined names. + static const OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX + static const OUString maStyleNamePrefix1; /// Prefix for built-in cell style names. + static const OUString maStyleNamePrefix2; /// Prefix for built-in cell style names from OOX filter. + static const OUString maCFStyleNamePrefix1; /// Prefix for cond. formatting style names. + static const OUString maCFStyleNamePrefix2; /// Prefix for cond. formatting style names from OOX filter. + static const OUString maSbMacroPrefix; /// Prefix for StarBasic macros. + static const OUString maSbMacroSuffix; /// Suffix for StarBasic macros. /** We don't want anybody to instantiate this class, since it is just a collection of static items. To enforce this, the default constructor diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index c10283c6cbd0..1f5dd65f7c2c 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -33,7 +33,7 @@ extern WKTYP eTyp; static const sal_Char* GetAddInName( const sal_uInt8 nIndex ); -static DefTokenId lcl_KnownAddIn(const rtl::OString& rTest); +static DefTokenId lcl_KnownAddIn(const OString& rTest); //extern double decipher_Number123( sal_uInt32 nValue ); @@ -51,10 +51,10 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri if( eOc == ocNoName ) { - rtl::OString t; + OString t; if( pExtString ) { - const rtl::OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>")); + const OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>")); t = pExtString; @@ -67,7 +67,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri eOc = lcl_KnownAddIn( t ); if( eOc == ocNoName ) - t = rtl::OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t; + t = OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t; } else t = "#UNKNOWN FUNC NAME#"; @@ -75,7 +75,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri if( eOc == ocNoName ) { bAddIn = sal_True; - nMerk0 = aPool.Store(eOc, rtl::OStringToOUString(t, eSrcChar)); + nMerk0 = aPool.Store(eOc, OStringToOUString(t, eSrcChar)); aPool << nMerk0; } @@ -1986,7 +1986,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) } -static DefTokenId lcl_KnownAddIn( const rtl::OString& rTest ) +static DefTokenId lcl_KnownAddIn( const OString& rTest ) { DefTokenId eId = ocNoName; diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 4f07cf772766..a5b5d7b8e563 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -198,9 +198,9 @@ FltError ImportLotus::Read() // duemmliche Namen eliminieren SCTAB nTabs = pD->GetTableCount(); SCTAB nCnt; - rtl::OUString aTabName; - rtl::OUString aBaseName; - rtl::OUString aRef( "temp" ); + OUString aTabName; + OUString aBaseName; + OUString aRef( "temp" ); if( nTabs != 0 ) { if( nTabs > 1 ) diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index cdf78c91cb40..958acb6493db 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -38,10 +38,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; // ============================================================================ diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 9665e5c47141..5064440dfb0c 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -181,7 +179,7 @@ void ApiFilterSettings::appendField( bool bAnd, sal_Int32 nOperator, const OUStr rFilterField.Values[0].StringValue = rValue; } -void ApiFilterSettings::appendField( bool bAnd, const std::vector<rtl::OUString>& rValues ) +void ApiFilterSettings::appendField( bool bAnd, const std::vector<OUString>& rValues ) { maFilterFields.resize( maFilterFields.size() + 1 ); TableFilterField3& rFilterField = maFilterFields.back(); diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx index 0f4277f39f47..4f351794fed5 100644 --- a/sc/source/filter/oox/autofiltercontext.cxx +++ b/sc/source/filter/oox/autofiltercontext.cxx @@ -26,7 +26,6 @@ namespace oox { namespace xls { using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index fcd4875b9a14..51e9fce72d76 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -33,9 +33,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OStringToOUString; // ============================================================================ diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 0afd05353bc0..efc622394225 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -30,8 +30,6 @@ namespace xls { // ============================================================================ -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index eb99508559c3..0782d8027ebd 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -27,10 +27,6 @@ namespace xls { // ============================================================================ -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index 87cc63d3615a..f1aa4f4533fb 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -33,7 +33,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 92c090b57f15..d70a5b9bcfe2 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using ::rtl::OUString; static sal_Int32 lcl_ToHorizAlign( sal_Int32 nAlign ) { diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index 7cf9600bbd67..09d65f5467dd 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 15d193071bfd..01c3edc077ba 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -64,8 +64,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -136,7 +134,7 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttribs ) { - rtl::OUString aType = rAttribs.getString( XML_type, rtl::OUString() ); + OUString aType = rAttribs.getString( XML_type, OUString() ); double nVal = rAttribs.getDouble( XML_val, 0.0 ); pEntry->mnVal = nVal; @@ -162,7 +160,7 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttrib } else if( aType == "formula" ) { - rtl::OUString aFormula = rAttribs.getString( XML_val, rtl::OUString() ); + OUString aFormula = rAttribs.getString( XML_val, OUString() ); pEntry->maFormula = aFormula; } @@ -333,7 +331,7 @@ void IconSetRule::importCfvo( const AttributeList& rAttribs ) void IconSetRule::importAttribs( const AttributeList& rAttribs ) { - maIconSetType = rAttribs.getString( XML_iconSet, rtl::OUString("3TrafficLights1") ); + maIconSetType = rAttribs.getString( XML_iconSet, OUString("3TrafficLights1") ); mpFormatData->mbShowValue = rAttribs.getBool( XML_showValue, true ); mpFormatData->mbReverse = rAttribs.getBool( XML_reverse, false ); } @@ -350,7 +348,7 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA ScIconSetMap* pIconSetMap = ScIconSetFormat::getIconSetMap(); for(size_t i = 0; pIconSetMap[i].pName; ++i) { - if(rtl::OUString::createFromAscii(pIconSetMap[i].pName) == maIconSetType) + if(OUString::createFromAscii(pIconSetMap[i].pName) == maIconSetType) { eIconSetType = pIconSetMap[i].eType; break; diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index 4337e9aca35d..f4d192c690f3 100644 --- a/sc/source/filter/oox/condformatcontext.cxx +++ b/sc/source/filter/oox/condformatcontext.cxx @@ -26,7 +26,6 @@ namespace xls { // ============================================================================ using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 76f2fc6a438a..f605a5991198 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -29,8 +29,6 @@ namespace xls { using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 2a9a61fc650b..676bc408ee67 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -30,7 +30,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 488b7e36aba3..0cb38f963ad6 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 8b3bb9b7a3e4..b112a4fd8f36 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::table; using namespace ::oox::drawingml; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 22f4a6bbd2ea..65bff71d0e9e 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -59,9 +59,6 @@ using ::com::sun::star::awt::Size; using ::com::sun::star::awt::Point; using ::com::sun::star::awt::Rectangle; using ::com::sun::star::awt::XControlModel; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringToOString; // no using's for ::oox::vml, that may clash with ::oox::drawingml types // ============================================================================ @@ -103,7 +100,7 @@ Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, con void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& rxShapes ) { - rtl::OUString sURL; + OUString sURL; getShapeProperties()[ PROP_URL ] >>= sURL; getWorksheets().convertSheetNameRef( sURL ); if( !maMacroName.isEmpty() && mxShape.is() ) diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index fab5365eca24..f56665809a99 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::oox::drawingml; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index b539abb74cb0..59870a44cdce 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using ::oox::drawingml::chart::DataSequenceModel; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index dfddf86f1567..b54d09cedd92 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::oox::core; -using ::rtl::OUString; using ::oox::drawingml::table::TableStyleListPtr; // ============================================================================ diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index efb69f77eee4..66219b5c96ce 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -29,7 +29,6 @@ namespace xls { using ::oox::core::FilterBase; using ::oox::core::FragmentHandler2; -using ::rtl::OUString; // ============================================================================ // ============================================================================ diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 0d78db71f30b..65d4532cc6d5 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index f2bb7dc3a869..bdfb6afdb296 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -51,10 +51,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::Relation; using ::oox::core::Relations; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index cf72857e5a1c..348b50751407 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ // ============================================================================ diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index 5e20e2f6c9ae..4cd95aae3be7 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -75,7 +75,7 @@ void ExtCfRuleContext::importDataBar( const AttributeList& rAttribs ) ScDataBarFormatData* pDataBar = static_cast<ScDataBarFormatData*>(mpTarget); pDataBar->mbGradient = rAttribs.getBool( XML_gradient, true ); - rtl::OUString aAxisPosition = rAttribs.getString( XML_axisPosition, "automatic" ); + OUString aAxisPosition = rAttribs.getString( XML_axisPosition, "automatic" ); if( aAxisPosition == "none" ) pDataBar->meAxisPosition = databar::NONE; else if( aAxisPosition == "middle" ) @@ -125,7 +125,7 @@ void ExtCfRuleContext::importCfvo( const AttributeList& rAttribs ) else pEntry = pDataBar->mpUpperLimit.get(); - rtl::OUString aColorScaleType = rAttribs.getString( XML_type, rtl::OUString() ); + OUString aColorScaleType = rAttribs.getString( XML_type, OUString() ); if(aColorScaleType == "min") pEntry->SetType(COLORSCALE_MIN); else if (aColorScaleType == "max") @@ -178,11 +178,11 @@ void ExtLstLocalContext::onStartElement( const AttributeList& ) } } -void ExtLstLocalContext::onCharacters( const rtl::OUString& rChars ) +void ExtLstLocalContext::onCharacters( const OUString& rChars ) { if (getCurrentElement() == XLS_EXT_TOKEN( id )) { - getExtLst().insert( std::pair< rtl::OUString, void*>(rChars, mpTarget) ); + getExtLst().insert( std::pair< OUString, void*>(rChars, mpTarget) ); } } @@ -199,7 +199,7 @@ ContextHandlerRef ExtGlobalContext::onCreateContext( sal_Int32 nElement, const A { if(nElement == XLS_EXT_TOKEN( cfRule )) { - rtl::OUString aId = rAttribs.getString( XML_id, rtl::OUString() ); + OUString aId = rAttribs.getString( XML_id, OUString() ); // an ext entrie does not need to have an existing corresponding entry ExtLst::const_iterator aExt = getExtLst().find( aId ); diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 1a12a2e659cc..947b785230b6 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -49,12 +49,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; // reference helpers ========================================================== diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index d2f49e6e1802..0fa6dcbd9aa2 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -168,14 +168,14 @@ void FormulaBuffer::applyArrayFormulas( const std::vector< TokenRangeAddressItem } } -void FormulaBuffer::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ) +void FormulaBuffer::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { std::vector<SharedFormulaEntry>& rSharedFormulas = sharedFormulas[ rAddress.Sheet ]; SharedFormulaEntry aEntry( rAddress, rTokens, nSharedId ); rSharedFormulas.push_back( aEntry ); } -void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& rTokenStr ) +void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& rTokenStr ) { cellFormulas[ rAddress.Sheet ].push_back( TokenAddressItem( rTokenStr, rAddress ) ); } @@ -185,7 +185,7 @@ void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& sharedFormulaIds[ rAddress.Sheet ].push_back( SharedFormulaDesc( rAddress, nSharedId ) ); } -void FormulaBuffer::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void FormulaBuffer::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { TokenAddressItem tokenPair( rTokenStr, rTokenAddress ); @@ -197,13 +197,13 @@ void FormulaBuffer::setCellFormulaValue( const ::com::sun::star::table::CellAddr cellFormulaValues[ rAddress.Sheet ].push_back( ValueAddressPair( rAddress, fValue ) ); } -void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokenStr ) +void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokenStr ) { ApiTokenSequence aTokens = getFormulaParser().importFormula( rAddress, rTokenStr ); - rtl::OUString aName = rtl::OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ). + OUString aName = OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ). append( static_cast< sal_Int32 >( rAddress.Sheet + 1 ) ). append( sal_Unicode( '_' ) ).append( nSharedId ). - append( rtl::OUString("_0") ).makeStringAndClear(); + append( OUString("_0") ).makeStringAndClear(); ScRangeData* pScRangeData = createNamedRangeObject( aName, aTokens, 0 ); pScRangeData->SetType(RT_SHARED); diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index aa1d9c79051a..cf79c711e8ef 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::sheet::ReferenceFlags; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ @@ -548,7 +547,7 @@ private: // finalize token sequence ------------------------------------------------ virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; - virtual ::rtl::OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; protected: const sal_Int32 mnMaxApiCol; /// Maximum column index in own document. diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 8612e0d96c80..4baa33ee8ff3 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -50,11 +50,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 33573ba100b4..5cf31722b3bd 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -57,10 +57,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::Relations; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index e74b2faedb2a..08160c5540d0 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::Relations; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 12d6ddfa7b6e..4ae3e1adeb3d 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -32,7 +32,6 @@ namespace xls { using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index babbbccc6048..6303a057f7bd 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace com::sun::star; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index 57c93ac81116..efe077394338 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 7536863879d3..d80d06d2a3fa 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index 73b542e2d412..8ab45e52d0fb 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 1a746d6d2831..98c47f12aa2d 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -35,9 +35,6 @@ namespace xls { using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -476,7 +473,7 @@ void RichString::createTextPortions( const OUString& rText, FontPortionModelList } } -void RichString::createPhoneticPortions( const ::rtl::OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ) +void RichString::createPhoneticPortions( const OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ) { maPhonPortions.clear(); if( !rText.isEmpty()) diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index 8f3a63b70649..7d83ead8c62b 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -27,7 +27,6 @@ namespace xls { // ============================================================================ using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 01fd51026ac6..ba0766c66da6 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 89436e417665..09f7b50610f6 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 9877fde12887..11a057d8ae29 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -63,8 +63,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index bd5b1467d88e..5403bc402460 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ @@ -364,7 +363,7 @@ void SheetDataContext::importFormula( const AttributeList& rAttribs ) maTableData.mbRef2Deleted = rAttribs.getBool( XML_del2, false ); } - maFormulaStr = rtl::OUString(); + maFormulaStr = OUString(); } void SheetDataContext::importRow( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 3b81f2cfca23..fc3ee8051f6f 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -91,8 +91,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -1031,7 +1029,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maLatinFont.mnFamily ), maApiData.maLatinFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maLatinFont.mnFamily ), maApiData.maLatinFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO : ATTR_FONT, bSkipPoolDefs ); } @@ -1041,7 +1039,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool // taken from binary importer rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maAsianFont.mnFamily ), maApiData.maAsianFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maAsianFont.mnFamily ), maApiData.maAsianFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO_CJK : ATTR_CJK_FONT, bSkipPoolDefs ); } @@ -1051,7 +1049,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool // taken from binary importer rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maCmplxFont.mnFamily ), maApiData.maCmplxFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maCmplxFont.mnFamily ), maApiData.maCmplxFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO_CTL : ATTR_CTL_FONT, bSkipPoolDefs ); } diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index f49c3fa8e319..ee21b2a07877 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 0748e3ca3bee..672e11cb358b 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index edef7662cb8a..334f29c13ff8 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -30,7 +30,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index a40ce3b36e7e..632103b05135 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 40c50db9362d..ba92331a65a4 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 41a6ce71098c..5fad0fd6af25 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -64,7 +64,6 @@ using namespace ::com::sun::star::sheet; using namespace ::oox::core; using ::oox::drawingml::ThemeFragmentHandler; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index ca89dccb2dcf..703e7398919b 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -95,13 +95,12 @@ using ::oox::core::FilterBase; using ::oox::core::FragmentHandler; using ::oox::core::XmlFilterBase; using ::oox::drawingml::Theme; -using ::rtl::OUString; // ============================================================================ bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rName2 ) const { - // there is no wrapper in rtl::OUString, TODO: compare with collator + // there is no wrapper in OUString, TODO: compare with collator return ::rtl_ustr_compareIgnoreAsciiCase_WithLength( rName1.getStr(), rName1.getLength(), rName2.getStr(), rName2.getLength() ) < 0; } @@ -159,7 +158,7 @@ public: } } if ( !mpDoc ) - throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Workbookhelper::getScDocument(): Failed to access ScDocument from model" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("Workbookhelper::getScDocument(): Failed to access ScDocument from model" ) ), Reference< XInterface >() ); return *mpDoc; } @@ -393,12 +392,12 @@ ScRangeData* lcl_addNewByNameAndTokens( ScDocument& rDoc, ScRangeName* pNames, c return pNew; } -rtl::OUString findUnusedName( const ScRangeName* pRangeName, const rtl::OUString& rSuggestedName ) +OUString findUnusedName( const ScRangeName* pRangeName, const OUString& rSuggestedName ) { - rtl::OUString aNewName = rSuggestedName; + OUString aNewName = rSuggestedName; sal_Int32 nIndex = 0; while(pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(aNewName))) - aNewName = rtl::OUStringBuffer(rSuggestedName).append( '_' ).append( nIndex++ ).makeStringAndClear(); + aNewName = OUStringBuffer(rSuggestedName).append( '_' ).append( nIndex++ ).makeStringAndClear(); return aNewName; } diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index f9a61c00d19b..a46a3fa40414 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::util; using ::comphelper::MediaDescriptor; using ::oox::core::CodecHelper; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 7483900c088e..1a0bcb1df172 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -43,8 +43,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -110,7 +108,7 @@ OUString WorksheetBuffer::getCalcSheetName( sal_Int32 nWorksheet ) const return pSheetInfo ? pSheetInfo->maCalcName : OUString(); } -void WorksheetBuffer::convertSheetNameRef( ::rtl::OUString& sSheetNameRef ) const +void WorksheetBuffer::convertSheetNameRef( OUString& sSheetNameRef ) const { // convert '#SheetName!A1' to '#SheetName.A1' if( !sSheetNameRef.isEmpty() && (sSheetNameRef[ 0 ] == '#') ) diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 874693375219..b8ad65832889 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index dfb1653ab684..f22c27a32fec 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -87,8 +87,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -1598,7 +1596,7 @@ void WorksheetHelper::finalizeDrawingImport() mrSheetGlob.finalizeDrawingImport(); } -void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { getFormulaBuffer().setCellFormula( rTokenAddress, rTokenStr ); } @@ -1608,12 +1606,12 @@ void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress getFormulaBuffer().setCellFormula( rTokenAddress, nSharedId ); } -void WorksheetHelper::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void WorksheetHelper::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { getFormulaBuffer().setCellArrayFormula( rRangeAddress, rTokenAddress, rTokenStr ); } -void WorksheetHelper::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ) +void WorksheetHelper::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { getFormulaBuffer().createSharedFormulaMapEntry( rAddress, nSharedId, rTokens ); } diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 933d986bca61..1980283e4820 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index ed33cc185971..e74a5e421891 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -28,7 +28,7 @@ OString ScOrcusFiltersImpl::toSystemPath(const OUString& rPath) { INetURLObject aURL(rPath); - return rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), RTL_TEXTENCODING_UTF8); + return OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), RTL_TEXTENCODING_UTF8); } bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const OUString& rPath) const @@ -71,7 +71,7 @@ bool ScOrcusFiltersImpl::importGnumeric(ScDocument& rDoc, const OUString& rPath) return true; } -ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const +ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const OUString& rPath) const { return new ScOrcusXMLContextImpl(rDoc, rPath); } diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index ecbf35bf9691..edfd0b6ee42f 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -237,7 +237,7 @@ bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) mrDoc.GetName(rLink.maPos.Tab(), aTabName); filter.set_cell_link( rLink.maPath.getStr(), - rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), rLink.maPos.Row(), rLink.maPos.Col()); } } @@ -252,7 +252,7 @@ bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) OUString aTabName; mrDoc.GetName(rLink.maPos.Tab(), aTabName); filter.start_range( - rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), rLink.maPos.Row(), rLink.maPos.Col()); std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter)); diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 082cc083d379..89c6c0328ae3 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -92,9 +92,9 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr bAddIn = sal_True; if( pExtString ) { - rtl::OStringBuffer s(RTL_CONSTASCII_STRINGPARAM("QPRO_")); + OStringBuffer s(RTL_CONSTASCII_STRINGPARAM("QPRO_")); s.append(pExtString); - nPush = aPool.Store(eOc, rtl::OStringToOUString(s.makeStringAndClear(), maIn.GetStreamCharSet())); + nPush = aPool.Store(eOc, OStringToOUString(s.makeStringAndClear(), maIn.GetStreamCharSet())); aPool << nPush; } else diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 23a4c3c9501a..cad6188aa7ad 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -202,7 +202,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu } // HTML - rtl::OUString aValStr, aNumStr; + OUString aValStr, aNumStr; double fVal; sal_uInt32 nNumForm = 0; LanguageType eNumLang = LANGUAGE_NONE; diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index 0e19de093056..7dd2475503cf 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -110,7 +110,7 @@ void ScRTFExport::WriteTab( SCTAB nTab ) void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) { rStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30"; - rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << rtl::OString::valueOf(static_cast<sal_Int32>(pDoc->GetRowHeight(nRow, nTab))).getStr(); + rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(static_cast<sal_Int32>(pDoc->GetRowHeight(nRow, nTab))).getStr(); SCCOL nCol; SCCOL nEndCol = aRange.aEnd.Col(); for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ ) @@ -141,7 +141,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) if ( pChar ) rStrm << pChar; - rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(static_cast<sal_Int32>(pCellX[nCol+1])).getStr(); + rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(static_cast<sal_Int32>(pCellX[nCol+1])).getStr(); if ( (nCol & 0x0F) == 0x0F ) rStrm << sNewLine; // Zeilen nicht zu lang werden lassen } diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 8f2c0b62d226..87bac8df1336 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -51,7 +51,7 @@ void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rect if ( !SvtModuleOptions().IsChart() ) return; - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = pDoc->GetDocumentShell()-> GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aName ); if ( xObj.is() ) diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index f23dfe21fea5..9b0767aadfbb 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -33,9 +33,6 @@ #include <oox/token/tokens.hxx> #include <rtl/strbuf.hxx> -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; using namespace oox; static OString lcl_GuidToOString( sal_uInt8 aGuid[ 16 ] ) @@ -141,9 +138,9 @@ XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack ) { sal_uInt8 aGUID[ 16 ]; sal_Bool bValidGUID = false; - const std::set<rtl::OUString>& rStrColl = rChangeTrack.GetUserCollection(); + const std::set<OUString>& rStrColl = rChangeTrack.GetUserCollection(); aViews.reserve(rStrColl.size()); - std::set<rtl::OUString>::const_iterator it = rStrColl.begin(), itEnd = rStrColl.end(); + std::set<OUString>::const_iterator it = rStrColl.begin(), itEnd = rStrColl.end(); for (; it != itEnd; ++it) { lcl_GenerateGUID( aGUID, bValidGUID ); @@ -1537,7 +1534,7 @@ ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack() // adjust table count SCTAB nOrigCount = GetDoc().GetTableCount(); - rtl::OUString sTabName; + OUString sTabName; for( sal_Int32 nIndex = 0; nIndex < nOrigCount; nIndex++ ) { pTempDoc->CreateValidTabName( sTabName ); diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 9ce4e2ab19c3..976c1f83d451 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -158,7 +158,7 @@ sal_Bool XclImpChangeTrack::Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, // external ref - read doc and tab name and find sc tab num // - URL String aEncUrl( pStrm->ReadUniString() ); - ::rtl::OUString aUrl; + OUString aUrl; bool bSelf; XclImpUrlHelper::DecodeUrl( aUrl, bSelf, GetRoot(), aEncUrl ); pStrm->Ignore( 1 ); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 6ba28abbb1e1..6d7a15b41a45 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -51,7 +51,6 @@ #include "xechart.hxx" #include "xcl97esc.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -523,8 +522,8 @@ ShapeInteractionHelper::PopulateShapeInteractionInfo( XclExpObjectManager& rObjM try { SvMemoryStream* pMemStrm = NULL; - rtl::OUString sHyperLink; - rtl::OUString sMacro; + OUString sHyperLink; + OUString sMacro; if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( ::GetSdrObjectFromXShape( xShape ) ) ) { sHyperLink = pInfo->GetHlink(); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 60b169086391..dcd62b5b5ab5 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -76,8 +76,6 @@ #include <oox/export/utils.hxx> #include <oox/export/vmlexport.hxx> -using ::rtl::OString; -using ::rtl::OUString; using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::oox::drawingml::DrawingML; @@ -1122,7 +1120,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->singleElement( XML_sheet, XML_name, XclXmlUtils::ToOString( sUnicodeName ).getStr(), - XML_sheetId, rtl::OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(), + XML_sheetId, OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(), XML_state, nGrbit == 0x0000 ? "visible" : "hidden", FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), FSEND ); @@ -1207,7 +1205,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) { String sTmpName; String sTmpComm; - rtl::OUString aTmp; + OUString aTmp; Color aDummyCol; sal_uInt16 nFlags; diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 0a5c34eb57d0..c1922811ffde 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -36,7 +36,7 @@ using namespace xmloff::token; ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -56,11 +56,11 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -104,7 +104,7 @@ ScXMLCalculationSettingsContext::~ScXMLCalculationSettingsContext() } SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -131,15 +131,15 @@ void ScXMLCalculationSettingsContext::EndElement() uno::Reference <beans::XPropertySet> xPropertySet (GetScImport().GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN)), uno::makeAny(bCalcAsShown) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE)), uno::makeAny(bIgnoreCase) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS)), uno::makeAny(bLookUpLabels) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE)), uno::makeAny(bMatchWholeCell) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED)), uno::makeAny(bUseRegularExpressions) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED)), uno::makeAny(bIsIterationEnabled) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT)), uno::makeAny(nIterationCount) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)), uno::makeAny(fIterationEpsilon) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN)), uno::makeAny(bCalcAsShown) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE)), uno::makeAny(bIgnoreCase) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS)), uno::makeAny(bLookUpLabels) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE)), uno::makeAny(bMatchWholeCell) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED)), uno::makeAny(bUseRegularExpressions) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED)), uno::makeAny(bIsIterationEnabled) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT)), uno::makeAny(nIterationCount) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)), uno::makeAny(fIterationEpsilon) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) ); if (GetScImport().GetDocument()) { ScXMLImport::MutexGuard aGuard(GetScImport()); @@ -153,7 +153,7 @@ void ScXMLCalculationSettingsContext::EndElement() ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : @@ -162,11 +162,11 @@ ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DATE_VALUE)) { @@ -186,7 +186,7 @@ ScXMLNullDateContext::~ScXMLNullDateContext() } SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -201,7 +201,7 @@ void ScXMLNullDateContext::EndElement() ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : @@ -210,11 +210,11 @@ ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -244,7 +244,7 @@ ScXMLIterationContext::~ScXMLIterationContext() } SvXMLImportContext *ScXMLIterationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 5916e538c57c..337948a1714e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -42,14 +42,14 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLCalculationSettingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -66,14 +66,14 @@ class ScXMLNullDateContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLNullDateContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -86,14 +86,14 @@ class ScXMLIterationContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLIterationContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index cfbc37d713a5..b13efc2d5309 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -28,7 +28,6 @@ #include <xmloff/nmspmap.hxx> #include "xmlimprt.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; @@ -59,7 +58,7 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( nIndex )); + const OUString& sAttrName(xAttrList->getNameByIndex( nIndex )); const OUString& sValue(xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 61c704ebdc46..568a8dc32d2e 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -29,10 +29,10 @@ class ScXMLImport; struct ScMyImpCellRangeSource { - ::rtl::OUString sSourceStr; - ::rtl::OUString sFilterName; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; + OUString sSourceStr; + OUString sFilterName; + OUString sFilterOptions; + OUString sURL; sal_Int32 nColumns; sal_Int32 nRows; sal_Int32 nRefresh; @@ -53,7 +53,7 @@ public: ScXMLCellRangeSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpCellRangeSource* pCellRangeSource ); @@ -61,7 +61,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 08e60c4f1aa7..d4bcd4e0f2ff 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -59,9 +59,9 @@ ScChangeTrackingExportHelper::~ScChangeTrackingExportHelper() delete pDependings; } -rtl::OUString ScChangeTrackingExportHelper::GetChangeID(const sal_uInt32 nActionNumber) +OUString ScChangeTrackingExportHelper::GetChangeID(const sal_uInt32 nActionNumber) { - rtl::OUStringBuffer sBuffer(sChangeIDPrefix); + OUStringBuffer sBuffer(sChangeIDPrefix); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nActionNumber)); return sBuffer.makeStringAndClear(); @@ -87,7 +87,7 @@ void ScChangeTrackingExportHelper::WriteBigRange(const ScBigRange& rBigRange, XM nEndColumn, nEndRow, nEndSheet); if ((nStartColumn == nEndColumn) && (nStartRow == nEndRow) && (nStartSheet == nEndSheet)) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nStartColumn); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COLUMN, sBuffer.makeStringAndClear()); ::sax::Converter::convertNumber(sBuffer, nStartRow); @@ -97,7 +97,7 @@ void ScChangeTrackingExportHelper::WriteBigRange(const ScBigRange& rBigRange, XM } else { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nStartColumn); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START_COLUMN, sBuffer.makeStringAndClear()); ::sax::Converter::convertNumber(sBuffer, nStartRow); @@ -122,12 +122,12 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC, XML_CREATOR, true, false ); - rtl::OUString sAuthor(pAction->GetUser()); + OUString sAuthor(pAction->GetUser()); rExport.Characters(sAuthor); } { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(), sDate); SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC, XML_DATE, true, @@ -135,7 +135,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction rExport.Characters(sDate.makeStringAndClear()); } - rtl::OUString sComment(pAction->GetComment()); + OUString sComment(pAction->GetComment()); if (!sComment.isEmpty()) { SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); @@ -152,7 +152,7 @@ void ScChangeTrackingExportHelper::WriteGenerated(const ScChangeAction* pGenerat #endif SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true); WriteBigRange(pGeneratedAction->GetBigRange(), XML_CELL_ADDRESS); - rtl::OUString sValue; + OUString sValue; static_cast<const ScChangeActionContent*>(pGeneratedAction)->GetNewString(sValue); WriteCell(static_cast<const ScChangeActionContent*>(pGeneratedAction)->GetNewCell(), sValue); } @@ -171,7 +171,7 @@ void ScChangeTrackingExportHelper::WriteDeleted(const ScChangeAction* pDeletedAc SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true); if (static_cast<const ScChangeActionContent*>(pDeletedAction)->IsTopContent() && pDeletedAction->IsDeletedIn()) { - rtl::OUString sValue; + OUString sValue; pContentAction->GetNewString(sValue); WriteCell(pContentAction->GetNewCell(), sValue); } @@ -248,7 +248,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons if ( rExport.GetMM100UnitConverter().setNullDate(rExport.GetModel()) ) { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_DATE); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; rExport.GetMM100UnitConverter().convertDateTime(sBuffer, fTempValue); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DATE_VALUE, sBuffer.makeStringAndClear()); bSetAttributes = true; @@ -258,7 +258,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons case NUMBERFORMAT_TIME: { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TIME); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration(sBuffer, fTempValue); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_TIME_VALUE, sBuffer.makeStringAndClear()); bSetAttributes = true; @@ -270,9 +270,9 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons if (!bSetAttributes) { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDouble(sBuffer, fValue); - rtl::OUString sNumValue(sBuffer.makeStringAndClear()); + OUString sNumValue(sBuffer.makeStringAndClear()); if (!sNumValue.isEmpty()) rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sNumValue); } @@ -423,7 +423,7 @@ void ScChangeTrackingExportHelper::WriteContentChange(ScChangeAction* pAction) if (pPrevAction) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pPrevAction->GetActionNumber())); SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_PREVIOUS, true, true); - rtl::OUString sValue; + OUString sValue; static_cast<ScChangeActionContent*>(pAction)->GetOldString(sValue); WriteCell(static_cast<ScChangeActionContent*>(pAction)->GetOldCell(), sValue); } @@ -475,7 +475,7 @@ void ScChangeTrackingExportHelper::AddInsertionAttributes(const ScChangeAction* } nPosition = nStartPosition; nCount = nEndPosition - nStartPosition + 1; - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nPosition); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_POSITION, sBuffer.makeStringAndClear()); OSL_ENSURE(nCount > 0, "wrong insertion count"); @@ -537,7 +537,7 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel } break; } - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nPosition); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_POSITION, sBuffer.makeStringAndClear()); if (pDelAction->GetType() != SC_CAT_DELETE_TABS) @@ -580,7 +580,7 @@ void ScChangeTrackingExportHelper::WriteCutOffs(const ScChangeActionDel* pAction if (pCutOffIns || pLinkMove) { SvXMLElementExport aCutOffsElem (rExport, XML_NAMESPACE_TABLE, XML_CUT_OFFS, true, true); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; if (pCutOffIns) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pCutOffIns->GetActionNumber())); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx index 55f3169c57ab..e65e18c9365e 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx @@ -46,10 +46,10 @@ class ScChangeTrackingExportHelper ScChangeTrack* pChangeTrack; ScEditEngineTextObj* pEditTextObj; ScChangeActionMap* pDependings; - rtl::OUString sChangeIDPrefix; + OUString sChangeIDPrefix; com::sun::star::uno::Reference<com::sun::star::text::XText> xText; - rtl::OUString GetChangeID(const sal_uInt32 nActionNumber); + OUString GetChangeID(const sal_uInt32 nActionNumber); void GetAcceptanceState(const ScChangeAction* pAction); void WriteBigRange(const ScBigRange& rBigRange, xmloff::token::XMLTokenEnum aName); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index c38b9cf3282c..6caf7b05c81d 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -233,7 +233,7 @@ void ScXMLChangeTrackingImportHelper::StartChangeAction(const ScChangeActionType } } -sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const rtl::OUString& sID) +sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const OUString& sID) { sal_uInt32 nResult(0); sal_uInt32 nLength(sID.getLength()); @@ -241,7 +241,7 @@ sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const rtl::OUString& { if (sID.compareTo(sIDPrefix, nPrefixLength) == 0) { - rtl::OUString sValue(sID.copy(nPrefixLength, nLength - nPrefixLength)); + OUString sValue(sID.copy(nPrefixLength, nLength - nPrefixLength)); sal_Int32 nValue; ::sax::Converter::convertNumber(nValue, sValue); OSL_ENSURE(nValue > 0, "wrong change action ID"); @@ -436,8 +436,8 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S if ( aInfo.aDateTime.HundredthSeconds ) pTrack->SetTime100thSeconds( true ); - const std::set<rtl::OUString>& rUsers = pTrack->GetUserCollection(); - std::set<rtl::OUString>::const_iterator it = rUsers.find(aInfo.sUser); + const std::set<OUString>& rUsers = pTrack->GetUserCollection(); + std::set<OUString>::const_iterator it = rUsers.find(aInfo.sUser); if (it != rUsers.end()) { // It's probably pointless to do this. @@ -745,7 +745,7 @@ void ScXMLChangeTrackingImportHelper::SetNewCell(ScMyContentAction* pAction) else { sal_uInt8 nMatrixFlag = aCell.mpFormula->GetMatrixFlag(); - rtl::OUString sFormula; + OUString sFormula; // With GRAM_ODFF reference detection is faster on compilation. /* FIXME: new cell should be created with a clone * of the token array instead. Any reason why this @@ -755,7 +755,7 @@ void ScXMLChangeTrackingImportHelper::SetNewCell(ScMyContentAction* pAction) // #i87826# [Collaboration] Rejected move destroys formulas // FIXME: adjust ScFormulaCell::GetFormula(), so that the right formula string // is returned and no further string handling is necessary - rtl::OUString sFormula2; + OUString sFormula2; if ( nMatrixFlag != MM_NONE ) { sFormula2 = sFormula.copy( 2, sFormula.getLength() - 3 ); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index fe7b167ed439..ea565c5a96f0 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -29,16 +29,16 @@ class DateTime; struct ScMyActionInfo { - rtl::OUString sUser; - rtl::OUString sComment; + OUString sUser; + OUString sComment; com::sun::star::util::DateTime aDateTime; }; struct ScMyCellInfo { ScCellValue maCell; - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; + OUString sFormulaAddress; + OUString sFormula; String sInputString; double fValue; sal_Int32 nMatrixCols; @@ -172,13 +172,13 @@ typedef std::list<ScMyBaseAction*> ScMyActions; class ScXMLChangeTrackingImportHelper { - std::set<rtl::OUString> aUsers; + std::set<OUString> aUsers; ScMyActions aActions; com::sun::star::uno::Sequence<sal_Int8> aProtect; ScDocument* pDoc; ScChangeTrack* pTrack; ScMyBaseAction* pCurrentAction; - rtl::OUString sIDPrefix; + OUString sIDPrefix; sal_uInt32 nPrefixLength; sal_Int16 nMultiSpanned; sal_Int16 nMultiSpannedSlaveCount; @@ -202,7 +202,7 @@ public: void SetProtection(const com::sun::star::uno::Sequence<sal_Int8>& rProtect) { aProtect = rProtect; } void StartChangeAction(const ScChangeActionType nActionType); - sal_uInt32 GetIDFromString(const rtl::OUString& sID); + sal_uInt32 GetIDFromString(const OUString& sID); void SetActionNumber(const sal_uInt32 nActionNumber) { pCurrentAction->nActionNumber = nActionNumber; } void SetActionState(const ScChangeActionState nActionState) { pCurrentAction->nActionState = nActionState; } diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 790e2f6251e0..6493219cd46e 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -22,7 +22,6 @@ using namespace com::sun::star; -using ::rtl::OUString; sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeName ) { @@ -67,7 +66,7 @@ XMLCodeNameProvider::~XMLCodeNameProvider() return !mpDoc->GetCodeName().isEmpty(); SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { if( mpDoc->GetName( i, sSheetName ) && sSheetName.equals(aName) ) @@ -96,7 +95,7 @@ uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) } SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { if( mpDoc->GetName( i, sSheetName ) && sSheetName.equals(aName) ) @@ -121,7 +120,7 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) if( !mpDoc->GetCodeName().isEmpty() ) aNames[nRealCount++] = msDocName; - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { mpDoc->GetCodeName( i, sCodeName ); @@ -151,7 +150,7 @@ uno::Type SAL_CALL XMLCodeNameProvider::getElementType( ) return sal_True; SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { mpDoc->GetCodeName( i, sCodeName ); @@ -175,7 +174,7 @@ void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xN } SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString sSheetName; + OUString sSheetName; for( SCTAB i = 0; i < nCount; i++ ) { if( pDoc->GetName( i, sSheetName ) && diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 5d925f2b7fdc..9f8eb2d508af 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -29,8 +29,8 @@ class String; class XMLCodeNameProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameAccess > { ScDocument* mpDoc; - ::rtl::OUString msDocName; - ::rtl::OUString msCodeNameProp; + OUString msDocName; + OUString msCodeNameProp; static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny, String& rCodeName ); @@ -39,15 +39,15 @@ public: XMLCodeNameProvider( ScDocument* pDoc ); virtual ~XMLCodeNameProvider(); - 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 ); - 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 ::com::sun::star::uno::Type SAL_CALL getElementType( ) diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx index 28f130147ca6..23c597020f8b 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx @@ -41,7 +41,7 @@ class ScXMLExport; class ScMyOpenCloseColumnRowGroup { ScXMLExport& rExport; - const rtl::OUString rName; + const OUString rName; ScMyColumnRowGroupVec aTableStart; ScMyFieldGroupVec aTableEnd; diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 55d3cf852c5d..3cf06b1f063c 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -29,7 +29,6 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace xmloff::token; @@ -54,8 +53,8 @@ ScXMLConsolidationContext::ScXMLConsolidationContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 7b986880cd7c..be1e376dae8e 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -32,8 +32,8 @@ class ScXMLImport; class ScXMLConsolidationContext : public SvXMLImportContext { private: - ::rtl::OUString sSourceList; - ::rtl::OUString sUseLabel; + OUString sSourceList; + OUString sUseLabel; ScAddress aTargetAddr; ScSubTotalFunc eFunction; bool bLinkToSource; @@ -47,14 +47,14 @@ public: ScXMLConsolidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ScXMLConsolidationContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 751ab1ba7375..a705c0a55d0f 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -30,8 +30,6 @@ #include "document.hxx" #include "ftools.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace xmloff::token; @@ -336,7 +334,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) //_____________________________________________________________________ -void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate) +void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate) { util::DateTime aAPIDateTime; ConvertCoreToAPIDateTime(aDateTime, aAPIDateTime); diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index db7a53487653..d8c9ff5b6c79 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -50,55 +50,55 @@ public: // IMPORT: GeneralFunction / ScSubTotalFunc static ::com::sun::star::sheet::GeneralFunction GetFunctionFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); static ScSubTotalFunc GetSubTotalFuncFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: GeneralFunction / ScSubTotalFunc static void GetStringFromFunction( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::sheet::GeneralFunction eFunction, bool bAppendStr = false ); static void GetStringFromFunction( - ::rtl::OUString& rString, + OUString& rString, const ScSubTotalFunc eFunction, bool bAppendStr = false ); // IMPORT: DataPilotFieldOrientation static ::com::sun::star::sheet::DataPilotFieldOrientation GetOrientationFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: DataPilotFieldOrientation static void GetStringFromOrientation( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation, bool bAppendStr = false ); // IMPORT: Detective static ScDetectiveObjType GetDetObjTypeFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); static bool GetDetOpTypeFromString( ScDetOpType& rDetOpType, - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: Detective static void GetStringFromDetObjType( - ::rtl::OUString& rString, + OUString& rString, const ScDetectiveObjType eObjType, bool bAppendStr = false ); static void GetStringFromDetOpType( - ::rtl::OUString& rString, + OUString& rString, const ScDetOpType eOpType, bool bAppendStr = false ); // IMPORT: Formulas static void ParseFormula( - ::rtl::OUString& sFormula, + OUString& sFormula, const bool bIsFormula = sal_True); // EXPORT: Core Date Time - static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); + static void ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate); static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime); @@ -136,8 +136,8 @@ struct ScXMLConditionParseResult meValidation; /// A data validation type if existing. ::com::sun::star::sheet::ConditionOperator meOperator; /// A comparison operator if existing. - ::rtl::OUString maOperand1; /// First operand of the token or comparison value. - ::rtl::OUString maOperand2; /// Second operand of 'between' conditions. + OUString maOperand1; /// First operand of the token or comparison value. + OUString maOperand2; /// Second operand of 'between' conditions. sal_Int32 mnEndIndex; /// Index of first character following the condition. }; @@ -151,10 +151,10 @@ public: */ static void parseCondition( ScXMLConditionParseResult& rParseResult, - const ::rtl::OUString& rAttribute, + const OUString& rAttribute, sal_Int32 nStartIndex ); - static rtl::OUString getExpression(const sal_Unicode*& rpcString, const sal_Unicode* pcEnd, sal_Unicode cEndChar ); + static OUString getExpression(const sal_Unicode*& rpcString, const sal_Unicode* pcEnd, sal_Unicode cEndChar ); private: ScXMLConditionHelper(); diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 0ff562a58aa3..184de3b502c1 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -28,15 +28,13 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -51,7 +49,7 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext() } SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -72,7 +70,7 @@ void ScXMLDDELinksContext::EndElement() ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -94,7 +92,7 @@ ScXMLDDELinkContext::~ScXMLDDELinkContext() } SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -195,7 +193,7 @@ void ScXMLDDELinkContext::EndElement() ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -208,8 +206,8 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -239,7 +237,7 @@ ScXMLDDESourceContext::~ScXMLDDESourceContext() } SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -255,7 +253,7 @@ void ScXMLDDESourceContext::EndElement() ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDDELinkContext* pTempDDELink) : @@ -270,7 +268,7 @@ ScXMLDDETableContext::~ScXMLDDETableContext() } SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -296,7 +294,7 @@ void ScXMLDDETableContext::EndElement() ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -310,8 +308,8 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -329,7 +327,7 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext() } SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -344,7 +342,7 @@ void ScXMLDDEColumnContext::EndElement() ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -358,8 +356,8 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -377,7 +375,7 @@ ScXMLDDERowContext::~ScXMLDDERowContext() } SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -400,7 +398,7 @@ void ScXMLDDERowContext::EndElement() ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -419,8 +417,8 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -461,7 +459,7 @@ ScXMLDDECellContext::~ScXMLDDECellContext() } SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index c12f349978ee..87d25aab9a9f 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -32,14 +32,14 @@ class ScXMLDDELinksContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinksContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -48,7 +48,7 @@ public: struct ScDDELinkCell { - rtl::OUString sValue; + OUString sValue; double fValue; bool bString; bool bEmpty; @@ -60,9 +60,9 @@ class ScXMLDDELinkContext : public SvXMLImportContext { ScDDELinkCells aDDELinkTable; ScDDELinkCells aDDELinkRow; - rtl::OUString sApplication; - rtl::OUString sTopic; - rtl::OUString sItem; + OUString sApplication; + OUString sTopic; + OUString sItem; sal_Int32 nPosition; sal_Int32 nColumns; sal_Int32 nRows; @@ -72,20 +72,20 @@ class ScXMLDDELinkContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinkContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - void SetApplication(const rtl::OUString& sValue) { sApplication = sValue; } - void SetTopic(const rtl::OUString& sValue) { sTopic = sValue; } - void SetItem(const rtl::OUString& sValue) { sItem = sValue; } + void SetApplication(const OUString& sValue) { sApplication = sValue; } + void SetTopic(const OUString& sValue) { sTopic = sValue; } + void SetItem(const OUString& sValue) { sItem = sValue; } void SetMode(const sal_uInt8 nValue) { nMode = nValue; } void CreateDDELink(); void AddColumns(const sal_Int32 nValue) { nColumns += nValue; } @@ -104,7 +104,7 @@ class ScXMLDDESourceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -112,7 +112,7 @@ public: virtual ~ScXMLDDESourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -127,7 +127,7 @@ class ScXMLDDETableContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -135,7 +135,7 @@ public: virtual ~ScXMLDDETableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -150,7 +150,7 @@ class ScXMLDDEColumnContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -158,7 +158,7 @@ public: virtual ~ScXMLDDEColumnContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -174,7 +174,7 @@ class ScXMLDDERowContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -182,7 +182,7 @@ public: virtual ~ScXMLDDERowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -191,7 +191,7 @@ public: class ScXMLDDECellContext : public SvXMLImportContext { - rtl::OUString sValue; + OUString sValue; double fValue; sal_Int32 nCells; bool bString; @@ -204,7 +204,7 @@ class ScXMLDDECellContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -212,7 +212,7 @@ public: virtual ~ScXMLDDECellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index 41f2c298bbdf..5e88e781fbb1 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -33,7 +33,6 @@ #include <algorithm> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace xmloff::token; @@ -134,8 +133,8 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -213,8 +212,8 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index cf941ac161c4..9925a1362429 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -89,14 +89,14 @@ public: ScXMLDetectiveContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); virtual ~ScXMLDetectiveContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -119,7 +119,7 @@ public: ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); @@ -127,7 +127,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -149,14 +149,14 @@ public: ScXMLDetectiveOperationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ScXMLDetectiveOperationContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index ff58de3e3962..9bbd5ee97ff4 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -24,7 +24,7 @@ ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName) : + const OUString& rLName) : SvXMLImportContext( rImport, nPrfx, rLName ) { } @@ -34,7 +34,7 @@ ScXMLEmptyContext::~ScXMLEmptyContext() } SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index e050a4f14d44..71092a2492ba 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -25,7 +25,7 @@ class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; + OUString sPrintRanges; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -33,12 +33,12 @@ class ScXMLEmptyContext : public SvXMLImportContext public: ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~ScXMLEmptyContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx index 2ac6f554d765..1b1626dc95c8 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.cxx +++ b/sc/source/filter/xml/XMLExportDDELinks.cxx @@ -32,7 +32,6 @@ class ScMatrix; using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUStringBuffer; ScXMLExportDDELinks::ScXMLExportDDELinks(ScXMLExport& rTempExport) : rExport(rTempExport) @@ -123,7 +122,7 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference<sheet::XSpreadsheetDocume uno::Reference <beans::XPropertySet> xPropertySet (xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference<container::XIndexAccess> xIndex(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DDELINKS))), uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndex(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DDELINKS))), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount = xIndex->getCount(); diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index a89a4827314d..7d7030af8c9f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -54,7 +54,6 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; ScXMLExportDataPilot::ScXMLExportDataPilot(ScXMLExport& rTempExport) : rExport(rTempExport), @@ -66,7 +65,7 @@ ScXMLExportDataPilot::~ScXMLExportDataPilot() { } -rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( +OUString ScXMLExportDataPilot::getDPOperatorXML( const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const { switch (aFilterOperator) @@ -76,27 +75,27 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( if (bUseRegularExpressions) return GetXMLToken(XML_MATCH); else - return rtl::OUString("="); + return OUString("="); } case SC_NOT_EQUAL : { if (bUseRegularExpressions) return GetXMLToken(XML_NOMATCH); else - return rtl::OUString("!="); + return OUString("!="); } case SC_BOTPERC : return GetXMLToken(XML_BOTTOM_PERCENT); case SC_BOTVAL : return GetXMLToken(XML_BOTTOM_VALUES); case SC_GREATER : - return rtl::OUString(">"); + return OUString(">"); case SC_GREATER_EQUAL : - return rtl::OUString(">="); + return OUString(">="); case SC_LESS : - return rtl::OUString("<"); + return OUString("<"); case SC_LESS_EQUAL : - return rtl::OUString("<="); + return OUString("<="); case SC_TOPPERC : return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL : @@ -104,16 +103,16 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( default: OSL_FAIL("This FilterOperator is not supported."); } - return rtl::OUString("="); + return OUString("="); } void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(sal_Int32(aQueryEntry.nField))); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(sal_Int32(aQueryEntry.nField))); if (bIsCaseSensitive) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); const ScQueryEntry::Item& rItem = aQueryEntry.GetQueryItem(); - const rtl::OUString& rQueryStr = rItem.maString; + const OUString& rQueryStr = rItem.maString; if (rItem.meType == ScQueryEntry::ByString) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, rQueryStr); @@ -177,7 +176,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) { ScRange aConditionRange(aQueryParam.nCol1, aQueryParam.nRow1, aQueryParam.nTab, aQueryParam.nCol2, aQueryParam.nRow2, aQueryParam.nTab); - rtl::OUString sConditionRange; + OUString sConditionRange; ScRangeStringConverter::GetStringFromRange( sConditionRange, aConditionRange, pDoc, ::formula::FormulaGrammar::CONV_OOO ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, sConditionRange); } @@ -211,7 +210,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) ScQueryEntry aPrevFilterField(aQueryParam.GetEntry(0)); ScQueryConnect aConnection = aQueryParam.GetEntry(1).eConnect; bool bOpenAndElement; - rtl::OUString aName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND))); + OUString aName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND))); if (aConnection == SC_AND) { rExport.StartElement( aName, true ); @@ -270,7 +269,7 @@ void ScXMLExportDataPilot::WriteFieldReference(ScDPSaveDimension* pDim) const sheet::DataPilotFieldReference* pRef = pDim->GetReferenceValue(); if (pRef) { - rtl::OUString sValueStr; + OUString sValueStr; switch (pRef->ReferenceType) { case sheet::DataPilotFieldReferenceType::NONE : @@ -314,7 +313,7 @@ void ScXMLExportDataPilot::WriteFieldReference(ScDPSaveDimension* pDim) } else { - sValueStr = rtl::OUString(); + sValueStr = OUString(); switch(pRef->ReferenceItemType) { case sheet::DataPilotFieldReferenceItemType::PREVIOUS : @@ -342,7 +341,7 @@ void ScXMLExportDataPilot::WriteSortInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING); - rtl::OUString sValueStr; + OUString sValueStr; switch (pSortInfo->Mode) { case sheet::DataPilotFieldSortMode::NONE: @@ -376,7 +375,7 @@ void ScXMLExportDataPilot::WriteAutoShowInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ENABLED, XML_FALSE); - rtl::OUString sValueStr; + OUString sValueStr; switch (pAutoInfo->ShowItemsMode) { case sheet::DataPilotFieldShowItemsMode::FROM_TOP: @@ -389,7 +388,7 @@ void ScXMLExportDataPilot::WriteAutoShowInfo(ScDPSaveDimension* pDim) if (!sValueStr.isEmpty()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_MEMBER_MODE, sValueStr); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, pAutoInfo->ItemCount); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_MEMBER_COUNT, sBuffer.makeStringAndClear()); @@ -409,7 +408,7 @@ void ScXMLExportDataPilot::WriteLayoutInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ADD_EMPTY_LINES, XML_FALSE); - rtl::OUString sValueStr; + OUString sValueStr; switch (pLayoutInfo->LayoutMode) { case sheet::DataPilotFieldLayoutMode::TABULAR_LAYOUT: @@ -444,7 +443,7 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim) rExport.CheckAttrList(); for (sal_Int32 nSubTotal = 0; nSubTotal < nSubTotalCount; nSubTotal++) { - rtl::OUString sFunction; + OUString sFunction; GeneralFunction nFunc = static_cast<GeneralFunction>(pDim->GetSubTotalFunc(nSubTotal)); ScXMLConverter::GetStringFromFunction( sFunction, nFunc); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction); @@ -464,7 +463,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) rExport.CheckAttrList(); for (ScDPSaveDimension::MemberList::const_iterator i=rMembers.begin(); i != rMembers.end() ; ++i) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, rtl::OUString((*i)->GetName())); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, OUString((*i)->GetName())); if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) { @@ -474,7 +473,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) rExport.AddAttribute(XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, *pLayoutName); } - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, (*i)->GetIsVisible()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, sBuffer.makeStringAndClear()); ::sax::Converter::convertBool(sBuffer, (*i)->GetShowDetails()); @@ -490,7 +489,7 @@ void ScXMLExportDataPilot::WriteLevels(ScDPSaveDimension* pDim) // #i114202# GetShowEmpty is only valid if HasShowEmpty is true. if (pDim->HasShowEmpty()) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, pDim->GetShowEmpty()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, sBuffer.makeStringAndClear()); } @@ -555,7 +554,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_START, XML_AUTO); else { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; rExport.GetMM100UnitConverter().convertDateTime(sDate, rGroupInfo.mfStart); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_START, sDate.makeStringAndClear()); } @@ -563,7 +562,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_END, XML_AUTO); else { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; rExport.GetMM100UnitConverter().convertDateTime(sDate, rGroupInfo.mfEnd); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_END, sDate.makeStringAndClear()); } @@ -574,7 +573,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START, XML_AUTO); else { - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStart, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStart, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START, sValue); @@ -583,13 +582,13 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END, XML_AUTO); else { - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfEnd, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfEnd, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END, sValue); } } - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStep, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStep, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STEP, sValue); @@ -658,7 +657,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const sal_Int32 nElemCount = pGroup->GetElementCount(); for(sal_Int32 j = 0; j < nElemCount; ++j) { - const rtl::OUString* pElem = pGroup->GetElementByIndex(j); + const OUString* pElem = pGroup->GetElementByIndex(j); if (pElem) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, *pElem); @@ -686,14 +685,14 @@ void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDim if (pDim->IsDataLayout()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD, XML_TRUE); - rtl::OUString sValueStr; + OUString sValueStr; ScXMLConverter::GetStringFromOrientation( sValueStr, (sheet::DataPilotFieldOrientation) pDim->GetOrientation() ); if( !sValueStr.isEmpty() ) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORIENTATION, sValueStr ); if (pDim->GetUsedHierarchy() != 1) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, pDim->GetUsedHierarchy()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USED_HIERARCHY, sBuffer.makeStringAndClear()); } @@ -749,14 +748,14 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads continue; ScRange aOutRange((*pDPs)[i]->GetOutRange()); - rtl::OUString sTargetRangeAddress; + OUString sTargetRangeAddress; ScRangeStringConverter::GetStringFromRange( sTargetRangeAddress, aOutRange, pDoc, ::formula::FormulaGrammar::CONV_OOO ); ScDocAttrIterator aAttrItr(pDoc, aOutRange.aStart.Tab(), aOutRange.aStart.Col(), aOutRange.aStart.Row(), aOutRange.aEnd.Col(), aOutRange.aEnd.Row()); SCCOL nCol; SCROW nRow1, nRow2; - rtl::OUString sOUButtonList; + OUString sOUButtonList; const ScPatternAttr* pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2); while (pAttr) { @@ -772,8 +771,8 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads } pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2); } - rtl::OUString sName((*pDPs)[i]->GetName()); - rtl::OUString sApplicationData((*pDPs)[i]->GetTag()); + OUString sName((*pDPs)[i]->GetName()); + OUString sApplicationData((*pDPs)[i]->GetTag()); bool bRowGrand = pDPSave->GetRowGrand(); bool bColumnGrand = pDPSave->GetColumnGrand(); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, sName); @@ -883,7 +882,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OBJECT_NAME, pServSource->aParName); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USER_NAME, pServSource->aParUser); // #i111754# leave out password attribute as long as DataPilotSource doesn't specify the content - // rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PASSWORD, rtl::OUString(pServSource->aParPass)); + // rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PASSWORD, OUString(pServSource->aParPass)); SvXMLElementExport aElemSD(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, true, true); rExport.CheckAttrList(); } diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index fff2587c126b..6e2acf40b53b 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -41,7 +41,7 @@ class ScXMLExportDataPilot ScXMLExport& rExport; ScDocument* pDoc; - rtl::OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const; + OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const; void WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions); void WriteDPFilter(const ScQueryParam& aQueryParam); @@ -60,7 +60,7 @@ class ScXMLExportDataPilot void WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData); void WriteDimensions(ScDPSaveData* pDPSave); - void WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const ::rtl::OUString* pGrandTotal); + void WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const OUString* pGrandTotal); public: ScXMLExportDataPilot(ScXMLExport& rExport); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index dade8e0d2144..f83488a8a996 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -54,8 +54,6 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ScXMLExportDatabaseRanges::ScXMLExportDatabaseRanges(ScXMLExport& rTempExport) : rExport(rTempExport), @@ -75,21 +73,21 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang uno::Reference <beans::XPropertySet> xPropertySet (rExport.GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference <sheet::XDatabaseRanges> xDatabaseRanges(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATABASERNG))), uno::UNO_QUERY); + uno::Reference <sheet::XDatabaseRanges> xDatabaseRanges(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATABASERNG))), uno::UNO_QUERY); rExport.CheckAttrList(); if (xDatabaseRanges.is()) { - uno::Sequence <rtl::OUString> aRanges(xDatabaseRanges->getElementNames()); + uno::Sequence <OUString> aRanges(xDatabaseRanges->getElementNames()); sal_Int32 nDatabaseRangesCount = aRanges.getLength(); for (sal_Int32 i = 0; i < nDatabaseRangesCount; ++i) { - rtl::OUString sDatabaseRangeName(aRanges[i]); + OUString sDatabaseRangeName(aRanges[i]); uno::Reference <sheet::XDatabaseRange> xDatabaseRange(xDatabaseRanges->getByName(sDatabaseRangeName), uno::UNO_QUERY); if (xDatabaseRange.is()) { uno::Reference <beans::XPropertySet> xDatabaseRangePropertySet (xDatabaseRange, uno::UNO_QUERY); if (xDatabaseRangePropertySet.is() && - ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) + ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) { uno::Sequence <beans::PropertyValue> aImportProperties(xDatabaseRange->getImportDescriptor()); sal_Int32 nLength = aImportProperties.getLength(); @@ -400,13 +398,13 @@ private: return OUString("="); } case SC_GREATER: - return rtl::OUString(">"); + return OUString(">"); case SC_GREATER_EQUAL: - return rtl::OUString(">="); + return OUString(">="); case SC_LESS: - return rtl::OUString("<"); + return OUString("<"); case SC_LESS_EQUAL: - return rtl::OUString("<="); + return OUString("<="); case SC_NOT_EQUAL: if (bRegExp) return GetXMLToken(XML_NOMATCH); @@ -658,7 +656,7 @@ private: break; sal_Int32 nFieldCol = static_cast<sal_Int32>(aParam.nField[i]); - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, rtl::OUString::valueOf(nFieldCol)); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, OUString::valueOf(nFieldCol)); SvXMLElementExport aElemSTR(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true); for (SCCOL j = 0, n = aParam.nSubTotals[i]; j < n; ++j) diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 4a593fff5fe5..c5a7451388a2 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -33,7 +33,6 @@ #include <algorithm> -using ::rtl::OUString; using namespace ::com::sun::star; //============================================================================== diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 3d13403b7835..4a18f68be675 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -154,10 +154,10 @@ public: struct ScMyAreaLink { - ::rtl::OUString sFilter; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; - ::rtl::OUString sSourceStr; + OUString sFilter; + OUString sFilterOptions; + OUString sURL; + OUString sSourceStr; ::com::sun::star::table::CellRangeAddress aDestRange; sal_Int32 nRefresh; @@ -297,8 +297,8 @@ struct ScMyCell com::sun::star::table::CellRangeAddress aMergeRange; com::sun::star::table::CellRangeAddress aMatrixRange; - rtl::OUString sStringValue; - rtl::OUString sAnnotationText; + OUString sStringValue; + OUString sAnnotationText; ScMyAreaLink aAreaLink; ScMyShapeList aShapeList; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index c8a1e084a80f..4f7a9375b965 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -113,13 +113,13 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, uno::Reference<beans::XPropertySet> xPropertySet(aTempAny, uno::UNO_QUERY); if (xPropertySet.is()) { - rtl::OUString sErrorMessage; + OUString sErrorMessage; xPropertySet->getPropertyValue(sERRMESS) >>= sErrorMessage; - rtl::OUString sErrorTitle; + OUString sErrorTitle; xPropertySet->getPropertyValue(sERRTITLE) >>= sErrorTitle; - rtl::OUString sImputMessage; + OUString sImputMessage; xPropertySet->getPropertyValue(sINPMESS) >>= sImputMessage; - rtl::OUString sImputTitle; + OUString sImputTitle; xPropertySet->getPropertyValue(sINPTITLE) >>= sImputTitle; bool bShowErrorMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWERR)); bool bShowImputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWINP)); @@ -162,8 +162,8 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, else { sal_Int32 nNameIndex(nCount + 1); - rtl::OUString sCount(rtl::OUString::valueOf(nNameIndex)); - rtl::OUString sPrefix("val"); + OUString sCount(OUString::valueOf(nNameIndex)); + OUString sPrefix("val"); aValidation.sName += sPrefix; aValidation.sName += sCount; aValidationVec.push_back(aValidation); @@ -175,39 +175,39 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, return bAdded; } -rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) +OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) { /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY * ever be changed, adapt the conditional call of * MarkUsedExternalReferences() in * ScTableValidationObj::ScTableValidationObj() accordingly! */ - rtl::OUString sCondition; + OUString sCondition; if (aValidation.aValidationType != sheet::ValidationType_ANY) { switch (aValidation.aValidationType) { //case sheet::ValidationType_CUSTOM case sheet::ValidationType_DATE : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-date()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-date()")); break; case sheet::ValidationType_DECIMAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); break; case sheet::ValidationType_LIST : - sCondition += rtl::OUString("cell-content-is-in-list("); + sCondition += OUString("cell-content-is-in-list("); sCondition += aValidation.sFormula1; - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); break; case sheet::ValidationType_TEXT_LEN : if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length()")); break; case sheet::ValidationType_TIME : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-time()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-time()")); break; case sheet::ValidationType_WHOLE : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()")); break; default: { @@ -221,31 +221,31 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const !aValidation.sFormula2.isEmpty()))) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += rtl::OUString(" and "); + sCondition += OUString(" and "); if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); switch (aValidation.aOperator) { case sheet::ConditionOperator_EQUAL : - sCondition += rtl::OUString("="); + sCondition += OUString("="); break; case sheet::ConditionOperator_GREATER : - sCondition += rtl::OUString(">"); + sCondition += OUString(">"); break; case sheet::ConditionOperator_GREATER_EQUAL : - sCondition += rtl::OUString(">="); + sCondition += OUString(">="); break; case sheet::ConditionOperator_LESS : - sCondition += rtl::OUString("<"); + sCondition += OUString("<"); break; case sheet::ConditionOperator_LESS_EQUAL : - sCondition += rtl::OUString("<="); + sCondition += OUString("<="); break; case sheet::ConditionOperator_NOT_EQUAL : - sCondition += rtl::OUString("!="); + sCondition += OUString("!="); break; default: { @@ -259,26 +259,26 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString("cell-content-text-length-is-between("); + sCondition += OUString("cell-content-text-length-is-between("); else - sCondition += rtl::OUString("cell-content-text-length-is-not-between("); + sCondition += OUString("cell-content-text-length-is-not-between("); } else { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString("cell-content-is-between("); + sCondition += OUString("cell-content-is-between("); else - sCondition += rtl::OUString("cell-content-is-not-between("); + sCondition += OUString("cell-content-is-not-between("); } sCondition += aValidation.sFormula1; - sCondition += rtl::OUString(","); + sCondition += OUString(","); sCondition += aValidation.sFormula2; - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } } else if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) - sCondition = rtl::OUString(); + sCondition = OUString(); } if (!sCondition.isEmpty()) { @@ -290,15 +290,15 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const return sCondition; } -rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell) +OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell) { - rtl::OUString sAddress; + OUString sAddress; ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ::formula::FormulaGrammar::CONV_OOO ); return sAddress; } void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, - const rtl::OUString& sTitle, const rtl::OUString& sOUMessage, + const OUString& sTitle, const OUString& sOUMessage, const bool bShowMessage, const bool bIsHelpMessage) { if (!sTitle.isEmpty()) @@ -315,8 +315,8 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, if (!sOUMessage.isEmpty()) { sal_Int32 i(0); - rtl::OUStringBuffer sTemp; - rtl::OUString sText(convertLineEnd(sOUMessage, LINEEND_LF)); + OUStringBuffer sTemp; + OUString sText(convertLineEnd(sOUMessage, LINEEND_LF)); bool bPrevCharWasSpace(true); while(i < sText.getLength()) { @@ -349,7 +349,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) while (aItr != aEndItr) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, aItr->sName); - rtl::OUString sCondition(GetCondition(rExport, *aItr)); + OUString sCondition(GetCondition(rExport, *aItr)); if (!sCondition.isEmpty()) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION, sCondition); @@ -444,7 +444,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) } } -const rtl::OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 nIndex) +const OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 nIndex) { OSL_ENSURE( static_cast<size_t>(nIndex) < aValidationVec.size(), "out of range" ); return aValidationVec[nIndex].sName; @@ -862,7 +862,7 @@ void ScFormatRangeStyles::AddNewTable(const sal_Int32 nTable) } } -bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& rIndex, const bool bIsAutoStyle) +bool ScFormatRangeStyles::AddStyleName(OUString* rpString, sal_Int32& rIndex, const bool bIsAutoStyle) { if (bIsAutoStyle) { @@ -896,10 +896,10 @@ bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& rInde } } -sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, bool& bIsAutoStyle) +sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix, bool& bIsAutoStyle) { sal_Int32 nPrefixLength(rPrefix.getLength()); - rtl::OUString sTemp(rString.copy(nPrefixLength)); + OUString sTemp(rString.copy(nPrefixLength)); sal_Int32 nIndex(sTemp.toInt32()); if (nIndex > 0 && static_cast<size_t>(nIndex-1) < aAutoStyleNames.size() && aAutoStyleNames.at(nIndex - 1)->equals(rString)) { @@ -1101,7 +1101,7 @@ void ScFormatRangeStyles::AddRangeStyleName(const table::CellRangeAddress aCellR pFormatRanges->push_back(aFormatRange); } -rtl::OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle) +OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle) { if (bIsAutoStyle) return aAutoStyleNames[nIndex]; @@ -1135,16 +1135,16 @@ ScColumnRowStylesBase::~ScColumnRowStylesBase() } } -sal_Int32 ScColumnRowStylesBase::AddStyleName(rtl::OUString* pString) +sal_Int32 ScColumnRowStylesBase::AddStyleName(OUString* pString) { aStyleNames.push_back(pString); return aStyleNames.size() - 1; } -sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix) +sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix) { sal_Int32 nPrefixLength(rPrefix.getLength()); - rtl::OUString sTemp(rString.copy(nPrefixLength)); + OUString sTemp(rString.copy(nPrefixLength)); sal_Int32 nIndex(sTemp.toInt32()); if (nIndex > 0 && static_cast<size_t>(nIndex-1) < aStyleNames.size() && aStyleNames.at(nIndex - 1)->equals(rString)) return nIndex - 1; @@ -1166,7 +1166,7 @@ sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const rtl::OUString& rStrin } } -rtl::OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex) +OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex) { if ( nIndex < 0 || nIndex >= sal::static_int_cast<sal_Int32>( aStyleNames.size() ) ) { @@ -1230,7 +1230,7 @@ void ScColumnStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 n aTables[nTable][nField] = aStyle; } -rtl::OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) +OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) { bool bTemp; return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField, bTemp)); @@ -1310,7 +1310,7 @@ void ScRowStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nSta r.insert_back(nStartField, nEndField+1, nStringIndex); } -rtl::OUString* ScRowStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) +OUString* ScRowStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) { return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField)); } diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 2159c846d966..1a841a461784 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -37,13 +37,13 @@ class ScXMLExport; struct ScMyValidation { - rtl::OUString sName; - rtl::OUString sErrorMessage; - rtl::OUString sErrorTitle; - rtl::OUString sImputMessage; - rtl::OUString sImputTitle; - rtl::OUString sFormula1; - rtl::OUString sFormula2; + OUString sName; + OUString sErrorMessage; + OUString sErrorTitle; + OUString sImputMessage; + OUString sImputTitle; + OUString sFormula1; + OUString sFormula2; com::sun::star::table::CellAddress aBaseCell; com::sun::star::sheet::ValidationAlertStyle aAlertStyle; com::sun::star::sheet::ValidationType aValidationType; @@ -65,36 +65,36 @@ class ScMyValidationsContainer { private: ScMyValidationVec aValidationVec; - const rtl::OUString sEmptyString; - const rtl::OUString sERRALSTY; - const rtl::OUString sIGNOREBL; - const rtl::OUString sSHOWLIST; - const rtl::OUString sTYPE; - const rtl::OUString sSHOWINP; - const rtl::OUString sSHOWERR; - const rtl::OUString sINPTITLE; - const rtl::OUString sINPMESS; - const rtl::OUString sERRTITLE; - const rtl::OUString sERRMESS; - const rtl::OUString sOnError; - const rtl::OUString sEventType; - const rtl::OUString sStarBasic; - const rtl::OUString sScript; - const rtl::OUString sLibrary; - const rtl::OUString sMacroName; + const OUString sEmptyString; + const OUString sERRALSTY; + const OUString sIGNOREBL; + const OUString sSHOWLIST; + const OUString sTYPE; + const OUString sSHOWINP; + const OUString sSHOWERR; + const OUString sINPTITLE; + const OUString sINPMESS; + const OUString sERRTITLE; + const OUString sERRMESS; + const OUString sOnError; + const OUString sEventType; + const OUString sStarBasic; + const OUString sScript; + const OUString sLibrary; + const OUString sMacroName; public: ScMyValidationsContainer(); ~ScMyValidationsContainer(); bool AddValidation(const com::sun::star::uno::Any& aAny, sal_Int32& nValidationIndex); - rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); + OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); void WriteMessage(ScXMLExport& rExport, - const rtl::OUString& sTitle, const rtl::OUString& sMessage, + const OUString& sTitle, const OUString& sMessage, const bool bShowMessage, const bool bIsHelpMessage); void WriteValidations(ScXMLExport& rExport); - const rtl::OUString& GetValidationName(const sal_Int32 nIndex); + const OUString& GetValidationName(const sal_Int32 nIndex); }; //============================================================================== @@ -174,7 +174,7 @@ public: void Sort(); }; -typedef std::vector<rtl::OUString*> ScMyOUStringVec; +typedef std::vector<OUString*> ScMyOUStringVec; struct ScMyFormatRange { @@ -206,8 +206,8 @@ public: void SetRowDefaults(const ScMyDefaultStyleList* pDefaults) { pRowDefaults = pDefaults; } void SetColDefaults(const ScMyDefaultStyleList* pDefaults) { pColDefaults = pDefaults; } void AddNewTable(const sal_Int32 nTable); - bool AddStyleName(rtl::OUString* pString, sal_Int32& rIndex, const bool bIsAutoStyle = true); - sal_Int32 GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, bool& bIsAutoStyle); + bool AddStyleName(OUString* pString, sal_Int32& rIndex, const bool bIsAutoStyle = true); + sal_Int32 GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix, bool& bIsAutoStyle); // does not delete ranges sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nColumn, const sal_Int32 nRow, bool& bIsAutoStyle) const; @@ -218,7 +218,7 @@ public: const sal_Int32 nTable, ScRowFormatRanges* pFormatRanges); void AddRangeStyleName(const com::sun::star::table::CellRangeAddress aCellRangeAddress, const sal_Int32 nStringIndex, const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat); - rtl::OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); + OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); void Sort(); }; @@ -231,10 +231,10 @@ public: virtual ~ScColumnRowStylesBase(); virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) = 0; - sal_Int32 AddStyleName(rtl::OUString* pString); - sal_Int32 GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) = 0; - rtl::OUString* GetStyleNameByIndex(const sal_Int32 nIndex); + sal_Int32 AddStyleName(OUString* pString); + sal_Int32 GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) = 0; + OUString* GetStyleNameByIndex(const sal_Int32 nIndex); }; struct ScColumnStyle @@ -259,7 +259,7 @@ public: sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField, bool& bIsVisible); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const bool bIsVisible); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; class ScRowStyles : public ScColumnRowStylesBase @@ -286,7 +286,7 @@ public: sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nStartField, const sal_Int32 nStringIndex, const sal_Int32 nEndField); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; #endif diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index c725de154671..3b5d5cf76556 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -24,12 +24,12 @@ using namespace com::sun::star; using ::std::list; -void ScMyStyleNumberFormats::AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat) +void ScMyStyleNumberFormats::AddStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nNumberFormat) { aSet.insert(ScMyStyleNumberFormat(rStyleName, nNumberFormat)); } -sal_Int32 ScMyStyleNumberFormats::GetStyleNumberFormat(const rtl::OUString& rStyleName) +sal_Int32 ScMyStyleNumberFormats::GetStyleNumberFormat(const OUString& rStyleName) { ScMyStyleNumberFormat aStyleNumberFormat(rStyleName); ScMyStyleNumberFormatSet::iterator aItr(aSet.find(aStyleNumberFormat)); @@ -110,7 +110,7 @@ void ScMyStyleRanges::AddRange(const ScRange& rRange, const sal_Int16 nType) } } -void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange, const rtl::OUString* pCurrency) +void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange, const OUString* pCurrency) { if (!pCurrencyList) pCurrencyList = new ScMyCurrencyStylesSet(); @@ -161,15 +161,15 @@ void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDo } void ScMyStyleRanges::SetStylesToRanges(const list<ScRange>& rRanges, - const rtl::OUString* pStyleName, const sal_Int16 nCellType, - const rtl::OUString* pCurrency, ScXMLImport& rImport) + const OUString* pStyleName, const sal_Int16 nCellType, + const OUString* pCurrency, ScXMLImport& rImport) { list<ScRange>::const_iterator itr = rRanges.begin(), itrEnd = rRanges.end(); for (; itr != itrEnd; ++itr) rImport.SetStyleToRange(*itr, pStyleName, nCellType, pCurrency); } -void ScMyStyleRanges::SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport) +void ScMyStyleRanges::SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport) { if (mpNumberList) { @@ -268,7 +268,7 @@ void ScMyStylesImportHelper::ResetAttributes() nCellType = 0; } -ScMyStylesSet::iterator ScMyStylesImportHelper::GetIterator(const rtl::OUString* pStyleNameP) +ScMyStylesSet::iterator ScMyStylesImportHelper::GetIterator(const OUString* pStyleNameP) { ScMyStyle aStyle; if (pStyleNameP) @@ -312,7 +312,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) aRange.aStart.SetCol(nStartCol); aRange.aEnd.SetCol(i - 1); delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aPrevItr->sStyleName); + pPrevStyleName = new OUString(aPrevItr->sStyleName); AddSingleRange(aRange); nStartCol = i; aPrevItr = aColDefaultStyles[i]; @@ -323,7 +323,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) ScRange aRange(rRange); aRange.aStart.SetCol(nStartCol); delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aPrevItr->sStyleName); + pPrevStyleName = new OUString(aPrevItr->sStyleName); AddSingleRange(aRange); } else @@ -339,7 +339,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) else { delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aRowDefaultStyle->sStyleName); + pPrevStyleName = new OUString(aRowDefaultStyle->sStyleName); AddSingleRange(rRange); } } @@ -365,7 +365,7 @@ void ScMyStylesImportHelper::AddRange() ResetAttributes(); } -void ScMyStylesImportHelper::AddColumnStyle(const rtl::OUString& sStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat) +void ScMyStylesImportHelper::AddColumnStyle(const OUString& sStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat) { (void)nColumn; // avoid warning in product version OSL_ENSURE(static_cast<sal_uInt32>(nColumn) == aColDefaultStyles.size(), "some columns are absent"); @@ -376,13 +376,13 @@ void ScMyStylesImportHelper::AddColumnStyle(const rtl::OUString& sStyleName, con aColDefaultStyles.push_back(aItr); } -void ScMyStylesImportHelper::SetRowStyle(const rtl::OUString& sStyleName) +void ScMyStylesImportHelper::SetRowStyle(const OUString& sStyleName) { aRowDefaultStyle = GetIterator(&sStyleName); } -void ScMyStylesImportHelper::SetAttributes(rtl::OUString* pStyleNameP, - rtl::OUString* pCurrencyP, const sal_Int16 nCellTypeP) +void ScMyStylesImportHelper::SetAttributes(OUString* pStyleNameP, + OUString* pCurrencyP, const sal_Int16 nCellTypeP) { delete this->pStyleName; delete this->pCurrency; diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 29edfcb58754..5b99fea15544 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -33,13 +33,13 @@ class ScXMLImport; struct ScMyStyleNumberFormat { - rtl::OUString sStyleName; + OUString sStyleName; sal_Int32 nNumberFormat; ScMyStyleNumberFormat() : nNumberFormat(-1) {} - ScMyStyleNumberFormat(const rtl::OUString& rStyleName) : + ScMyStyleNumberFormat(const OUString& rStyleName) : sStyleName(rStyleName), nNumberFormat(-1) {} - ScMyStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nFormat) : + ScMyStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nFormat) : sStyleName(rStyleName), nNumberFormat(nFormat) {} }; @@ -58,13 +58,13 @@ class ScMyStyleNumberFormats ScMyStyleNumberFormatSet aSet; public: - void AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat); - sal_Int32 GetStyleNumberFormat(const rtl::OUString& rStyleName); + void AddStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nNumberFormat); + sal_Int32 GetStyleNumberFormat(const OUString& rStyleName); }; struct ScMyCurrencyStyle { - rtl::OUString sCurrency; + OUString sCurrency; ::boost::shared_ptr<ScSimpleRangeList> mpRanges; ScMyCurrencyStyle() : @@ -95,21 +95,21 @@ class ScMyStyleRanges : public SvRefBase ScMyCurrencyStylesSet* pCurrencyList; void SetStylesToRanges(const ::std::list<ScRange>& rList, - const rtl::OUString* pStyleName, const sal_Int16 nCellType, - const rtl::OUString* pCurrency, ScXMLImport& rImport); + const OUString* pStyleName, const sal_Int16 nCellType, + const OUString* pCurrency, ScXMLImport& rImport); public: ScMyStyleRanges(); ~ScMyStyleRanges(); void AddRange(const ScRange& rRange, const sal_Int16 nType); - void AddCurrencyRange(const ScRange& rRange, const rtl::OUString* pCurrency); + void AddCurrencyRange(const ScRange& rRange, const OUString* pCurrency); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); - void SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport); + void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport); }; SV_DECL_IMPL_REF( ScMyStyleRanges ); struct ScMyStyle { - rtl::OUString sStyleName; + OUString sStyleName; ScMyStyleRangesRef xRanges; ScMyStyle() : xRanges(new ScMyStyleRanges()) {} @@ -133,21 +133,21 @@ class ScMyStylesImportHelper ScMyStyles aColDefaultStyles; ScMyStylesSet::iterator aRowDefaultStyle; ScXMLImport& rImport; - rtl::OUString* pStyleName; - rtl::OUString* pPrevStyleName; - rtl::OUString* pCurrency; - rtl::OUString* pPrevCurrency; + OUString* pStyleName; + OUString* pPrevStyleName; + OUString* pCurrency; + OUString* pPrevCurrency; ScRange aPrevRange; sal_Int16 nCellType; sal_Int16 nPrevCellType; bool bPrevRangeAdded; void ResetAttributes(); - ScMyStylesSet::iterator GetIterator(const rtl::OUString* pStyleName); + ScMyStylesSet::iterator GetIterator(const OUString* pStyleName); void AddDefaultRange(const ScRange& rRange); void AddSingleRange(const ScRange& rRange); void AddRange(); - bool IsEqual(const rtl::OUString* pFirst, const rtl::OUString* pSecond) + bool IsEqual(const OUString* pFirst, const OUString* pSecond) { return ((pFirst && pSecond && pFirst->equals(*pSecond)) || (!pFirst && !pSecond) || @@ -157,10 +157,10 @@ class ScMyStylesImportHelper public: ScMyStylesImportHelper(ScXMLImport& rImport); ~ScMyStylesImportHelper(); - void AddColumnStyle(const rtl::OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat); - void SetRowStyle(const rtl::OUString& rStyleName); - void SetAttributes(rtl::OUString* pStyleName, - rtl::OUString* pCurrency, const sal_Int16 nCellType); + void AddColumnStyle(const OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat); + void SetRowStyle(const OUString& rStyleName); + void SetAttributes(OUString* pStyleName, + OUString* pCurrency, const sal_Int16 nCellType); void AddRange(const ScRange& rRange); void AddCell(const ScAddress& rAddress); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); // a col is inserted before nCol diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 04b73dc26281..6d48a61585c8 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -26,7 +26,6 @@ #include "unonames.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -34,7 +33,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace xmloff::token; -using rtl::OUString; TYPEINIT1( XMLTableHeaderFooterContext, SvXMLImportContext ); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 48ab4cc6e7e9..21637726bb77 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -40,12 +40,12 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::sheet::XHeaderFooterContent > xHeaderFooterContent; - const ::rtl::OUString sOn; - const ::rtl::OUString sShareContent; - const ::rtl::OUString sContent; - const ::rtl::OUString sContentLeft; - const ::rtl::OUString sEmpty; - rtl::OUString sCont; + const OUString sOn; + const OUString sShareContent; + const OUString sContent; + const OUString sContentLeft; + const OUString sEmpty; + OUString sCont; bool bDisplay; bool bLeft; @@ -57,7 +57,7 @@ public: TYPEINFO(); XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const ::com::sun::star::uno::Reference < @@ -68,7 +68,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); @@ -86,7 +86,7 @@ public: TYPEINFO(); XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, com::sun::star::uno::Reference< com::sun::star::text::XTextCursor >& xCursor ); @@ -95,7 +95,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index b06b00d37228..528139318b7f 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -27,7 +27,6 @@ #include "unonames.hxx" #include "xmlexprt.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -70,9 +69,9 @@ void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Ref Reference < XText > xRight(xHeaderFooter->getRightText()); if (xCenter.is() && xLeft.is() && xRight.is()) { - rtl::OUString sCenter (xCenter->getString()); - rtl::OUString sLeft (xLeft->getString()); - rtl::OUString sRight (xRight->getString()); + OUString sCenter (xCenter->getString()); + OUString sLeft (xLeft->getString()); + OUString sRight (xRight->getString()); if( !bDisplay ) GetExport().AddAttribute( XML_NAMESPACE_STYLE, @@ -110,13 +109,13 @@ void XMLTableMasterPageExport::exportMasterPageContent( const Reference < XPropertySet > & rPropSet, sal_Bool bAutoStyles ) { - Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTHDRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTHDRCON ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTHDRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTHDRCONT ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT ) ) ), uno::UNO_QUERY); if( bAutoStyles ) { @@ -147,19 +146,19 @@ void XMLTableMasterPageExport::exportMasterPageContent( } else { - sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRON ) ) ))); + sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRON ) ) ))); exportHeaderFooter(xHeader, XML_HEADER, bHeader ); - sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRSHARED ) ) )) && bHeader); + sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRSHARED ) ) )) && bHeader); exportHeaderFooter( xHeaderLeft, XML_HEADER_LEFT, bLeftHeader ); - sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON ) ) ))); + sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON ) ) ))); exportHeaderFooter( xFooter, XML_FOOTER, bFooter ); - sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED ) ) )) && bFooter); + sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED ) ) )) && bFooter); exportHeaderFooter( xFooterLeft, XML_FOOTER_LEFT, bLeftFooter ); } diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 4924f47894e6..ea38a3047172 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -39,9 +39,7 @@ using namespace ::com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : @@ -55,7 +53,7 @@ XMLTableShapeImportHelper::~XMLTableShapeImportHelper() { } -void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const rtl::OUString& sType) const +void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const { if ( sType == "com.sun.star.drawing.ControlShape" ) nLayerID = SC_LAYER_CONTROLS; @@ -100,14 +98,14 @@ void XMLTableShapeImportHelper::finishShape( sal_Int32 nEndY(-1); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; table::CellAddress aEndCell; - rtl::OUString* pRangeList(NULL); + OUString* pRangeList(NULL); sal_Int16 nLayerID(-1); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& rValue(xAttrList->getValueByIndex( i )); + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + const OUString& rValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix( static_cast<ScXMLImport&>(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); @@ -140,7 +138,7 @@ void XMLTableShapeImportHelper::finishShape( else if(nPrefix == XML_NAMESPACE_DRAW) { if (IsXMLToken(aLocalName, XML_NOTIFY_ON_UPDATE_OF_RANGES)) - pRangeList = new rtl::OUString(rValue); + pRangeList = new OUString(rValue); } } SetLayer(rShape, nLayerID, rShape->getShapeType()); @@ -171,13 +169,13 @@ void XMLTableShapeImportHelper::finishShape( else // shape is annotation { // get the style names for stream copying - rtl::OUString aStyleName; - rtl::OUString aTextStyle; + OUString aStyleName; + OUString aTextStyle; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(static_cast<ScXMLImport&>(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); if(nPrefix == XML_NAMESPACE_DRAW) { @@ -223,10 +221,10 @@ void XMLTableShapeImportHelper::finishShape( sal_Int16 nLayerID(-1); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& rValue(xAttrList->getValueByIndex( i )); + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + const OUString& rValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix(static_cast<ScXMLImport&>(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); if(nPrefix == XML_NAMESPACE_TABLE) { diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index aa38da4b115f..900560026c63 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -37,7 +37,7 @@ public: XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); ~XMLTableShapeImportHelper(); - void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const rtl::OUString& sType) const; + void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const; virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 33e0203dfecd..d6ffc275d59a 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::std::auto_ptr; using ::std::vector; -using ::rtl::OUString; ScMyOLEFixer::ScMyOLEFixer(ScXMLImport& rTempImport) : rImport(rTempImport), @@ -56,8 +55,8 @@ sal_Bool ScMyOLEFixer::IsOLE(uno::Reference< drawing::XShape >& rShape) } void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, - const rtl::OUString& rName, - const rtl::OUString& rRangeList) + const OUString& rName, + const OUString& rRangeList) { // This is the minimum required. if (!pDoc) @@ -111,7 +110,7 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, } void ScMyOLEFixer::AddOLE(uno::Reference <drawing::XShape>& rShape, - const rtl::OUString &rRangeList) + const OUString &rRangeList) { ScMyToFixupOLE aShape; aShape.xShape.set(rShape); @@ -123,7 +122,7 @@ void ScMyOLEFixer::FixupOLEs() { if (!aShapes.empty() && rImport.GetModel().is()) { - rtl::OUString sPersistName ("PersistName"); + OUString sPersistName ("PersistName"); ScMyToFixupOLEs::iterator aItr(aShapes.begin()); ScMyToFixupOLEs::iterator aEndItr(aShapes.end()); ScDocument* pDoc(rImport.GetDocument()); @@ -141,7 +140,7 @@ void ScMyOLEFixer::FixupOLEs() uno::Reference < beans::XPropertySet > xShapeProps ( aItr->xShape, uno::UNO_QUERY ); uno::Reference < beans::XPropertySetInfo > xShapeInfo(xShapeProps->getPropertySetInfo()); - rtl::OUString sName; + OUString sName; if (pDoc && xShapeProps.is() && xShapeInfo.is() && xShapeInfo->hasPropertyByName(sPersistName) && (xShapeProps->getPropertyValue(sPersistName) >>= sName)) CreateChartListener(pDoc, sName, aItr->sRangeList); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx index 57b6c795f146..2f3826f09fa7 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.hxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx @@ -32,7 +32,7 @@ class ScDocument; struct ScMyToFixupOLE { com::sun::star::uno::Reference <com::sun::star::drawing::XShape> xShape; - rtl::OUString sRangeList; + OUString sRangeList; }; typedef std::list<ScMyToFixupOLE> ScMyToFixupOLEs; @@ -44,15 +44,15 @@ class ScMyOLEFixer ScChartListenerCollection* pCollection; void CreateChartListener(ScDocument* pDoc, - const rtl::OUString& rName, - const rtl::OUString& rRangeList); + const OUString& rName, + const OUString& rRangeList); public: ScMyOLEFixer(ScXMLImport& rImport); ~ScMyOLEFixer(); static sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape); void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, - const rtl::OUString &rRangeList); + const OUString &rRangeList); void FixupOLEs(); }; diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 13bcfba2f734..7cc5369196f4 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -42,7 +42,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext() } SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 14ca9a8d4d07..21463a194c8e 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -30,14 +30,14 @@ class ScXMLTableShapesContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableShapesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index a7bc29766969..ea854786b64c 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -35,7 +35,7 @@ using namespace xmloff::token; ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -49,11 +49,11 @@ ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if(nPrefix == XML_NAMESPACE_XLINK) { if (IsXMLToken(aLocalName, XML_HREF)) @@ -87,7 +87,7 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext() } SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 20553c20de95..4f61e9869b20 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -27,10 +27,10 @@ class ScXMLImport; class ScXMLTableSourceContext : public SvXMLImportContext { - rtl::OUString sLink; - rtl::OUString sTableName; - rtl::OUString sFilterName; - rtl::OUString sFilterOptions; + OUString sLink; + OUString sTableName; + OUString sFilterName; + OUString sFilterOptions; sal_Int32 nRefresh; com::sun::star::sheet::SheetLinkMode nMode; @@ -38,14 +38,14 @@ class ScXMLTableSourceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableSourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index b7834d6d84c1..625e66b2e876 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -38,16 +38,15 @@ using namespace com::sun::star; using namespace xmloff::token; -using rtl::OUString; //----------------------------------------------------------------------------- class ScXMLChangeInfoContext : public SvXMLImportContext { ScMyActionInfo aInfo; - ::rtl::OUStringBuffer sAuthorBuffer; - ::rtl::OUStringBuffer sDateTimeBuffer; - ::rtl::OUStringBuffer sCommentBuffer; + OUStringBuffer sAuthorBuffer; + OUStringBuffer sDateTimeBuffer; + OUStringBuffer sCommentBuffer; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; sal_uInt32 nParagraphCount; @@ -55,14 +54,14 @@ class ScXMLChangeInfoContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeInfoContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -79,14 +78,14 @@ class ScXMLBigRangeContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScBigRange& rBigRange); virtual ~ScXMLBigRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -97,10 +96,10 @@ public: class ScXMLCellContentDeletionContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; - rtl::OUString sFormulaNmsp; - rtl::OUString sInputString; + OUString sFormulaAddress; + OUString sFormula; + OUString sFormulaNmsp; + OUString sInputString; ScBigRange aBigRange; double fValue; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -118,14 +117,14 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCellContentDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -142,14 +141,14 @@ class ScXMLDependenceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependenceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -166,14 +165,14 @@ class ScXMLDependingsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -190,14 +189,14 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -214,14 +213,14 @@ class ScXMLDeletionsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -235,8 +234,8 @@ class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - rtl::OUString sLName; - rtl::OUStringBuffer sText; + OUString sLName; + OUStringBuffer sText; ScXMLChangeCellContext* pChangeCellContext; SvXMLImportContext* pTextPContext; sal_uInt16 nPrefix; @@ -247,7 +246,7 @@ class ScXMLChangeTextPContext : public SvXMLImportContext public: ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeCellContext* pChangeCellContext); @@ -255,11 +254,11 @@ public: virtual ~ScXMLChangeTextPContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -270,8 +269,8 @@ class ScXMLChangeCellContext : public SvXMLImportContext { ScCellValue& mrOldCell; - rtl::OUString sText; - rtl::OUString& rInputString; + OUString sText; + OUString& rInputString; ScEditEngineTextObj* pEditTextObj; double& rDateTimeValue; double fValue; @@ -285,24 +284,24 @@ class ScXMLChangeCellContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScCellValue& rOldCell, rtl::OUString& sAddress, - rtl::OUString& rFormula, rtl::OUString& rFormulaNmsp, + ScCellValue& rOldCell, OUString& sAddress, + OUString& rFormula, OUString& rFormulaNmsp, formula::FormulaGrammar::Grammar& rGrammar, - rtl::OUString& rInputString, double& fValue, sal_uInt16& nType, + OUString& rInputString, double& fValue, sal_uInt16& nType, sal_uInt8& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows); virtual ~ScXMLChangeCellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); void CreateTextPContext(sal_Bool bIsNewParagraph); sal_Bool IsEditCell() { return pEditTextObj != 0; } - void SetText(const rtl::OUString& sTempText) { sText = sTempText; } + void SetText(const OUString& sTempText) { sText = sTempText; } virtual void EndElement(); }; @@ -311,10 +310,10 @@ public: class ScXMLPreviousContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; - rtl::OUString sFormulaNmsp; - rtl::OUString sInputString; + OUString sFormulaAddress; + OUString sFormula; + OUString sFormulaNmsp; + OUString sInputString; double fValue; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; ScCellValue maOldCell; @@ -329,14 +328,14 @@ class ScXMLPreviousContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLPreviousContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -354,14 +353,14 @@ class ScXMLContentChangeContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLContentChangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -377,14 +376,14 @@ class ScXMLInsertionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -400,14 +399,14 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionCutOffContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -423,14 +422,14 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementCutOffContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -446,14 +445,14 @@ class ScXMLCutOffsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCutOffsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -469,14 +468,14 @@ class ScXMLDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -494,14 +493,14 @@ class ScXMLMovementContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -517,14 +516,14 @@ class ScXMLRejectionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLRejectionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -534,7 +533,7 @@ public: ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -546,11 +545,11 @@ ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { if (IsXMLToken(aLocalName, XML_PROTECTION_KEY)) @@ -572,7 +571,7 @@ ScXMLTrackedChangesContext::~ScXMLTrackedChangesContext() } SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -614,7 +613,7 @@ void ScXMLTrackedChangesContext::EndElement() ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -625,11 +624,11 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_OFFICE) { @@ -650,7 +649,7 @@ ScXMLChangeInfoContext::~ScXMLChangeInfoContext() } SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -690,7 +689,7 @@ void ScXMLChangeInfoContext::EndElement() ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScBigRange& rTempBigRange ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -711,11 +710,11 @@ ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -763,7 +762,7 @@ ScXMLBigRangeContext::~ScXMLBigRangeContext() } SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -776,7 +775,7 @@ void ScXMLBigRangeContext::EndElement() ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -792,11 +791,11 @@ ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -811,7 +810,7 @@ ScXMLCellContentDeletionContext::~ScXMLCellContentDeletionContext() } SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -851,7 +850,7 @@ void ScXMLCellContentDeletionContext::EndElement() ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -861,11 +860,11 @@ ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -881,7 +880,7 @@ ScXMLDependenceContext::~ScXMLDependenceContext() } SvXMLImportContext *ScXMLDependenceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -894,7 +893,7 @@ void ScXMLDependenceContext::EndElement() ScXMLDependingsContext::ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -908,7 +907,7 @@ ScXMLDependingsContext::~ScXMLDependingsContext() } SvXMLImportContext *ScXMLDependingsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -933,7 +932,7 @@ void ScXMLDependingsContext::EndElement() ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -943,11 +942,11 @@ ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -963,7 +962,7 @@ ScXMLChangeDeletionContext::~ScXMLChangeDeletionContext() } SvXMLImportContext *ScXMLChangeDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -976,7 +975,7 @@ void ScXMLChangeDeletionContext::EndElement() ScXMLDeletionsContext::ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -990,7 +989,7 @@ ScXMLDeletionsContext::~ScXMLDeletionsContext() } SvXMLImportContext *ScXMLDeletionsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1016,7 +1015,7 @@ void ScXMLDeletionsContext::EndElement() ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList, ScXMLChangeCellContext* pTempChangeCellContext) : @@ -1038,7 +1037,7 @@ ScXMLChangeTextPContext::~ScXMLChangeTextPContext() } SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTempPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList ) { @@ -1050,9 +1049,9 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); + OUString aLocalName; sal_uInt16 nPrfx(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); if ((nPrfx == XML_NAMESPACE_TEXT) && (IsXMLToken(aLocalName, XML_C))) @@ -1089,7 +1088,7 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem return pContext; } -void ScXMLChangeTextPContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLChangeTextPContext::Characters( const OUString& rChars ) { if (!pTextPContext) sText.append(rChars); @@ -1105,12 +1104,12 @@ void ScXMLChangeTextPContext::EndElement() ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, - ScCellValue& rOldCell, rtl::OUString& rAddress, - rtl::OUString& rFormula, rtl::OUString& rFormulaNmsp, + ScCellValue& rOldCell, OUString& rAddress, + OUString& rFormula, OUString& rFormulaNmsp, formula::FormulaGrammar::Grammar& rGrammar, - rtl::OUString& rTempInputString, double& fDateTimeValue, sal_uInt16& nType, + OUString& rTempInputString, double& fDateTimeValue, sal_uInt16& nType, sal_uInt8& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows ) : SvXMLImportContext( rImport, nPrfx, rLName ), mrOldCell(rOldCell), @@ -1128,11 +1127,11 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1209,7 +1208,7 @@ ScXMLChangeCellContext::~ScXMLChangeCellContext() } SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1313,7 +1312,7 @@ void ScXMLChangeCellContext::EndElement() ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1328,11 +1327,11 @@ ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1347,7 +1346,7 @@ ScXMLPreviousContext::~ScXMLPreviousContext() } SvXMLImportContext *ScXMLPreviousContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1371,7 +1370,7 @@ void ScXMLPreviousContext::EndElement() ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1384,11 +1383,11 @@ ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1421,7 +1420,7 @@ ScXMLContentChangeContext::~ScXMLContentChangeContext() } SvXMLImportContext *ScXMLContentChangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1463,7 +1462,7 @@ void ScXMLContentChangeContext::EndElement() ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1480,11 +1479,11 @@ ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1537,7 +1536,7 @@ ScXMLInsertionContext::~ScXMLInsertionContext() } SvXMLImportContext *ScXMLInsertionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1568,7 +1567,7 @@ void ScXMLInsertionContext::EndElement() ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1579,11 +1578,11 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1605,7 +1604,7 @@ ScXMLInsertionCutOffContext::~ScXMLInsertionCutOffContext() } SvXMLImportContext *ScXMLInsertionCutOffContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1618,7 +1617,7 @@ void ScXMLInsertionCutOffContext::EndElement() ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1632,11 +1631,11 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1669,7 +1668,7 @@ ScXMLMovementCutOffContext::~ScXMLMovementCutOffContext() } SvXMLImportContext *ScXMLMovementCutOffContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1682,7 +1681,7 @@ void ScXMLMovementCutOffContext::EndElement() ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1696,7 +1695,7 @@ ScXMLCutOffsContext::~ScXMLCutOffsContext() } SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1722,7 +1721,7 @@ void ScXMLCutOffsContext::EndElement() ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1739,11 +1738,11 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1801,7 +1800,7 @@ ScXMLDeletionContext::~ScXMLDeletionContext() } SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1838,7 +1837,7 @@ void ScXMLDeletionContext::EndElement() ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1851,11 +1850,11 @@ ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1888,7 +1887,7 @@ ScXMLMovementContext::~ScXMLMovementContext() } SvXMLImportContext *ScXMLMovementContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1924,7 +1923,7 @@ void ScXMLMovementContext::EndElement() ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1937,11 +1936,11 @@ ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1974,7 +1973,7 @@ ScXMLRejectionContext::~ScXMLRejectionContext() } SvXMLImportContext *ScXMLRejectionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 41cff44c3aa2..63d3a1b160c1 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -36,14 +36,14 @@ class ScXMLTrackedChangesContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLTrackedChangesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 4c82a1840514..afeab260b730 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -29,7 +29,7 @@ ScSheetSaveData::ScSheetSaveData() : mnStartTab( -1 ), mnStartOffset( -1 ), - maPreviousNote( rtl::OUString(), rtl::OUString(), ScAddress(ScAddress::INITIALIZE_INVALID) ), + maPreviousNote( OUString(), OUString(), ScAddress(ScAddress::INITIALIZE_INVALID) ), mbInSupportedSave( false ) { } @@ -38,27 +38,27 @@ ScSheetSaveData::~ScSheetSaveData() { } -void ScSheetSaveData::AddCellStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddCellStyle( const OUString& rName, const ScAddress& rCellPos ) { maCellStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddColumnStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddColumnStyle( const OUString& rName, const ScAddress& rCellPos ) { maColumnStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddRowStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddRowStyle( const OUString& rName, const ScAddress& rCellPos ) { maRowStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddTableStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddTableStyle( const OUString& rName, const ScAddress& rCellPos ) { maTableStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::HandleNoteStyles( const rtl::OUString& rStyleName, const rtl::OUString& rTextName, const ScAddress& rCellPos ) +void ScSheetSaveData::HandleNoteStyles( const OUString& rStyleName, const OUString& rTextName, const ScAddress& rCellPos ) { // only consecutive duplicates (most common case) are filtered out here, // the others are found when the styles are created @@ -76,7 +76,7 @@ void ScSheetSaveData::HandleNoteStyles( const rtl::OUString& rStyleName, const r maNoteStyles.push_back( aNewEntry ); } -void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) +void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) { if ( nFamily == XML_STYLE_FAMILY_TEXT_PARAGRAPH ) maNoteParaStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); @@ -84,7 +84,7 @@ void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUStri maNoteTextStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); } -void ScSheetSaveData::AddTextStyle( const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) +void ScSheetSaveData::AddTextStyle( const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) { maTextStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); } @@ -201,7 +201,7 @@ void ScSheetSaveData::StoreLoadedNamespaces( const SvXMLNamespaceMap& rNamespace } } -static bool lcl_NameInHash( const NameSpaceHash& rNameHash, const rtl::OUString& rName ) +static bool lcl_NameInHash( const NameSpaceHash& rNameHash, const OUString& rName ) { NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end(); while (aIter != aEnd) diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index f68694e69ec6..de6eb7003fcd 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -46,7 +46,7 @@ ScXMLAnnotationData::~ScXMLAnnotationData() ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLAnnotationData& rAnnotationData, ScXMLTableRowCellContext* pTempCellContext) : @@ -69,11 +69,11 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAnnotationAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -122,7 +122,7 @@ void ScXMLAnnotationContext::StartElement(const com::sun::star::uno::Reference< } SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -153,7 +153,7 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPref return pContext; } -void ScXMLAnnotationContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLAnnotationContext::Characters( const OUString& rChars ) { maTextBuffer.append(rChars); } @@ -178,7 +178,7 @@ void ScXMLAnnotationContext::EndElement() } void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< drawing::XShapes >& rxShapes, - const rtl::OUString& rStyleName, const rtl::OUString& rTextStyle ) + const OUString& rStyleName, const OUString& rTextStyle ) { mrAnnotationData.mxShape = rxShape; mrAnnotationData.mxShapes = rxShapes; @@ -186,7 +186,7 @@ void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& mrAnnotationData.maTextStyle = rTextStyle; } -void ScXMLAnnotationContext::AddContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ESelection& rSelection ) +void ScXMLAnnotationContext::AddContentStyle( sal_uInt16 nFamily, const OUString& rName, const ESelection& rSelection ) { mrAnnotationData.maContentStyles.push_back( ScXMLAnnotationStyleEntry( nFamily, rName, rSelection ) ); } diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index c52031de3ace..8aad19af1dc1 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -33,10 +33,10 @@ class ScXMLTableRowCellContext; struct ScXMLAnnotationStyleEntry { sal_uInt16 mnFamily; - rtl::OUString maName; + OUString maName; ESelection maSelection; - ScXMLAnnotationStyleEntry( sal_uInt16 nFam, const rtl::OUString& rNam, const ESelection& rSel ) : + ScXMLAnnotationStyleEntry( sal_uInt16 nFam, const OUString& rNam, const ESelection& rSel ) : mnFamily( nFam ), maName( rNam ), maSelection( rSel ) @@ -50,11 +50,11 @@ struct ScXMLAnnotationData mxShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxShapes; - ::rtl::OUString maAuthor; - ::rtl::OUString maCreateDate; - ::rtl::OUString maSimpleText; - ::rtl::OUString maStyleName; - ::rtl::OUString maTextStyle; + OUString maAuthor; + OUString maCreateDate; + OUString maSimpleText; + OUString maStyleName; + OUString maTextStyle; bool mbUseShapePos; bool mbShown; std::vector<ScXMLAnnotationStyleEntry> maContentStyles; @@ -68,7 +68,7 @@ class ScXMLAnnotationContext : public SvXMLImportContext public: ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLAnnotationData& rAnnotationData, @@ -77,29 +77,29 @@ public: virtual ~ScXMLAnnotationContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); void SetShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::rtl::OUString& rStyleName, const ::rtl::OUString& rTextStyle ); + const OUString& rStyleName, const OUString& rTextStyle ); - void AddContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ESelection& rSelection ); + void AddContentStyle( sal_uInt16 nFamily, const OUString& rName, const ESelection& rSelection ); private: ScXMLAnnotationData& mrAnnotationData; - rtl::OUStringBuffer maTextBuffer; - rtl::OUStringBuffer maAuthorBuffer; - rtl::OUStringBuffer maCreateDateBuffer; - rtl::OUStringBuffer maCreateDateStringBuffer; + OUStringBuffer maTextBuffer; + OUStringBuffer maAuthorBuffer; + OUStringBuffer maCreateDateBuffer; + OUStringBuffer maCreateDateStringBuffer; ScXMLTableRowCellContext* pCellContext; SvXMLImportContext* pShapeContext; diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 632f847a704d..10a0a946cc38 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -51,7 +51,6 @@ #include <memory> -using rtl::OUString; using namespace com::sun::star; using namespace xmloff::token; @@ -60,7 +59,7 @@ using namespace xmloff::token; ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), sPassword(), @@ -99,11 +98,11 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -124,7 +123,7 @@ ScXMLBodyContext::~ScXMLBodyContext() } SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 84e34443db18..8eec88f0390c 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -30,7 +30,7 @@ class ScXMLChangeTrackingImportHelper; class ScXMLBodyContext : public SvXMLImportContext { - rtl::OUString sPassword; + OUString sPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; bool bProtected; @@ -41,16 +41,16 @@ class ScXMLBodyContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLBodyContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 2ceae6bc89e7..d9b5decc1a06 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -127,7 +127,7 @@ ScXMLTableRowCellContext::Field::~Field() ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempIsCovered, @@ -162,21 +162,21 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, rXMLImport.SetRemoveLastChar(false); rXMLImport.GetTables().AddColumn(bTempIsCovered); const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; - rtl::OUString aLocalName; - rtl::OUString* pStyleName = NULL; - rtl::OUString* pCurrencySymbol = NULL; + OUString aLocalName; + OUString* pStyleName = NULL; + OUString* pCurrencySymbol = NULL; const SvXMLTokenMap& rTokenMap = rImport.GetTableRowCellAttrTokenMap(); for (sal_Int16 i = 0; i < nAttrCount; ++i) { sal_uInt16 nAttrPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex(i), &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName); switch (nToken) { case XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME: - pStyleName = new rtl::OUString(sValue); + pStyleName = new OUString(sValue); break; case XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME: OSL_ENSURE(!maContentValidationName, "here should be only one Validation Name"); @@ -269,14 +269,14 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, if (!sValue.isEmpty()) { OSL_ENSURE(!maFormula, "here should be only one formula"); - rtl::OUString aFormula, aFormulaNmsp; + OUString aFormula, aFormulaNmsp; rXMLImport.ExtractFormulaNamespaceGrammar( aFormula, aFormulaNmsp, eGrammar, sValue ); maFormula.reset( FormulaWithNamespace(aFormula, aFormulaNmsp) ); } } break; case XML_TOK_TABLE_ROW_CELL_ATTR_CURRENCY: - pCurrencySymbol = new rtl::OUString(sValue); + pCurrencySymbol = new OUString(sValue); break; default: ; @@ -609,7 +609,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd() } SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -980,7 +980,7 @@ void ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const } void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos, - const SCCOL nCurrentCol, const ::boost::optional< rtl::OUString >& pOUText ) + const SCCOL nCurrentCol, const ::boost::optional< OUString >& pOUText ) { bool bDoIncrement = true; //matrix reference cells that contain text formula results; @@ -1116,7 +1116,7 @@ bool isEmptyOrNote( ScDocument* pDoc, const ScAddress& rCurrentPos ) } void ScXMLTableRowCellContext::AddTextAndValueCell( const ScAddress& rCellPos, - const ::boost::optional< rtl::OUString >& pOUText, ScAddress& rCurrentPos ) + const ::boost::optional< OUString >& pOUText, ScAddress& rCurrentPos ) { ScMyTables& rTables = rXMLImport.GetTables(); bool bWasEmpty = bIsEmpty; @@ -1262,7 +1262,7 @@ OUString getOutputString( ScDocument* pDoc, const ScAddress& aCellPos ) void ScXMLTableRowCellContext::AddNonFormulaCell( const ScAddress& rCellPos ) { - ::boost::optional< rtl::OUString > pOUText; + ::boost::optional< OUString > pOUText; if( nCellType == util::NumberFormat::TEXT ) { diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index e59aa6eab839..ac03836fc731 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -91,7 +91,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext bool mbCheckWithCompilerForError; bool mbEditEngineHasText; - sal_Int16 GetCellType(const rtl::OUString& sOUValue) const; + sal_Int16 GetCellType(const OUString& sOUValue) const; void DoMerge(const ScAddress& rScCellPos, const SCCOL nCols, const SCROW nRows); @@ -106,10 +106,10 @@ class ScXMLTableRowCellContext : public ScXMLImportContext void SetFormulaCell ( ScFormulaCell* pFCell ) const; void PutTextCell ( const ScAddress& rScCurrentPos, const SCCOL nCurrentCol, - const ::boost::optional< rtl::OUString >& pOUText ); + const ::boost::optional< OUString >& pOUText ); void PutValueCell ( const ScAddress& rScCurrentPos ); void AddTextAndValueCell ( const ScAddress& rScCellPos, - const ::boost::optional< rtl::OUString >& pOUText, ScAddress& rScCurrentPos ); + const ::boost::optional< OUString >& pOUText, ScAddress& rScCurrentPos ); void AddNonFormulaCell ( const ScAddress& rScCellPos ); void PutFormulaCell ( const ScAddress& rScCurrentPos ); void AddFormulaCell ( const ScAddress& rScCellPos ); @@ -123,7 +123,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext public: ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bIsCovered, const sal_Int32 nRepeatedRows ); @@ -131,7 +131,7 @@ public: virtual ~ScXMLTableRowCellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index e53ca9a66205..4102a685c7de 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -44,7 +44,7 @@ using namespace xmloff::token; ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -56,11 +56,11 @@ ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -94,7 +94,7 @@ ScXMLTableColContext::~ScXMLTableColContext() } SvXMLImportContext *ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -145,7 +145,7 @@ void ScXMLTableColContext::EndElement() } } } - rtl::OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); + OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); bool bValue(true); if (!IsXMLToken(sVisibility, XML_VISIBLE)) bValue = false; @@ -157,14 +157,14 @@ void ScXMLTableColContext::EndElement() // #i57915# ScXMLImport::SetStyleToRange can't handle empty style names. // The default for a column if there is no attribute is the style "Default" (programmatic API name). if ( sCellStyleName.isEmpty() ) - sCellStyleName = rtl::OUString( "Default" ); + sCellStyleName = OUString( "Default" ); GetScImport().GetTables().AddColStyle(nColCount, sCellStyleName); } ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempHeader, const bool bTempGroup) : @@ -186,11 +186,11 @@ ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DISPLAY)) { @@ -206,7 +206,7 @@ ScXMLTableColsContext::~ScXMLTableColsContext() } SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 8fa6f172f1fa..6c94cbd82b69 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -27,9 +27,9 @@ class ScXMLImport; class ScXMLTableColContext : public SvXMLImportContext { sal_Int32 nColCount; - rtl::OUString sStyleName; - rtl::OUString sVisibility; - rtl::OUString sCellStyleName; + OUString sStyleName; + OUString sVisibility; + OUString sCellStyleName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -37,14 +37,14 @@ class ScXMLTableColContext : public SvXMLImportContext public: ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableColContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -67,7 +67,7 @@ class ScXMLTableColsContext : public SvXMLImportContext public: ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bHeader, const bool bGroup); @@ -75,7 +75,7 @@ public: virtual ~ScXMLTableColsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index ef0468ab2474..cc00ba778c9b 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -40,7 +40,7 @@ ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName): + const OUString& rLName): SvXMLImportContext( rImport, nPrfx, rLName ) { GetScImport().SetNewCondFormatData(); @@ -48,7 +48,7 @@ ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rIm } SvXMLImportContext* ScXMLConditionalFormatsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -77,20 +77,20 @@ void ScXMLConditionalFormatsContext::EndElement() } ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList): + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sRange; + OUString sRange; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetCondFormatAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -110,7 +110,7 @@ ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImpo } SvXMLImportContext* ScXMLConditionalFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -153,7 +153,7 @@ void ScXMLConditionalFormatContext::EndElement() } ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, ScConditionalFormat* pFormat): + const OUString& rLName, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), pColorScaleFormat(NULL) { @@ -162,7 +162,7 @@ ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport } SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -182,28 +182,28 @@ SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 } ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpDataBarFormat(NULL), mpFormatData(NULL) { - rtl::OUString sPositiveColor; - rtl::OUString sNegativeColor; - rtl::OUString sGradient; - rtl::OUString sAxisPosition; - rtl::OUString sShowValue; - rtl::OUString sAxisColor; + OUString sPositiveColor; + OUString sNegativeColor; + OUString sGradient; + OUString sAxisPosition; + OUString sShowValue; + OUString sAxisColor; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataBarAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -283,7 +283,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ } SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -315,22 +315,22 @@ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP } ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString aIconSetType, sShowValue; + OUString aIconSetType, sShowValue; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetIconSetAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -349,7 +349,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u ScIconSetType eType = IconSet_3Arrows; for(; pMap->pName; ++pMap) { - rtl::OUString aName = rtl::OUString::createFromAscii(pMap->pName); + OUString aName = OUString::createFromAscii(pMap->pName); if(aName ==aIconSetType) { eType = pMap->eType; @@ -375,7 +375,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u } SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -400,7 +400,7 @@ SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nP namespace { -void GetConditionData(const rtl::OUString& rValue, ScConditionMode& eMode, rtl::OUString& rExpr1, rtl::OUString& rExpr2) +void GetConditionData(const OUString& rValue, ScConditionMode& eMode, OUString& rExpr1, OUString& rExpr2) { if(rValue.indexOf("unique") == 0) { @@ -561,23 +561,23 @@ void GetConditionData(const rtl::OUString& rValue, ScConditionMode& eMode, rtl:: } ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sExpression; - rtl::OUString sStyle; - rtl::OUString sAddress; + OUString sExpression; + OUString sStyle; + OUString sAddress; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConditionAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -595,13 +595,13 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, } } - rtl::OUString aExpr1; - rtl::OUString aExpr2; + OUString aExpr1; + OUString aExpr2; ScConditionMode eMode; GetConditionData(sExpression, eMode, aExpr1, aExpr2); ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), ScAddress(), sStyle, - rtl::OUString(), rtl::OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF); + OUString(), OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF); pFormatEntry->SetSrcString(sAddress); pFormat->AddEntry(pFormatEntry); @@ -609,7 +609,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, namespace { -void setColorEntryType(const rtl::OUString& rType, ScColorScaleEntry* pEntry, const rtl::OUString rFormula, +void setColorEntryType(const OUString& rType, ScColorScaleEntry* pEntry, const OUString rFormula, ScXMLImport& rImport) { if(rType == "minimum") @@ -635,7 +635,7 @@ void setColorEntryType(const rtl::OUString& rType, ScColorScaleEntry* pEntry, co } ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpFormatEntry( NULL ) @@ -643,19 +643,19 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor double nVal = 0; Color aColor; - rtl::OUString sType; - rtl::OUString sVal; - rtl::OUString sColor; + OUString sType; + OUString sVal; + OUString sColor; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetColorScaleEntryAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -686,22 +686,22 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor } ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleEntry*& pColorScaleEntry): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sVal; - rtl::OUString sType; + OUString sVal; + OUString sType; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataBarEntryAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -726,7 +726,7 @@ ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, namespace { -condformat::ScCondFormatDateType getDateFromString(const rtl::OUString& rString) +condformat::ScCondFormatDateType getDateFromString(const OUString& rString) { if(rString == "today") return condformat::TODAY; @@ -762,20 +762,20 @@ condformat::ScCondFormatDateType getDateFromString(const rtl::OUString& rString) } ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sDateType, sStyle; + OUString sDateType, sStyle; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetCondDateAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 1b64cd5cf896..9df40bbfeb2f 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -43,12 +43,12 @@ class ScXMLConditionalFormatsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~ScXMLConditionalFormatsContext() {} virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -61,14 +61,14 @@ class ScXMLConditionalFormatContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLConditionalFormatContext() {} virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -87,13 +87,13 @@ private: public: ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, ScConditionalFormat* pFormat); + const OUString& rLName, ScConditionalFormat* pFormat); virtual ~ScXMLColorScaleFormatContext() {} virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); private: @@ -107,7 +107,7 @@ class ScXMLDataBarFormatContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -116,7 +116,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); private: @@ -135,7 +135,7 @@ class ScXMLIconSetFormatContext : public SvXMLImportContext public: ScXMLIconSetFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -144,7 +144,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; @@ -155,7 +155,7 @@ class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat); @@ -172,7 +172,7 @@ class ScXMLFormattingEntryContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleEntry*& pData); @@ -186,7 +186,7 @@ class ScXMLCondContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -200,7 +200,7 @@ class ScXMLDateContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 4decd390cb3c..29b91dca5b2f 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -33,10 +33,10 @@ using namespace xmloff::token; ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - rtl::OUStringBuffer& sTempValue) : + OUStringBuffer& sTempValue) : SvXMLImportContext( rImport, nPrfx, rLName ), sOUText(), sValue(sTempValue) @@ -48,7 +48,7 @@ ScXMLContentContext::~ScXMLContentContext() } SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -60,9 +60,9 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& sAttrValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sAttrValue(xAttrList->getValueByIndex( i )); + OUString aLocalName; sal_uInt16 nPrfx = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if ((nPrfx == XML_NAMESPACE_TEXT) && IsXMLToken(aLocalName, XML_C)) @@ -81,7 +81,7 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, return pContext; } -void ScXMLContentContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLContentContext::Characters( const OUString& rChars ) { sOUText.append(rChars); } diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 88fa4d1e3bfd..4d9355c42a31 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -26,8 +26,8 @@ class ScXMLImport; class ScXMLContentContext : public SvXMLImportContext { - rtl::OUStringBuffer sOUText; - rtl::OUStringBuffer& sValue; + OUStringBuffer sOUText; + OUStringBuffer& sValue; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -35,19 +35,19 @@ class ScXMLContentContext : public SvXMLImportContext public: ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - rtl::OUStringBuffer& sValue); + OUStringBuffer& sValue); virtual ~ScXMLContentContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 3a0697b61e66..2d634aea8a7f 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -33,18 +33,17 @@ using namespace com::sun::star; using namespace xmloff::token; using namespace ::formula; -using ::rtl::OUString; class ScXMLContentValidationContext : public SvXMLImportContext { - rtl::OUString sName; - rtl::OUString sHelpTitle; - rtl::OUString sHelpMessage; - rtl::OUString sErrorTitle; - rtl::OUString sErrorMessage; - rtl::OUString sErrorMessageType; - rtl::OUString sBaseCellAddress; - rtl::OUString sCondition; + OUString sName; + OUString sHelpTitle; + OUString sHelpMessage; + OUString sErrorTitle; + OUString sErrorMessage; + OUString sErrorMessageType; + OUString sBaseCellAddress; + OUString sCondition; sal_Int16 nShowList; sal_Bool bAllowEmptyCell; sal_Bool bDisplayHelp; @@ -63,28 +62,28 @@ class ScXMLContentValidationContext : public SvXMLImportContext public: ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void SetHelpMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const sal_Bool bDisplay); - void SetErrorMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const rtl::OUString& sMessageType, const sal_Bool bDisplay); + void SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const sal_Bool bDisplay); + void SetErrorMessage(const OUString& sTitle, const OUString& sMessage, const OUString& sMessageType, const sal_Bool bDisplay); void SetErrorMacro(const sal_Bool bExecute); }; class ScXMLHelpMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; + OUString sTitle; + OUStringBuffer sMessage; sal_Int32 nParagraphCount; sal_Bool bDisplay; @@ -96,7 +95,7 @@ class ScXMLHelpMessageContext : public SvXMLImportContext public: ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -104,7 +103,7 @@ public: virtual ~ScXMLHelpMessageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -113,9 +112,9 @@ public: class ScXMLErrorMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; - rtl::OUString sMessageType; + OUString sTitle; + OUStringBuffer sMessage; + OUString sMessageType; sal_Int32 nParagraphCount; sal_Bool bDisplay; @@ -127,7 +126,7 @@ class ScXMLErrorMessageContext : public SvXMLImportContext public: ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -135,7 +134,7 @@ public: virtual ~ScXMLErrorMessageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -144,7 +143,7 @@ public: class ScXMLErrorMacroContext : public SvXMLImportContext { - rtl::OUString sName; + OUString sName; sal_Bool bExecute; ScXMLContentValidationContext* pValidationContext; @@ -155,7 +154,7 @@ class ScXMLErrorMacroContext : public SvXMLImportContext public: ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -163,7 +162,7 @@ public: virtual ~ScXMLErrorMacroContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -173,7 +172,7 @@ public: ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -186,7 +185,7 @@ ScXMLContentValidationsContext::~ScXMLContentValidationsContext() } SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -212,7 +211,7 @@ void ScXMLContentValidationsContext::EndElement() ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -225,11 +224,11 @@ ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImpo const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -271,7 +270,7 @@ ScXMLContentValidationContext::~ScXMLContentValidationContext() } SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -418,7 +417,7 @@ void ScXMLContentValidationContext::EndElement() // #i36650# event-listeners element moved up one level if (xEventContext.Is()) { - rtl::OUString sOnError("OnError"); + OUString sOnError("OnError"); XMLEventsImportContext* pEvents = (XMLEventsImportContext*)&xEventContext; uno::Sequence<beans::PropertyValue> aValues; @@ -454,15 +453,15 @@ void ScXMLContentValidationContext::EndElement() GetScImport().AddValidation(aValidation); } -void ScXMLContentValidationContext::SetHelpMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const sal_Bool bDisplay) +void ScXMLContentValidationContext::SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const sal_Bool bDisplay) { sHelpTitle = sTitle; sHelpMessage = sMessage; bDisplayHelp = bDisplay; } -void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, - const rtl::OUString& sMessageType, const sal_Bool bDisplay) +void ScXMLContentValidationContext::SetErrorMessage(const OUString& sTitle, const OUString& sMessage, + const OUString& sMessageType, const sal_Bool bDisplay) { sErrorTitle = sTitle; sErrorMessage = sMessage; @@ -472,13 +471,13 @@ void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle, void ScXMLContentValidationContext::SetErrorMacro(const sal_Bool bExecute) { - sErrorMessageType = rtl::OUString("macro"); + sErrorMessageType = OUString("macro"); bDisplayError = bExecute; } ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -493,11 +492,11 @@ ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationHelpMessageAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -516,7 +515,7 @@ ScXMLHelpMessageContext::~ScXMLHelpMessageContext() } SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -548,7 +547,7 @@ void ScXMLHelpMessageContext::EndElement() ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -564,11 +563,11 @@ ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationErrorMessageAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -590,7 +589,7 @@ ScXMLErrorMessageContext::~ScXMLErrorMessageContext() } SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -622,7 +621,7 @@ void ScXMLErrorMessageContext::EndElement() ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -635,11 +634,11 @@ ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationErrorMacroAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -658,7 +657,7 @@ ScXMLErrorMacroContext::~ScXMLErrorMacroContext() } SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index a4a309b7bf2f..efc6cca4fbc8 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -36,14 +36,14 @@ class ScXMLContentValidationsContext : public SvXMLImportContext public: ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 208cfb50d1e9..1b9260be627e 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -51,15 +51,13 @@ using namespace com::sun::star; using namespace xmloff::token; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -74,7 +72,7 @@ ScXMLDataPilotTablesContext::~ScXMLDataPilotTablesContext() } SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -106,7 +104,7 @@ ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() : ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -133,11 +131,11 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -224,7 +222,7 @@ ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext() } SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -582,7 +580,7 @@ void ScXMLDataPilotTableContext::SetGrandTotal( ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -593,11 +591,11 @@ ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceSQLAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -625,7 +623,7 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext() } SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -643,7 +641,7 @@ void ScXMLDPSourceSQLContext::EndElement() ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -654,11 +652,11 @@ ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -681,7 +679,7 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext() } SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -699,7 +697,7 @@ void ScXMLDPSourceTableContext::EndElement() ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -710,11 +708,11 @@ ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceQueryAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -737,7 +735,7 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext() } SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -755,7 +753,7 @@ void ScXMLDPSourceQueryContext::EndElement() ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -766,11 +764,11 @@ ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableSourceServiceAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -808,7 +806,7 @@ ScXMLSourceServiceContext::~ScXMLSourceServiceContext() } SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -874,7 +872,7 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext() } SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference<XAttributeList>& /*xAttrList*/ ) + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& /*xAttrList*/ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -901,7 +899,7 @@ void ScXMLDataPilotGrandTotalContext::EndElement() ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -912,11 +910,11 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableSourceCellRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -940,7 +938,7 @@ ScXMLSourceCellRangeContext::~ScXMLSourceCellRangeContext() } SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -966,7 +964,7 @@ void ScXMLSourceCellRangeContext::EndElement() ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -992,11 +990,11 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotFieldAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1053,7 +1051,7 @@ ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext() } SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1098,7 +1096,7 @@ void ScXMLDataPilotFieldContext::SetSubTotalName(const OUString& rName) pDim->SetSubtotalName(rName); } -void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector<rtl::OUString>& rMembers, const rtl::OUString& rName) +void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector<OUString>& rMembers, const OUString& rName) { ScXMLDataPilotGroup aGroup; aGroup.aMembers = rMembers; @@ -1140,8 +1138,8 @@ void ScXMLDataPilotFieldContext::EndElement() while (aItr != aEndItr) { ScDPSaveGroupItem aItem(aItr->aName); - ::std::vector<rtl::OUString>::const_iterator aMembersItr(aItr->aMembers.begin()); - ::std::vector<rtl::OUString>::const_iterator aMembersEndItr(aItr->aMembers.end()); + ::std::vector<OUString>::const_iterator aMembersItr(aItr->aMembers.begin()); + ::std::vector<OUString>::const_iterator aMembersEndItr(aItr->aMembers.end()); while (aMembersItr != aMembersEndItr) { aItem.AddElement(*aMembersItr); @@ -1165,7 +1163,7 @@ void ScXMLDataPilotFieldContext::EndElement() } ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1175,11 +1173,11 @@ ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLI sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1232,7 +1230,7 @@ ScXMLDataPilotFieldReferenceContext::~ScXMLDataPilotFieldReferenceContext() ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1243,11 +1241,11 @@ ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotLevelAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1265,7 +1263,7 @@ ScXMLDataPilotLevelContext::~ScXMLDataPilotLevelContext() } SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1302,7 +1300,7 @@ void ScXMLDataPilotLevelContext::EndElement() } ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1313,11 +1311,11 @@ ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1353,7 +1351,7 @@ ScXMLDataPilotDisplayInfoContext::~ScXMLDataPilotDisplayInfoContext() } ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1364,11 +1362,11 @@ ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImpo sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1402,7 +1400,7 @@ ScXMLDataPilotSortInfoContext::~ScXMLDataPilotSortInfoContext() } ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1413,11 +1411,11 @@ ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& r sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1447,7 +1445,7 @@ ScXMLDataPilotLayoutInfoContext::~ScXMLDataPilotLayoutInfoContext() ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1465,7 +1463,7 @@ ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext() } SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1519,7 +1517,7 @@ void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName) ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : @@ -1530,11 +1528,11 @@ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImpo const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotSubTotalAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1557,7 +1555,7 @@ ScXMLDataPilotSubTotalContext::~ScXMLDataPilotSubTotalContext() } SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1575,7 +1573,7 @@ void ScXMLDataPilotSubTotalContext::EndElement() ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1590,7 +1588,7 @@ ScXMLDataPilotMembersContext::~ScXMLDataPilotMembersContext() } SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1616,7 +1614,7 @@ void ScXMLDataPilotMembersContext::EndElement() ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1630,11 +1628,11 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotMemberAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1669,7 +1667,7 @@ ScXMLDataPilotMemberContext::~ScXMLDataPilotMemberContext() } SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1696,14 +1694,14 @@ void ScXMLDataPilotMemberContext::EndElement() ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { - rtl::OUString sGroupSource; + OUString sGroupSource; double fStart(0.0); double fEnd(0.0); double fStep(0.0); @@ -1715,11 +1713,11 @@ ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); (void)nPrefix; //! compare below! @@ -1797,7 +1795,7 @@ ScXMLDataPilotGroupsContext::~ScXMLDataPilotGroupsContext() } SvXMLImportContext *ScXMLDataPilotGroupsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1821,7 +1819,7 @@ void ScXMLDataPilotGroupsContext::EndElement() ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1831,11 +1829,11 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1850,7 +1848,7 @@ ScXMLDataPilotGroupContext::~ScXMLDataPilotGroupContext() } SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1875,7 +1873,7 @@ void ScXMLDataPilotGroupContext::EndElement() ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pTempDataPilotGroup) : @@ -1885,11 +1883,11 @@ ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1904,7 +1902,7 @@ ScXMLDataPilotGroupMemberContext::~ScXMLDataPilotGroupMemberContext() } SvXMLImportContext *ScXMLDataPilotGroupMemberContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 0f722dd89785..1aa851dc1a1e 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -55,14 +55,14 @@ class ScXMLDataPilotTablesContext : public SvXMLImportContext public: ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTablesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -73,7 +73,7 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext { struct GrandTotalItem { - ::rtl::OUString maDisplayName; + OUString maDisplayName; bool mbVisible; GrandTotalItem(); }; @@ -83,17 +83,17 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext ScDPDimensionSaveData* pDPDimSaveData; GrandTotalItem maRowGrandTotal; GrandTotalItem maColGrandTotal; - rtl::OUString sDataPilotTableName; - rtl::OUString sApplicationData; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; - rtl::OUString sServiceName; - rtl::OUString sServiceSourceName; - rtl::OUString sServiceSourceObject; - rtl::OUString sServiceUsername; - rtl::OUString sServicePassword; - rtl::OUString sButtons; - rtl::OUString sSourceRangeName; + OUString sDataPilotTableName; + OUString sApplicationData; + OUString sDatabaseName; + OUString sSourceObject; + OUString sServiceName; + OUString sServiceSourceName; + OUString sServiceSourceObject; + OUString sServiceUsername; + OUString sServicePassword; + OUString sButtons; + OUString sSourceRangeName; ScRange aSourceCellRangeAddress; ScRange aTargetRangeAddress; ScRange aFilterSourceRange; @@ -120,29 +120,29 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext public: ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const ::rtl::OUString& rDisplayName); - void SetDatabaseName(const rtl::OUString& sValue) { sDatabaseName = sValue; } - void SetSourceObject(const rtl::OUString& sValue) { sSourceObject = sValue; } + void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const OUString& rDisplayName); + void SetDatabaseName(const OUString& sValue) { sDatabaseName = sValue; } + void SetSourceObject(const OUString& sValue) { sSourceObject = sValue; } void SetNative(bool bValue) { bIsNative = bValue; } - void SetServiceName(const rtl::OUString& sValue) { sServiceName = sValue; } - void SetServiceSourceName(const rtl::OUString& sValue) { sServiceSourceName = sValue; } - void SetServiceSourceObject(const rtl::OUString& sValue) { sServiceSourceObject = sValue; } - void SetServiceUsername(const rtl::OUString& sValue) { sServiceUsername = sValue; } - void SetServicePassword(const rtl::OUString& sValue) { sServicePassword = sValue; } - void SetSourceRangeName(const rtl::OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; } + void SetServiceName(const OUString& sValue) { sServiceName = sValue; } + void SetServiceSourceName(const OUString& sValue) { sServiceSourceName = sValue; } + void SetServiceSourceObject(const OUString& sValue) { sServiceSourceObject = sValue; } + void SetServiceUsername(const OUString& sValue) { sServiceUsername = sValue; } + void SetServicePassword(const OUString& sValue) { sServicePassword = sValue; } + void SetSourceRangeName(const OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; } void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = true; } void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; } void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; } @@ -163,7 +163,7 @@ class ScXMLDPSourceSQLContext : public SvXMLImportContext public: ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -171,7 +171,7 @@ public: virtual ~ScXMLDPSourceSQLContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -188,7 +188,7 @@ class ScXMLDPSourceTableContext : public SvXMLImportContext public: ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -196,7 +196,7 @@ public: virtual ~ScXMLDPSourceTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -213,7 +213,7 @@ class ScXMLDPSourceQueryContext : public SvXMLImportContext public: ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -221,7 +221,7 @@ public: virtual ~ScXMLDPSourceQueryContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -238,7 +238,7 @@ class ScXMLSourceServiceContext : public SvXMLImportContext public: ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -246,7 +246,7 @@ public: virtual ~ScXMLSourceServiceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -260,13 +260,13 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext ScXMLImport& GetScImport(); ScXMLDataPilotTableContext* mpTableContext; - ::rtl::OUString maDisplayName; + OUString maDisplayName; Orientation meOrientation; bool mbVisible; public: ScXMLDataPilotGrandTotalContext( - ScXMLImport& rImport, sal_uInt16 nPrefix, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTableContext ); @@ -274,7 +274,7 @@ public: virtual ~ScXMLDataPilotGrandTotalContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -291,7 +291,7 @@ class ScXMLSourceCellRangeContext : public SvXMLImportContext public: ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -299,7 +299,7 @@ public: virtual ~ScXMLSourceCellRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -308,8 +308,8 @@ public: struct ScXMLDataPilotGroup { - ::std::vector<rtl::OUString> aMembers; - rtl::OUString aName; + ::std::vector<OUString> aMembers; + OUString aName; }; class ScXMLDataPilotFieldContext : public SvXMLImportContext @@ -318,9 +318,9 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext ScDPSaveDimension* pDim; ::std::vector<ScXMLDataPilotGroup> aGroups; - rtl::OUString sGroupSource; - rtl::OUString sSelectedPage; - rtl::OUString sName; + OUString sGroupSource; + OUString sSelectedPage; + OUString sName; double fStart; double fEnd; double fStep; @@ -341,7 +341,7 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext public: ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -349,7 +349,7 @@ public: virtual ~ScXMLDataPilotFieldContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -358,12 +358,12 @@ public: void SetShowEmpty(const sal_Bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); } void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); } void AddMember(ScDPSaveMember* pMember); - void SetSubTotalName(const ::rtl::OUString& rName); + void SetSubTotalName(const OUString& rName); void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); } void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } void SetLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } - void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, + void SetGrouping(const OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, sal_Int32 nPart, sal_Bool bDate, sal_Bool bAutoSt, sal_Bool bAutoE) { bIsGroupField = sal_True; @@ -376,7 +376,7 @@ public: bAutoStart = bAutoSt; bAutoEnd = bAutoE; } - void AddGroup(const ::std::vector<rtl::OUString>& rMembers, const rtl::OUString& rName); + void AddGroup(const ::std::vector<OUString>& rMembers, const OUString& rName); }; class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext @@ -389,7 +389,7 @@ class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext public: ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -407,7 +407,7 @@ class ScXMLDataPilotLevelContext : public SvXMLImportContext public: ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -415,7 +415,7 @@ public: virtual ~ScXMLDataPilotLevelContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -432,7 +432,7 @@ class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext public: ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -450,7 +450,7 @@ class ScXMLDataPilotSortInfoContext : public SvXMLImportContext public: ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -468,7 +468,7 @@ class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext public: ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -482,7 +482,7 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext sal_Int16 nFunctionCount; sal_uInt16* pFunctions; - ::rtl::OUString maDisplayName; + OUString maDisplayName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -492,7 +492,7 @@ public: ScXMLDataPilotFieldContext* GetDataPilotField() { return pDataPilotField; } ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -500,13 +500,13 @@ public: virtual ~ScXMLDataPilotSubTotalsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); void AddFunction(sal_Int16 nFunction); - void SetDisplayName(const ::rtl::OUString& rName); + void SetDisplayName(const OUString& rName); }; class ScXMLDataPilotSubTotalContext : public SvXMLImportContext @@ -519,7 +519,7 @@ class ScXMLDataPilotSubTotalContext : public SvXMLImportContext public: ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals); @@ -527,7 +527,7 @@ public: virtual ~ScXMLDataPilotSubTotalContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -544,7 +544,7 @@ class ScXMLDataPilotMembersContext : public SvXMLImportContext public: ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -552,7 +552,7 @@ public: virtual ~ScXMLDataPilotMembersContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -563,8 +563,8 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - rtl::OUString sName; - rtl::OUString maDisplayName; + OUString sName; + OUString maDisplayName; sal_Bool bDisplay; sal_Bool bDisplayDetails; sal_Bool bHasName; @@ -575,7 +575,7 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext public: ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -583,7 +583,7 @@ public: virtual ~ScXMLDataPilotMemberContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -600,7 +600,7 @@ class ScXMLDataPilotGroupsContext : public SvXMLImportContext public: ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -608,7 +608,7 @@ public: virtual ~ScXMLDataPilotGroupsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -619,8 +619,8 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - rtl::OUString sName; - ::std::vector<rtl::OUString> aMembers; + OUString sName; + ::std::vector<OUString> aMembers; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -628,7 +628,7 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext public: ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -636,20 +636,20 @@ public: virtual ~ScXMLDataPilotGroupContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void AddMember(const rtl::OUString& sMember) { aMembers.push_back(sMember); } + void AddMember(const OUString& sMember) { aMembers.push_back(sMember); } }; class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext { ScXMLDataPilotGroupContext* pDataPilotGroup; - rtl::OUString sName; + OUString sName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -657,7 +657,7 @@ class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext public: ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pDataPilotGroup); @@ -665,7 +665,7 @@ public: virtual ~ScXMLDataPilotGroupMemberContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 75dbf9796c30..cd34058438eb 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -57,13 +57,12 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; //------------------------------------------------------------------ ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -78,7 +77,7 @@ ScXMLDatabaseRangesContext::~ScXMLDatabaseRangesContext() } SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -107,7 +106,7 @@ void ScXMLDatabaseRangesContext::EndElement() ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -141,11 +140,11 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -227,7 +226,7 @@ ScXMLDatabaseRangeContext::~ScXMLDatabaseRangeContext() } SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -499,7 +498,7 @@ void ScXMLDatabaseRangeContext::EndElement() ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -510,11 +509,11 @@ ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceSQLAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -543,7 +542,7 @@ ScXMLSourceSQLContext::~ScXMLSourceSQLContext() } SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -572,7 +571,7 @@ void ScXMLSourceSQLContext::EndElement() ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -583,11 +582,11 @@ ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -611,7 +610,7 @@ ScXMLSourceTableContext::~ScXMLSourceTableContext() } SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -640,7 +639,7 @@ void ScXMLSourceTableContext::EndElement() ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -651,11 +650,11 @@ ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceQueryAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -679,7 +678,7 @@ ScXMLSourceQueryContext::~ScXMLSourceQueryContext() } SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -708,22 +707,22 @@ void ScXMLSourceQueryContext::EndElement() ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext( pTempDatabaseRangeContext ) { - rtl::OUString sConRes; + OUString sConRes; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_XLINK) { @@ -740,7 +739,7 @@ ScXMLConResContext::~ScXMLConResContext() } SvXMLImportContext *ScXMLConResContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -758,7 +757,7 @@ void ScXMLConResContext::EndElement() ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -769,11 +768,11 @@ ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSubTotalRulesAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -801,7 +800,7 @@ ScXMLSubTotalRulesContext::~ScXMLSubTotalRulesContext() } SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -836,7 +835,7 @@ void ScXMLSubTotalRulesContext::EndElement() ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -848,11 +847,11 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRulesSortGroupsAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -860,7 +859,7 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, { if (sValue.getLength() > 8) { - rtl::OUString sTemp = sValue.copy(0, 8); + OUString sTemp = sValue.copy(0, 8); if (sTemp.compareToAscii(SC_USERLIST) == 0) { pDatabaseRangeContext->SetSubTotalsEnabledUserList(true); @@ -902,7 +901,7 @@ ScXMLSortGroupsContext::~ScXMLSortGroupsContext() } SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -920,7 +919,7 @@ void ScXMLSortGroupsContext::EndElement() ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -931,11 +930,11 @@ ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRulesSubTotalRuleAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -953,7 +952,7 @@ ScXMLSubTotalRuleContext::~ScXMLSubTotalRuleContext() } SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -984,7 +983,7 @@ void ScXMLSubTotalRuleContext::EndElement() ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSubTotalRuleContext* pTempSubTotalRuleContext) : @@ -995,11 +994,11 @@ ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRuleSubTotalFieldAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1022,7 +1021,7 @@ ScXMLSubTotalFieldContext::~ScXMLSubTotalFieldContext() } SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 6633eeefc03b..7e0a6d8b2b75 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -46,14 +46,14 @@ class ScXMLDatabaseRangesContext : public SvXMLImportContext public: ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -70,10 +70,10 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext { boost::scoped_ptr<ScQueryParam> mpQueryParam; ScRange maRange; - rtl::OUString sDatabaseRangeName; - rtl::OUString sConnectionResource; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; + OUString sDatabaseRangeName; + OUString sConnectionResource; + OUString sDatabaseName; + OUString sSourceObject; com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence; std::vector < ScSubTotalRule > aSubTotalRules; com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress; @@ -103,27 +103,27 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } - ScDBData* ConvertToDBData(const ::rtl::OUString& rName); + ScDBData* ConvertToDBData(const OUString& rName); public: ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void SetDatabaseName(const rtl::OUString sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } - void SetConnectionResource(const rtl::OUString sTempConRes) { sConnectionResource = sTempConRes; } - void SetSourceObject(const rtl::OUString sTempSourceObject) { sSourceObject = sTempSourceObject; } + void SetDatabaseName(const OUString sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } + void SetConnectionResource(const OUString sTempConRes) { sConnectionResource = sTempConRes; } + void SetSourceObject(const OUString sTempSourceObject) { sSourceObject = sTempSourceObject; } void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } void SetNative(const bool bTempNative) { bNative = bTempNative; } void SetSubTotalsBindFormatsToContent(const bool bTemp ) { bSubTotalsBindFormatsToContent = bTemp; } @@ -142,7 +142,7 @@ public: class ScXMLSourceSQLContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -150,7 +150,7 @@ class ScXMLSourceSQLContext : public SvXMLImportContext public: ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -158,7 +158,7 @@ public: virtual ~ScXMLSourceSQLContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -168,7 +168,7 @@ public: class ScXMLSourceTableContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -176,7 +176,7 @@ class ScXMLSourceTableContext : public SvXMLImportContext public: ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -184,7 +184,7 @@ public: virtual ~ScXMLSourceTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -194,7 +194,7 @@ public: class ScXMLSourceQueryContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -202,7 +202,7 @@ class ScXMLSourceQueryContext : public SvXMLImportContext public: ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -210,7 +210,7 @@ public: virtual ~ScXMLSourceQueryContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -227,7 +227,7 @@ class ScXMLConResContext : public SvXMLImportContext public: ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -235,7 +235,7 @@ public: virtual ~ScXMLConResContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -252,7 +252,7 @@ class ScXMLSubTotalRulesContext : public SvXMLImportContext public: ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -260,7 +260,7 @@ public: virtual ~ScXMLSubTotalRulesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -277,7 +277,7 @@ class ScXMLSortGroupsContext : public SvXMLImportContext public: ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -285,7 +285,7 @@ public: virtual ~ScXMLSortGroupsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -303,7 +303,7 @@ class ScXMLSubTotalRuleContext : public SvXMLImportContext public: ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -311,7 +311,7 @@ public: virtual ~ScXMLSubTotalRuleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -325,8 +325,8 @@ public: class ScXMLSubTotalFieldContext : public SvXMLImportContext { ScXMLSubTotalRuleContext* pSubTotalRuleContext; - rtl::OUString sFieldNumber; - rtl::OUString sFunction; + OUString sFieldNumber; + OUString sFunction; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -334,7 +334,7 @@ class ScXMLSubTotalFieldContext : public SvXMLImportContext public: ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSubTotalRuleContext* pSubTotalRuleContext); @@ -342,7 +342,7 @@ public: virtual ~ScXMLSubTotalFieldContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 358172ab951b..ec3a741bab32 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -152,8 +152,6 @@ using namespace formula; using namespace com::sun::star; using namespace xmloff::token; using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; @@ -215,13 +213,13 @@ OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos ) OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_getImplementationName() ); - return uno::Sequence< rtl::OUString >( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_getImplementationName() ); + return uno::Sequence< OUString >( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( @@ -232,13 +230,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLMetaExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLMetaExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Meta_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Meta_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( @@ -249,13 +247,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLStylesExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLStylesExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Styles_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Styles_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( @@ -266,13 +264,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLContentExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLContentExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Content_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Content_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance( @@ -283,13 +281,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Settings_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Settings_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance( @@ -302,13 +300,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstanc OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -320,13 +318,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance( OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Meta_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Meta_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -338,13 +336,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance( OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Styles_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Styles_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -356,13 +354,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstanc OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Content_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Content_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -374,13 +372,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstan OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Settings_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Settings_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -411,7 +409,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap if( xShapeProp.is() ) { sal_Int16 nLayerID = 0; - if( (xShapeProp->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) + if( (xShapeProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) GetExport().AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_BACKGROUND, XML_TRUE); } } @@ -422,12 +420,12 @@ sal_Int16 ScXMLExport::GetFieldUnit() { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xProperties( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ), + OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ), com::sun::star::uno::UNO_QUERY); if (xProperties.is()) { sal_Int16 nFieldUnit = 0; - if (xProperties->getPropertyValue(rtl::OUString("Metric")) >>= nFieldUnit) + if (xProperties->getPropertyValue(OUString("Metric")) >>= nFieldUnit) return nFieldUnit; } return 0; @@ -494,21 +492,21 @@ ScXMLExport::ScXMLExport( xRowStylesExportPropertySetMapper = new ScXMLRowExportPropertyMapper(xRowStylesPropertySetMapper); xTableStylesExportPropertySetMapper = new ScXMLTableExportPropertyMapper(xTableStylesPropertySetMapper); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), - xCellStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), - xColumnStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), - xRowStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), - xTableStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), + xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), + xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), + xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), + xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) { // This name is reserved for the external ref cache tables. This // should not conflict with user-defined styles since this name is // used for a table style which is not available in the UI. - sExternalRefTabStyleName = rtl::OUString("ta_extref"); + sExternalRefTabStyleName = OUString("ta_extref"); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sExternalRefTabStyleName); sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME)); @@ -803,11 +801,11 @@ void ScXMLExport::_ExportMeta() CollectSharedData(nTableCount, nShapesCount); uno::Sequence<beans::NamedValue> stats(3); - stats[0] = beans::NamedValue(::rtl::OUString("TableCount"), + stats[0] = beans::NamedValue(OUString("TableCount"), uno::makeAny(nTableCount)); - stats[1] = beans::NamedValue(::rtl::OUString("CellCount"), + stats[1] = beans::NamedValue(OUString("CellCount"), uno::makeAny(nCellCount)); - stats[2] = beans::NamedValue(::rtl::OUString("ObjectCount"), + stats[2] = beans::NamedValue(OUString("ObjectCount"), uno::makeAny(nShapesCount)); // update document statistics at the model @@ -1150,7 +1148,7 @@ void ScXMLExport::WriteRowContent() AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(nPrevValidationIndex)); if (nCols > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nCols); AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } @@ -1174,7 +1172,7 @@ void ScXMLExport::WriteRowContent() AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(nPrevValidationIndex)); if (nCols > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nCols); AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } @@ -1196,7 +1194,7 @@ void ScXMLExport::WriteRowStartTag( } if (nEqualRows > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nEqualRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, aBuf.makeStringAndClear()); } @@ -1448,7 +1446,7 @@ void ScXMLExport::ExportFormatRanges(const sal_Int32 nStartCol, const sal_Int32 void ScXMLExport::GetColumnRowHeader(bool& rHasColumnHeader, table::CellRangeAddress& rColumnHeaderRange, bool& rHasRowHeader, table::CellRangeAddress& rRowHeaderRange, - rtl::OUString& rPrintRanges) const + OUString& rPrintRanges) const { uno::Reference <sheet::XPrintAreas> xPrintAreas (xCurrentTable, uno::UNO_QUERY); if (xPrintAreas.is()) @@ -1506,7 +1504,7 @@ void ScXMLExport::SetBodyAttributes() if (pDoc && pDoc->IsDocProtected()) { AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; uno::Sequence<sal_Int8> aPassHash; ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED; const ScDocProtection* p = pDoc->GetDocProtection(); @@ -1628,7 +1626,7 @@ void ScXMLExport::CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset if ( getExportFlags() & EXPORT_PRETTY ) { - const rtl::OString aOutStr("\n "); + const OString aOutStr("\n "); uno::Sequence<sal_Int8> aOutSeq( (sal_Int8*)aOutStr.getStr(), aOutStr.getLength() ); xDestStream->writeBytes( aOutSeq ); } @@ -1751,15 +1749,15 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) sal_Int32 nShapesCount(0); CollectSharedData(nTableCount, nShapesCount); } - ScXMLStyleExport aStylesExp(*this, rtl::OUString(), GetAutoStylePool().get()); + ScXMLStyleExport aStylesExp(*this, OUString(), GetAutoStylePool().get()); if (GetModel().is()) { uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) - aStylesExp.exportDefaultStyle(xProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); + aStylesExp.exportDefaultStyle(xProperties, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); if (pSharedData->HasShapes()) { GetShapeExport()->ExportGraphicDefaults(); @@ -1771,11 +1769,11 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference <container::XNameAccess> xStylesFamilies(xStyleFamiliesSupplier->getStyleFamilies()); if (xStylesFamilies.is()) { - uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(rtl::OUString("CellStyles")), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(OUString("CellStyles")), uno::UNO_QUERY); if (xCellStyles.is()) { sal_Int32 nCount(xCellStyles->getCount()); - rtl::OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); for (sal_Int32 i = 0; i < nCount; ++i) { uno::Reference <beans::XPropertySet> xCellProperties(xCellStyles->getByIndex(i), uno::UNO_QUERY); @@ -1792,23 +1790,23 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) } exportDataStyles(); - aStylesExp.exportStyleFamily(rtl::OUString("CellStyles"), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); + aStylesExp.exportStyleFamily(OUString("CellStyles"), + OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); SvXMLExport::_ExportStyles(bUsed); } void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& xProperties, const uno::Reference<sheet::XSpreadsheet>& xTable, - sal_Int32 nTable, const rtl::OUString* pOldName) + sal_Int32 nTable, const OUString* pOldName) { //! pass xCellRanges instead uno::Reference<sheet::XSheetCellRanges> xCellRanges( xProperties, uno::UNO_QUERY ); - rtl::OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); - rtl::OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); + OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); - rtl::OUString sStyleName; + OUString sStyleName; sal_Int32 nNumberFormat(-1); sal_Int32 nValidationIndex(-1); std::vector< XMLPropertyState > xPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties )); @@ -1877,18 +1875,18 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_CELL, *pOldName); // add to pCellStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); if (!pCellStyles->AddStyleName(pTemp, nIndex)) delete pTemp; } } else { - rtl::OUString sName; + OUString sName; bool bIsAutoStyle(true); if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); if (!pCellStyles->AddStyleName(pTemp, nIndex)) delete pTemp; } @@ -1910,7 +1908,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x } else { - rtl::OUString* pTemp(new rtl::OUString(EncodeStyleName(sStyleName))); + OUString* pTemp(new OUString(EncodeStyleName(sStyleName))); sal_Int32 nIndex(0); if (!pCellStyles->AddStyleName(pTemp, nIndex, false)) { @@ -1939,9 +1937,9 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x } void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& xColumnProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) + const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) { - rtl::OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); + OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties)); if(!xPropStates.empty()) @@ -1958,23 +1956,23 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& ++aItr; } - rtl::OUString sParent; + OUString sParent; if (pOldName) { if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_COLUMN, *pOldName); // add to pColumnStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); rIndex = pColumnStyles->AddStyleName(pTemp); } } else { - rtl::OUString sName; + OUString sName; if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); rIndex = pColumnStyles->AddStyleName(pTemp); } else @@ -1984,30 +1982,30 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& } void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRowProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex) + const OUString* pOldName, sal_Int32& rIndex) { - rtl::OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); + OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties)); if(!xPropStates.empty()) { - rtl::OUString sParent; + OUString sParent; if (pOldName) { if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_ROW, *pOldName); // add to pRowStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); rIndex = pRowStyles->AddStyleName(pTemp); } } else { - rtl::OUString sName; + OUString sName; if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); rIndex = pRowStyles->AddStyleName(pTemp); } else @@ -2153,8 +2151,8 @@ void ScXMLExport::_ExportAutoStyles() if (xTableProperties.is()) { std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); - rtl::OUString sParent; - rtl::OUString sName( aTableIter->maName ); + OUString sParent; + OUString sName( aTableIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sName); } @@ -2191,8 +2189,8 @@ void ScXMLExport::_ExportAutoStyles() if ( !aNoteIter->maStyleName.isEmpty() ) { std::vector<XMLPropertyState> xPropStates(xShapeMapper->Filter(xShapeProperties)); - rtl::OUString sParent; - rtl::OUString sName( aNoteIter->maStyleName ); + OUString sParent; + OUString sName( aNoteIter->maStyleName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_SD_GRAPHICS_ID, sName); } @@ -2200,8 +2198,8 @@ void ScXMLExport::_ExportAutoStyles() { std::vector<XMLPropertyState> xPropStates( GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter(xShapeProperties)); - rtl::OUString sParent; - rtl::OUString sName( aNoteIter->maTextStyle ); + OUString sParent; + OUString sName( aNoteIter->maTextStyle ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName); } @@ -2236,8 +2234,8 @@ void ScXMLExport::_ExportAutoStyles() if ( xParaProp.is() ) { std::vector<XMLPropertyState> xPropStates(xParaPropMapper->Filter(xParaProp)); - rtl::OUString sParent; - rtl::OUString sName( aNoteParaIter->maName ); + OUString sParent; + OUString sName( aNoteParaIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName); } @@ -2273,8 +2271,8 @@ void ScXMLExport::_ExportAutoStyles() pCursor->SetSelection( aNoteTextIter->maSelection ); std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp)); - rtl::OUString sParent; - rtl::OUString sName( aNoteTextIter->maName ); + OUString sParent; + OUString sName( aNoteTextIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName); } @@ -2307,8 +2305,8 @@ void ScXMLExport::_ExportAutoStyles() pCursor->SetSelection( aTextIter->maSelection ); std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp)); - rtl::OUString sParent; - rtl::OUString sName( aTextIter->maName ); + OUString sParent; + OUString sName( aTextIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName); } @@ -2345,8 +2343,8 @@ void ScXMLExport::_ExportAutoStyles() std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); if(!xPropStates.empty()) { - rtl::OUString sParent; - rtl::OUString sName; + OUString sParent; + OUString sName; GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates); aTableStyles.push_back(sName); } @@ -2661,7 +2659,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe return; nCurrentTable = sal::static_int_cast<sal_uInt16>( nTable ); - rtl::OUString sOUTableName(xName->getName()); + OUString sOUTableName(xName->getName()); AddAttribute(sAttrName, sOUTableName); AddAttribute(sAttrStyleName, aTableStyles[nTable]); @@ -2675,7 +2673,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe pProtect = pDoc->GetTabProtection(nTable); if (pProtect) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED; if (pProtect->hasPasswordHash(PASSHASH_SHA1)) { @@ -2710,7 +2708,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe } } } - rtl::OUString sPrintRanges; + OUString sPrintRanges; table::CellRangeAddress aColumnHeaderRange; bool bHasColumnHeader; GetColumnRowHeader(bHasColumnHeader, aColumnHeaderRange, bHasRowHeader, aRowHeaderRange, sPrintRanges); @@ -2727,7 +2725,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe if (pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS)) AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE); - rtl::OUString aElemName = GetNamespaceMap().GetQNameByKey( + OUString aElemName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_PROTECTION)); SvXMLElementExport aElemProtected(*this, aElemName, true, true); @@ -2862,8 +2860,8 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { sal_Int32 nColumns(aCell.aMatrixRange.EndColumn - aCell.aMatrixRange.StartColumn + 1); sal_Int32 nRows(aCell.aMatrixRange.EndRow - aCell.aMatrixRange.StartRow + 1); - rtl::OUStringBuffer sColumns; - rtl::OUStringBuffer sRows; + OUStringBuffer sColumns; + OUStringBuffer sRows; ::sax::Converter::convertNumber(sColumns, nColumns); ::sax::Converter::convertNumber(sRows, nRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_COLUMNS_SPANNED, sColumns.makeStringAndClear()); @@ -2892,7 +2890,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { if (GetCellText(aCell, aCellPos)) { - rtl::OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); + OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( sFormula, aCell.sStringValue, true, true); } @@ -2904,14 +2902,14 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) aCellVal.assign(*pDoc, aCellPos); if (aCellVal.meType == CELLTYPE_FORMULA) { - rtl::OUStringBuffer sFormula; + OUStringBuffer sFormula; ScFormulaCell* pFormulaCell = aCellVal.mpFormula; if (!bIsMatrix || (bIsMatrix && bIsFirstMatrixCell)) { const formula::FormulaGrammar::Grammar eGrammar = pDoc->GetStorageGrammar(); sal_uInt16 nNamespacePrefix = (eGrammar == formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC); pFormulaCell->GetFormula(sFormula, eGrammar); - rtl::OUString sOUFormula(sFormula.makeStringAndClear()); + OUString sOUFormula(sFormula.makeStringAndClear()); if (!bIsMatrix) { AddAttribute(sAttrFormula, GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sOUFormula, false )); @@ -2924,7 +2922,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) if (pFormulaCell->IsValue()) { bool bIsStandard; - rtl::OUString sCurrency; + OUString sCurrency; GetNumberFormatAttributesExportHelper()->GetCellType(aCell.nNumberFormat, sCurrency, bIsStandard); if (bIsStandard) { @@ -2957,7 +2955,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) // added to avoid warnings } } - rtl::OUString* pCellString(&sElemCell); + OUString* pCellString(&sElemCell); if (aCell.bIsCovered) { pCellString = &sElemCoveredCell; @@ -2968,8 +2966,8 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { sal_Int32 nColumns(aCell.aMergeRange.EndColumn - aCell.aMergeRange.StartColumn + 1); sal_Int32 nRows(aCell.aMergeRange.EndRow - aCell.aMergeRange.StartRow + 1); - rtl::OUStringBuffer sColumns; - rtl::OUStringBuffer sRows; + OUStringBuffer sColumns; + OUStringBuffer sRows; ::sax::Converter::convertNumber(sColumns, nColumns); ::sax::Converter::convertNumber(sRows, nRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED, sColumns.makeStringAndClear()); @@ -3011,31 +3009,31 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY ); bool bIsChart( false ); - rtl::OUString sPropCLSID ("CLSID"); - rtl::OUString sPropModel ("Model"); - rtl::OUString sPersistName ("PersistName"); + OUString sPropCLSID ("CLSID"); + OUString sPropModel ("Model"); + OUString sPersistName ("PersistName"); if (xShapeProps.is()) { sal_Int32 nZOrder = 0; - if (xShapeProps->getPropertyValue(rtl::OUString("ZOrder")) >>= nZOrder) + if (xShapeProps->getPropertyValue(OUString("ZOrder")) >>= nZOrder) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nZOrder); AddAttribute(XML_NAMESPACE_DRAW, XML_ZINDEX, sBuffer.makeStringAndClear()); } uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xShapeProps->getPropertySetInfo(); if( xPropSetInfo->hasPropertyByName( sPropCLSID ) ) { - rtl::OUString sCLSID; + OUString sCLSID; if (xShapeProps->getPropertyValue( sPropCLSID ) >>= sCLSID) { if ( sCLSID.equalsIgnoreAsciiCase(GetChartExport()->getChartCLSID()) ) { // we have a chart - ::rtl::OUString sRanges; + OUString sRanges; if ( pDoc ) { - ::rtl::OUString aChartName; + OUString aChartName; xShapeProps->getPropertyValue( sPersistName ) >>= aChartName; ScChartListenerCollection* pCollection = pDoc->GetChartListenerCollection(); if (pCollection) @@ -3076,7 +3074,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { // we have a chart that gets its data from Calc bIsChart = true; - uno::Sequence< ::rtl::OUString > aRepresentations( + uno::Sequence< OUString > aRepresentations( xReceiver->getUsedRangeRepresentations()); SvXMLAttributeList* pAttrList = 0; if(aRepresentations.getLength()) @@ -3101,12 +3099,12 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, if (!bIsChart) { // #i66550 HLINK_FOR_SHAPES - rtl::OUString sHlink; + OUString sHlink; try { uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink; + xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink; } catch ( const beans::UnknownPropertyException& ) { @@ -3160,10 +3158,10 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell) aPoint.X = 2 * aItr->xShape->getPosition().X + aItr->xShape->getSize().Width - aPoint.X; if ( !aItr->xShape->getShapeType().equals(sCaptionShape) ) { - rtl::OUString sEndAddress; + OUString sEndAddress; ScRangeStringConverter::GetStringFromAddress(sEndAddress, aItr->aEndAddress, pDoc, FormulaGrammar::CONV_OOO); AddAttribute(XML_NAMESPACE_TABLE, XML_END_CELL_ADDRESS, sEndAddress); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; GetMM100UnitConverter().convertMeasureToXML( sBuffer, aItr->nEndX); AddAttribute(XML_NAMESPACE_TABLE, XML_END_X, sBuffer.makeStringAndClear()); @@ -3237,7 +3235,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > { if (pCurrentCell && pCurrentCell->xNoteShape.is() && pCurrentCell->xNoteShape.get() == xShape.get() && pCurrentCell->xAnnotation.is()) { - rtl::OUString sAuthor(pCurrentCell->xAnnotation->getAuthor()); + OUString sAuthor(pCurrentCell->xAnnotation->getAuthor()); if (!sAuthor.isEmpty()) { SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, @@ -3254,7 +3252,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > sal_uInt32 nfIndex = pNumForm->GetFormatIndex(NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM); if (pNumForm->IsNumberFormat(aDate, nfIndex, fDate)) { - rtl::OUStringBuffer sBuf; + OUStringBuffer sBuf; GetMM100UnitConverter().convertDateTime(sBuf, fDate,true); SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, true, @@ -3266,7 +3264,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > SvXMLElementExport aDateElem( *this, XML_NAMESPACE_META, XML_DATE_STRING, true, false ); - Characters(rtl::OUString(aDate)); + Characters(OUString(aDate)); } } else @@ -3274,7 +3272,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > SvXMLElementExport aDateElem( *this, XML_NAMESPACE_META, XML_DATE_STRING, true, false ); - Characters(rtl::OUString(aDate)); + Characters(OUString(aDate)); } } } @@ -3507,19 +3505,19 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads uno::Reference<beans::XPropertySet> xPropertySet(xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); - bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); - bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); - bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); - bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); - bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); + bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); + bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); + bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); + bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); + bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); + bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); sal_uInt16 nYear2000 (pDoc ? pDoc->GetDocOptions().GetYear2000() : 0); sal_Int32 nIterationCount(100); - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; double fIterationEpsilon = 0; - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON))) >>= fIterationEpsilon; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON))) >>= fIterationEpsilon; util::Date aNullDate; - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE))) >>= aNullDate; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE))) >>= aNullDate; if (bCalcAsShown || bIgnoreCase || !bLookUpLabels || !bMatchWholeCell || !bUseRegularExpressions || bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) || aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930) @@ -3536,7 +3534,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads AddAttribute(XML_NAMESPACE_TABLE, XML_USE_REGULAR_EXPRESSIONS, XML_FALSE); if (nYear2000 != 1930) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nYear2000); AddAttribute(XML_NAMESPACE_TABLE, XML_NULL_YEAR, sBuffer.makeStringAndClear()); } @@ -3544,14 +3542,14 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads { if (aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899) { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; GetMM100UnitConverter().convertDateTime(sDate, 0.0, aNullDate); AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_VALUE, sDate.makeStringAndClear()); SvXMLElementExport aElemNullDate(*this, XML_NAMESPACE_TABLE, XML_NULL_DATE, true, true); } if (bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001)) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; if (bIsIterationEnabled) AddAttribute(XML_NAMESPACE_TABLE, XML_STATUS, XML_ENABLE); if (nIterationCount != 100) @@ -3581,11 +3579,11 @@ void ScXMLExport::WriteTableSource() sheet::SheetLinkMode nMode (xLinkable->getLinkMode()); if (nMode != sheet::SheetLinkMode_NONE) { - rtl::OUString sLink (xLinkable->getLinkUrl()); + OUString sLink (xLinkable->getLinkUrl()); uno::Reference <beans::XPropertySet> xProps (GetModel(), uno::UNO_QUERY); if (xProps.is()) { - uno::Reference <container::XIndexAccess> xIndex(xProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETLINKS))), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xIndex(xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETLINKS))), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount(xIndex->getCount()); @@ -3598,20 +3596,20 @@ void ScXMLExport::WriteTableSource() xLinkProps.set(xIndex->getByIndex(i), uno::UNO_QUERY); if (xLinkProps.is()) { - rtl::OUString sNewLink; - if (xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_LINKURL))) >>= sNewLink) + OUString sNewLink; + if (xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_LINKURL))) >>= sNewLink) bFound = sLink.equals(sNewLink); } } if (bFound && xLinkProps.is()) { - rtl::OUString sFilter; - rtl::OUString sFilterOptions; - rtl::OUString sTableName (xLinkable->getLinkSheetName()); + OUString sFilter; + OUString sFilterOptions; + OUString sTableName (xLinkable->getLinkSheetName()); sal_Int32 nRefresh(0); - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTER))) >>= sFilter; - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTOPT))) >>= sFilterOptions; - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_REFDELAY))) >>= nRefresh; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTER))) >>= sFilter; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTOPT))) >>= sFilterOptions; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_REFDELAY))) >>= nRefresh; if (!sLink.isEmpty()) { AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE); @@ -3626,7 +3624,7 @@ void ScXMLExport::WriteTableSource() AddAttribute(XML_NAMESPACE_TABLE, XML_MODE, XML_COPY_RESULTS_ONLY); if( nRefresh ) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration( sBuffer, (double)nRefresh / 86400 ); AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sBuffer.makeStringAndClear() ); @@ -3646,13 +3644,13 @@ void ScXMLExport::WriteScenario() { if (pDoc && pDoc->IsScenario(static_cast<SCTAB>(nCurrentTable))) { - rtl::OUString sComment; + OUString sComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData(static_cast<SCTAB>(nCurrentTable), sComment, aColor, nFlags); if (!(nFlags & SC_SCENARIO_SHOWFRAME)) AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_FALSE); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, aColor.GetColor()); AddAttribute(XML_NAMESPACE_TABLE, XML_BORDER_COLOR, aBuffer.makeStringAndClear()); if (!(nFlags & SC_SCENARIO_TWOWAY)) @@ -3667,7 +3665,7 @@ void ScXMLExport::WriteScenario() pDoc->IsActiveScenario(static_cast<SCTAB>(nCurrentTable))); AddAttribute(XML_NAMESPACE_TABLE, XML_IS_ACTIVE, aBuffer.makeStringAndClear()); const ScRangeList* pRangeList = pDoc->GetScenarioRanges(static_cast<SCTAB>(nCurrentTable)); - rtl::OUString sRangeListStr; + OUString sRangeListStr; ScRangeStringConverter::GetStringFromRangeList( sRangeListStr, pRangeList, pDoc, FormulaGrammar::CONV_OOO ); AddAttribute(XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, sRangeListStr); if (!sComment.isEmpty()) @@ -3737,23 +3735,23 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) { AddAttribute(sAttrName, it->second->GetName()); - rtl::OUString sBaseCellAddress; + OUString sBaseCellAddress; ScRangeStringConverter::GetStringFromAddress( sBaseCellAddress, it->second->GetPos(), pDoc, FormulaGrammar::CONV_OOO, ' ', false, SCA_ABS_3D); AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sBaseCellAddress); String sSymbol; it->second->GetSymbol(sSymbol, pDoc->GetStorageGrammar()); - rtl::OUString sTempSymbol(sSymbol); + OUString sTempSymbol(sSymbol); ScRange aRange; if (it->second->IsReference(aRange)) { - rtl::OUString sContent(sTempSymbol.copy(1, sTempSymbol.getLength() -2 )); + OUString sContent(sTempSymbol.copy(1, sTempSymbol.getLength() -2 )); AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, sContent); sal_Int32 nRangeType = it->second->GetUnoType(); - rtl::OUStringBuffer sBufferRangeType; + OUStringBuffer sBufferRangeType; if ((nRangeType & sheet::NamedRangeFlag::COLUMN_HEADER) == sheet::NamedRangeFlag::COLUMN_HEADER) sBufferRangeType.append(GetXMLToken(XML_REPEAT_COLUMN)); if ((nRangeType & sheet::NamedRangeFlag::ROW_HEADER) == sheet::NamedRangeFlag::ROW_HEADER) @@ -3774,7 +3772,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) sBufferRangeType.appendAscii(" "); sBufferRangeType.append(GetXMLToken(XML_PRINT_RANGE)); } - rtl::OUString sRangeType = sBufferRangeType.makeStringAndClear(); + OUString sRangeType = sBufferRangeType.makeStringAndClear(); if (!sRangeType.isEmpty()) AddAttribute(XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, sRangeType); SvXMLElementExport aElemNR(*this, XML_NAMESPACE_TABLE, XML_NAMED_RANGE, true, true); @@ -3790,33 +3788,33 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) namespace { -rtl::OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = true) +OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = true) { switch(rEntry.GetType()) { case COLORSCALE_MIN: - return rtl::OUString("minimum"); + return OUString("minimum"); case COLORSCALE_MAX: - return rtl::OUString("maximum"); + return OUString("maximum"); case COLORSCALE_PERCENT: - return rtl::OUString("percent"); + return OUString("percent"); case COLORSCALE_PERCENTILE: - return rtl::OUString("percentile"); + return OUString("percentile"); case COLORSCALE_FORMULA: - return rtl::OUString("formula"); + return OUString("formula"); case COLORSCALE_VALUE: - return rtl::OUString("number"); + return OUString("number"); case COLORSCALE_AUTO: // only important for data bars if(bFirst) - return rtl::OUString("auto-minimum"); + return OUString("auto-minimum"); else - return rtl::OUString("auto-maximum"); + return OUString("auto-maximum"); } - return rtl::OUString(); + return OUString(); } -rtl::OUString getIconSetName(ScIconSetType eType) +OUString getIconSetName(ScIconSetType eType) { const char* pName = NULL; ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap(); @@ -3829,42 +3827,42 @@ rtl::OUString getIconSetName(ScIconSetType eType) } } assert(pName); - return rtl::OUString::createFromAscii(pName); + return OUString::createFromAscii(pName); } -rtl::OUString getDateStringForType(condformat::ScCondFormatDateType eType) +OUString getDateStringForType(condformat::ScCondFormatDateType eType) { switch(eType) { case condformat::TODAY: - return rtl::OUString("today"); + return OUString("today"); case condformat::YESTERDAY: - return rtl::OUString("yesterday"); + return OUString("yesterday"); case condformat::TOMORROW: - return rtl::OUString("tomorrow"); + return OUString("tomorrow"); case condformat::LAST7DAYS: - return rtl::OUString("last-7-days"); + return OUString("last-7-days"); case condformat::THISWEEK: - return rtl::OUString("this-week"); + return OUString("this-week"); case condformat::LASTWEEK: - return rtl::OUString("last-week"); + return OUString("last-week"); case condformat::NEXTWEEK: - return rtl::OUString("next-week"); + return OUString("next-week"); case condformat::THISMONTH: - return rtl::OUString("this-month"); + return OUString("this-month"); case condformat::LASTMONTH: - return rtl::OUString("last-month"); + return OUString("last-month"); case condformat::NEXTMONTH: - return rtl::OUString("next-month"); + return OUString("next-month"); case condformat::THISYEAR: - return rtl::OUString("this-year"); + return OUString("this-year"); case condformat::LASTYEAR: - return rtl::OUString("last-year"); + return OUString("last-year"); case condformat::NEXTYEAR: - return rtl::OUString("next-year"); + return OUString("next-year"); } - return rtl::OUString(); + return OUString(); } } @@ -3884,7 +3882,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) for(ScConditionalFormatList::const_iterator itr = pCondFormatList->begin(); itr != pCondFormatList->end(); ++itr) { - rtl::OUString sRanges; + OUString sRanges; const ScRangeList& rRangeList = itr->GetRange(); ScRangeStringConverter::GetStringFromRangeList( sRanges, &rRangeList, pDoc, formula::FormulaGrammar::CONV_ODF ); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TARGET_RANGE_ADDRESS, sRanges); @@ -3896,7 +3894,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) if(pFormatEntry->GetType()==condformat::CONDITION) { const ScCondFormatEntry* pEntry = static_cast<const ScCondFormatEntry*>(pFormatEntry); - rtl::OUStringBuffer aCond; + OUStringBuffer aCond; ScAddress aPos = pEntry->GetSrcPos(); switch(pEntry->GetOperation()) { @@ -3925,14 +3923,14 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); break; case SC_COND_BETWEEN: - aCond.append(rtl::OUString("between(")); + aCond.append(OUString("between(")); aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(','); aCond.append(pEntry->GetExpression(aPos, 1, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(')'); break; case SC_COND_NOTBETWEEN: - aCond.append(rtl::OUString("not-between(")); + aCond.append(OUString("not-between(")); aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(','); aCond.append(pEntry->GetExpression(aPos, 1, 0, formula::FormulaGrammar::GRAM_ODFF)); @@ -4012,11 +4010,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) default: SAL_WARN("sc", "unimplemented conditional format export"); } - rtl::OUString sStyle = pEntry->GetStyle(); + OUString sStyle = pEntry->GetStyle(); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_APPLY_STYLE_NAME, sStyle); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, aCond.makeStringAndClear()); - rtl::OUString sBaseAddress; + OUString sBaseAddress; ScRangeStringConverter::GetStringFromAddress( sBaseAddress, aPos, pDoc,formula::FormulaGrammar::CONV_ODF ); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_BASE_CELL_ADDRESS, sBaseAddress); SvXMLElementExport aElementCondEntry(*this, XML_NAMESPACE_CALC_EXT, XML_CONDITION, true, true); @@ -4030,14 +4028,14 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(it->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(it->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it)); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, it->GetColor().GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_COLOR, aBuffer.makeStringAndClear()); SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE_ENTRY, true, true); @@ -4055,13 +4053,13 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpNegativeColor) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, pFormatData->mpNegativeColor->GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, aBuffer.makeStringAndClear()); } else { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, Color(COL_LIGHTRED).GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, aBuffer.makeStringAndClear()); } @@ -4071,19 +4069,19 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->meAxisPosition == databar::NONE) { - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, rtl::OUString("none")); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, OUString("none")); } else { - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, rtl::OUString("middle")); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, OUString("middle")); } } - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, pFormatData->maPositiveColor.GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_POSITIVE_COLOR, aBuffer.makeStringAndClear()); - aBuffer = rtl::OUStringBuffer(); + aBuffer = OUStringBuffer(); ::sax::Converter::convertColor(aBuffer, pFormatData->maAxisColor.GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_COLOR, aBuffer.makeStringAndClear()); SvXMLElementExport aElementDataBar(*this, XML_NAMESPACE_CALC_EXT, XML_DATA_BAR, true, true); @@ -4091,11 +4089,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpLowerLimit->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = pFormatData->mpLowerLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = pFormatData->mpLowerLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(pFormatData->mpLowerLimit->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpLowerLimit->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit, true)); SvXMLElementExport aElementDataBarEntryLower(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); } @@ -4103,11 +4101,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpUpperLimit->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = pFormatData->mpUpperLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = pFormatData->mpUpperLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(pFormatData->mpUpperLimit->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpUpperLimit->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpUpperLimit, false)); SvXMLElementExport aElementDataBarEntryUpper(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); } @@ -4115,7 +4113,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) else if(pFormatEntry->GetType() == condformat::ICONSET) { const ScIconSetFormat& mrIconSet = static_cast<const ScIconSetFormat&>(*pFormatEntry); - rtl::OUString aIconSetName = getIconSetName(mrIconSet.GetIconSetData()->eIconSetType); + OUString aIconSetName = getIconSetName(mrIconSet.GetIconSetData()->eIconSetType); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_ICON_SET_TYPE, aIconSetName ); SvXMLElementExport aElementColorScale(*this, XML_NAMESPACE_CALC_EXT, XML_ICON_SET, true, true); if(!mrIconSet.GetIconSetData()->mbShowValue) @@ -4125,11 +4123,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(it->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(it->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it)); SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); @@ -4138,7 +4136,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) else if(pFormatEntry->GetType() == condformat::DATE) { const ScCondDateFormatEntry& mrDateFormat = static_cast<const ScCondDateFormatEntry&>(*pFormatEntry); - rtl::OUString aDateType = getDateStringForType(mrDateFormat.GetDateType()); + OUString aDateType = getDateStringForType(mrDateFormat.GetDateType()); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE, mrDateFormat.GetStyleName()); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_DATE, aDateType); SvXMLElementExport aElementDateFormat(*this, XML_NAMESPACE_CALC_EXT, XML_DATE_IS, true, true); @@ -4420,39 +4418,39 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue> beans::PropertyValue* pChangeProps(aChangeProps.getArray()); if (pChangeProps) { - pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString("ShowChanges"); + pChangeProps[SC_SHOW_CHANGES].Name = OUString("ShowChanges"); pChangeProps[SC_SHOW_CHANGES].Value <<= pViewSettings->ShowChanges(); - pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString("ShowAcceptedChanges"); + pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = OUString("ShowAcceptedChanges"); pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Value <<= pViewSettings->IsShowAccepted(); - pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString("ShowRejectedChanges"); + pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = OUString("ShowRejectedChanges"); pChangeProps[SC_SHOW_REJECTED_CHANGES].Value <<= pViewSettings->IsShowRejected(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString("ShowChangesByDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = OUString("ShowChangesByDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Value <<= pViewSettings->HasDate(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString("ShowChangesByDatetimeMode"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = OUString("ShowChangesByDatetimeMode"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Value <<= static_cast<sal_Int16>(pViewSettings->GetTheDateMode()); util::DateTime aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheFirstDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeFirstDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = OUString("ShowChangesByDatetimeFirstDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Value <<= aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheLastDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeSecondDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = OUString("ShowChangesByDatetimeSecondDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Value <<= aDateTime; - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString("ShowChangesByAuthor"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = OUString("ShowChangesByAuthor"); pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Value <<= pViewSettings->HasAuthor(); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString("ShowChangesByAuthorName"); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= rtl::OUString (pViewSettings->GetTheAuthorToShow()); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString("ShowChangesByComment"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = OUString("ShowChangesByAuthorName"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= OUString (pViewSettings->GetTheAuthorToShow()); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = OUString("ShowChangesByComment"); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Value <<= pViewSettings->HasComment(); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString("ShowChangesByCommentText"); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= rtl::OUString (pViewSettings->GetTheComment()); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString("ShowChangesByRanges"); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = OUString("ShowChangesByCommentText"); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= OUString (pViewSettings->GetTheComment()); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = OUString("ShowChangesByRanges"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange(); - rtl::OUString sRangeList; + OUString sRangeList; ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), FormulaGrammar::CONV_OOO); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString("ShowChangesByRangesList"); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = OUString("ShowChangesByRangesList"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Value <<= sRangeList; - pProps[nChangePos].Name = rtl::OUString("TrackedChangesViewSettings"); + pProps[nChangePos].Name = OUString("TrackedChangesViewSettings"); pProps[nChangePos].Value <<= aChangeProps; } } @@ -4475,13 +4473,13 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) { Rectangle aRect(pEmbeddedObj->GetVisArea()); sal_uInt16 i(0); - pProps[i].Name = rtl::OUString("VisibleAreaTop"); + pProps[i].Name = OUString("VisibleAreaTop"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getY()); - pProps[++i].Name = rtl::OUString("VisibleAreaLeft"); + pProps[++i].Name = OUString("VisibleAreaLeft"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getX()); - pProps[++i].Name = rtl::OUString("VisibleAreaWidth"); + pProps[++i].Name = OUString("VisibleAreaWidth"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth()); - pProps[++i].Name = rtl::OUString("VisibleAreaHeight"); + pProps[++i].Name = OUString("VisibleAreaHeight"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight()); } } @@ -4500,12 +4498,12 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(rProps, xProperties); sal_Int32 nPropsToAdd = 0; - rtl::OUStringBuffer aTrackedChangesKey; + OUStringBuffer aTrackedChangesKey; if (GetDocument() && GetDocument()->GetChangeTrack() && GetDocument()->GetChangeTrack()->IsProtected()) { ::sax::Converter::encodeBase64(aTrackedChangesKey, @@ -4536,19 +4534,19 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& rProps.realloc(nCount + nPropsToAdd); if (aTrackedChangesKey.getLength()) { - rProps[nCount].Name = rtl::OUString("TrackedChangesProtectionKey"); + rProps[nCount].Name = OUString("TrackedChangesProtectionKey"); rProps[nCount].Value <<= aTrackedChangesKey.makeStringAndClear(); ++nCount; } if( bVBACompat ) { - rProps[nCount].Name = rtl::OUString("VBACompatibilityMode"); + rProps[nCount].Name = OUString("VBACompatibilityMode"); rProps[nCount].Value <<= bVBACompat; ++nCount; } if( xCodeNameAccess.is() ) { - rProps[nCount].Name = rtl::OUString("ScriptConfiguration"); + rProps[nCount].Name = OUString("ScriptConfiguration"); rProps[nCount].Value <<= xCodeNameAccess; ++nCount; } @@ -4734,7 +4732,7 @@ void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< :: } // XServiceInfo -::rtl::OUString SAL_CALL ScXMLExport::getImplementationName( ) +OUString SAL_CALL ScXMLExport::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4781,14 +4779,14 @@ void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< :: } } -sal_Bool SAL_CALL ScXMLExport::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ScXMLExport::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; return SvXMLExport::supportsService( ServiceName ); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScXMLExport::getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScXMLExport::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 8e66d15cefac..6cd196c40dac 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -87,7 +87,7 @@ class ScXMLExport : public SvXMLExport ScRowStyles* pRowStyles; ScFormatRangeStyles* pCellStyles; ScRowFormatRanges* pRowFormatRanges; - std::vector<rtl::OUString> aTableStyles; + std::vector<OUString> aTableStyles; com::sun::star::table::CellRangeAddress aRowHeaderRange; ScMyOpenCloseColumnRowGroup* pGroupColumns; ScMyOpenCloseColumnRowGroup* pGroupRows; @@ -99,21 +99,21 @@ class ScXMLExport : public SvXMLExport ScMyValidationsContainer* pValidationsContainer; ScMyNotEmptyCellsIterator* pCellsItr; ScChangeTrackingExportHelper* pChangeTrackingExportHelper; - const rtl::OUString sLayerID; - const rtl::OUString sCaptionShape; - rtl::OUString sExternalRefTabStyleName; - rtl::OUString sAttrName; - rtl::OUString sAttrStyleName; - rtl::OUString sAttrColumnsRepeated; - rtl::OUString sAttrFormula; - rtl::OUString sAttrValueType; - rtl::OUString sAttrStringValue; - rtl::OUString sElemCell; - rtl::OUString sElemCoveredCell; - rtl::OUString sElemCol; - rtl::OUString sElemRow; - rtl::OUString sElemTab; - rtl::OUString sElemP; + const OUString sLayerID; + const OUString sCaptionShape; + OUString sExternalRefTabStyleName; + OUString sAttrName; + OUString sAttrStyleName; + OUString sAttrColumnsRepeated; + OUString sAttrFormula; + OUString sAttrValueType; + OUString sAttrStringValue; + OUString sElemCell; + OUString sElemCoveredCell; + OUString sElemCol; + OUString sElemRow; + OUString sElemTab; + OUString sElemP; sal_Int32 nOpenRow; sal_Int32 nProgressCount; sal_uInt16 nCurrentTable; @@ -163,7 +163,7 @@ class ScXMLExport : public SvXMLExport void CloseRow(const sal_Int32 nRow); void GetColumnRowHeader(bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, - rtl::OUString& rPrintRanges) const; + OUString& rPrintRanges) const; void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); @@ -205,13 +205,13 @@ class ScXMLExport : public SvXMLExport void AddStyleFromCells( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xProperties, const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet >& xTable, - sal_Int32 nTable, const rtl::OUString* pOldName ); + sal_Int32 nTable, const OUString* pOldName ); void AddStyleFromColumn( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xColumnProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); + const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); void AddStyleFromRow( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xRowProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex ); + const OUString* pOldName, sal_Int32& rIndex ); void IncrementProgressBar(bool bEditCell, sal_Int32 nInc = 1); @@ -265,9 +265,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 4be59e1fa94d..d4ef04ef5c0e 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; @@ -54,10 +53,10 @@ ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext( sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for (sal_Int16 i = 0; i < nAttrCount; ++i) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nAttrPrefix = mrScImport.GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); if (nAttrPrefix == XML_NAMESPACE_XLINK) { if (IsXMLToken(aLocalName, XML_HREF)) @@ -182,10 +181,10 @@ ScXMLExternalRefRowContext::ScXMLExternalRefRowContext( const SvXMLTokenMap& rAttrTokenMap = mrScImport.GetTableRowAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nAttrPrefix = mrScImport.GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); switch (rAttrTokenMap.Get(nAttrPrefix, aLocalName)) { @@ -268,7 +267,7 @@ ScXMLExternalRefCellContext::ScXMLExternalRefCellContext( sal_uInt16 nAttrPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex(i), &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName); switch (nToken) diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 3d29610cd500..4edf3f89dbf5 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -30,7 +30,7 @@ class ScXMLExternalRefTabSourceContext : public SvXMLImportContext { public: ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -38,7 +38,7 @@ public: virtual ~ScXMLExternalRefTabSourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -47,10 +47,10 @@ private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; - ::rtl::OUString maRelativeUrl; - ::rtl::OUString maTableName; - ::rtl::OUString maFilterName; - ::rtl::OUString maFilterOptions; + OUString maRelativeUrl; + OUString maTableName; + OUString maFilterName; + OUString maFilterOptions; }; // ============================================================================ @@ -59,7 +59,7 @@ class ScXMLExternalRefRowsContext : public SvXMLImportContext { public: ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -67,7 +67,7 @@ public: virtual ~ScXMLExternalRefRowsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -83,7 +83,7 @@ class ScXMLExternalRefRowContext : public SvXMLImportContext { public: ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -91,7 +91,7 @@ public: virtual ~ScXMLExternalRefRowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -108,7 +108,7 @@ class ScXMLExternalRefCellContext : public SvXMLImportContext { public: ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -116,18 +116,18 @@ public: virtual ~ScXMLExternalRefCellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void SetCellString(const ::rtl::OUString& rStr); + void SetCellString(const OUString& rStr); private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; - ::rtl::OUString maCellString; + OUString maCellString; double mfCellValue; sal_Int32 mnRepeatCount; sal_Int32 mnNumberFormat; @@ -142,7 +142,7 @@ class ScXMLExternalRefCellTextContext : public SvXMLImportContext { public: ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalRefCellContext& rParent ); @@ -150,18 +150,18 @@ public: virtual ~ScXMLExternalRefCellTextContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters(const ::rtl::OUString& rChar); + virtual void Characters(const OUString& rChar); virtual void EndElement(); private: ScXMLExternalRefCellContext& mrParent; - ::rtl::OUStringBuffer maCellStrBuf; + OUStringBuffer maCellStrBuf; }; #endif diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 760822ea28fc..75c0af36a379 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -39,7 +39,7 @@ ScXMLFilterContext::ConnStackItem::ConnStackItem(bool bOr) : mbOr(bOr), mnCondCo ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -56,11 +56,11 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetFilterAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -101,7 +101,7 @@ ScXMLFilterContext::~ScXMLFilterContext() } SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -189,7 +189,7 @@ bool ScXMLFilterContext::GetConnection() ScXMLAndContext::ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference<XAttributeList>& /* xAttrList */, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : @@ -205,7 +205,7 @@ ScXMLAndContext::~ScXMLAndContext() } SvXMLImportContext *ScXMLAndContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -240,7 +240,7 @@ void ScXMLAndContext::EndElement() ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScQueryParam& rParam, @@ -257,7 +257,7 @@ ScXMLOrContext::~ScXMLOrContext() } SvXMLImportContext *ScXMLOrContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -292,7 +292,7 @@ void ScXMLOrContext::EndElement() } ScXMLConditionContext::ScXMLConditionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : @@ -307,11 +307,11 @@ ScXMLConditionContext::ScXMLConditionContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterConditionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -349,7 +349,7 @@ ScXMLConditionContext::~ScXMLConditionContext() } SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const Reference<XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = NULL; @@ -372,7 +372,7 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi } void ScXMLConditionContext::GetOperator( - const rtl::OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const + const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const { rParam.bRegExp = false; if (IsXMLToken(aOpStr, XML_MATCH)) @@ -471,7 +471,7 @@ ScXMLImport& ScXMLSetItemContext::GetScImport() } ScXMLSetItemContext::ScXMLSetItemContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScXMLConditionContext& rParent) : SvXMLImportContext(rImport, nPrfx, rLName) { @@ -479,12 +479,12 @@ ScXMLSetItemContext::ScXMLSetItemContext( const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetFilterSetItemAttrTokenMap(); for (sal_Int32 i = 0; i < nAttrCount; ++i) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); switch (rAttrTokenMap.Get(nPrefix, aLocalName)) { @@ -502,7 +502,7 @@ ScXMLSetItemContext::ScXMLSetItemContext( } SvXMLImportContext* ScXMLSetItemContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLName, + sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& /*xAttrList*/ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName );; @@ -520,7 +520,7 @@ void ScXMLSetItemContext::EndElement() ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext) : @@ -541,11 +541,11 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -586,7 +586,7 @@ ScXMLDPFilterContext::~ScXMLDPFilterContext() } SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -645,7 +645,7 @@ void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField) ScXMLDPAndContext::ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDPFilterContext* pTempFilterContext) : @@ -660,7 +660,7 @@ ScXMLDPAndContext::~ScXMLDPAndContext() } SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -695,7 +695,7 @@ void ScXMLDPAndContext::EndElement() ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDPFilterContext* pTempFilterContext) : @@ -710,7 +710,7 @@ ScXMLDPOrContext::~ScXMLDPOrContext() } SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -746,7 +746,7 @@ void ScXMLDPOrContext::EndElement() ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext) : @@ -760,11 +760,11 @@ ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterConditionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -802,7 +802,7 @@ ScXMLDPConditionContext::~ScXMLDPConditionContext() } SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -810,7 +810,7 @@ SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPre } void ScXMLDPConditionContext::getOperatorXML( - const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const + const OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const { bUseRegularExpressions = false; if (IsXMLToken(sTempOperator, XML_MATCH)) diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 3c7528daca11..11557dbe569c 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -61,7 +61,7 @@ class ScXMLFilterContext : public SvXMLImportContext public: ScXMLFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -70,7 +70,7 @@ public: virtual ~ScXMLFilterContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -92,7 +92,7 @@ class ScXMLAndContext : public SvXMLImportContext public: ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -101,7 +101,7 @@ public: virtual ~ScXMLAndContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -119,7 +119,7 @@ class ScXMLOrContext : public SvXMLImportContext public: ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -128,7 +128,7 @@ public: virtual ~ScXMLOrContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -141,9 +141,9 @@ class ScXMLConditionContext : public SvXMLImportContext ScXMLFilterContext* pFilterContext; ScQueryEntry::QueryItemsType maQueryItems; - rtl::OUString sDataType; - rtl::OUString sConditionValue; - rtl::OUString sOperator; + OUString sDataType; + OUString sConditionValue; + OUString sOperator; sal_Int32 nField; bool bIsCaseSensitive; @@ -153,7 +153,7 @@ class ScXMLConditionContext : public SvXMLImportContext public: ScXMLConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -162,13 +162,13 @@ public: virtual ~ScXMLConditionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void GetOperator(const rtl::OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; + void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; void AddSetItem(const ScQueryEntry::Item& rItem); }; @@ -178,7 +178,7 @@ class ScXMLSetItemContext : public SvXMLImportContext ScXMLImport& GetScImport(); public: ScXMLSetItemContext(ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLConditionContext& rParent); @@ -187,7 +187,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); @@ -219,7 +219,7 @@ class ScXMLDPFilterContext : public SvXMLImportContext public: ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext); @@ -227,7 +227,7 @@ public: virtual ~ScXMLDPFilterContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -272,7 +272,7 @@ class ScXMLDPAndContext : public SvXMLImportContext public: ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -280,7 +280,7 @@ public: virtual ~ScXMLDPAndContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -297,7 +297,7 @@ class ScXMLDPOrContext : public SvXMLImportContext public: ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -305,7 +305,7 @@ public: virtual ~ScXMLDPOrContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -316,9 +316,9 @@ class ScXMLDPConditionContext : public SvXMLImportContext { ScXMLDPFilterContext* pFilterContext; - rtl::OUString sDataType; - rtl::OUString sConditionValue; - rtl::OUString sOperator; + OUString sDataType; + OUString sConditionValue; + OUString sOperator; sal_Int32 nField; bool bIsCaseSensitive; @@ -328,7 +328,7 @@ class ScXMLDPConditionContext : public SvXMLImportContext public: ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -336,12 +336,12 @@ public: virtual ~ScXMLDPConditionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); void getOperatorXML( - const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; + const OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; virtual void EndElement(); }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 14c022daf5b0..df3472f0f88a 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -102,18 +102,16 @@ using namespace ::xmloff::token; using namespace ::formula; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; OUString SAL_CALL ScXMLImport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( @@ -126,13 +124,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Meta_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Meta_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( @@ -145,13 +143,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Styles_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Styles_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( @@ -164,13 +162,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Content_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Content_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( @@ -183,13 +181,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Settings_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Settings_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( @@ -266,7 +264,7 @@ public: virtual ~ScXMLDocContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ); }; @@ -366,7 +364,7 @@ SvXMLImportContext *ScXMLBodyContext_Impl::CreateChildContext( } SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -2173,7 +2171,7 @@ ScXMLImport::~ScXMLImport() throw() // --------------------------------------------------------------------- -SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { XMLFontStylesContext *pFSContext = new XMLFontStylesContext( @@ -2183,7 +2181,7 @@ SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix return pContext; } -SvXMLImportContext *ScXMLImport::CreateStylesContext(const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateStylesContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, bool bIsAutoStyle ) { SvXMLImportContext* pContext = new XMLTableStylesContext( @@ -2197,7 +2195,7 @@ SvXMLImportContext *ScXMLImport::CreateStylesContext(const ::rtl::OUString& rLoc return pContext; } -SvXMLImportContext *ScXMLImport::CreateBodyContext(const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateBodyContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { return new ScXMLBodyContext(*this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList); @@ -2288,7 +2286,7 @@ XMLShapeImportHelper* ScXMLImport::CreateShapeImport() return new XMLTableShapeImportHelper(*this); } -bool ScXMLImport::GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation) +bool ScXMLImport::GetValidation(const OUString& sName, ScMyImportValidation& aValidation) { if (pValidations) { @@ -2398,7 +2396,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque boost::scoped_ptr<ScChangeViewSettings> pViewSettings(new ScChangeViewSettings()); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(rChangeProps[i].Name); + OUString sName(rChangeProps[i].Name); if (sName.compareToAscii("ShowChanges") == 0) pViewSettings->SetShowChanges(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowAcceptedChanges") == 0) @@ -2436,7 +2434,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasAuthor(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByAuthorName") == 0) { - rtl::OUString sOUName; + OUString sOUName; if (rChangeProps[i].Value >>= sOUName) { String sAuthorName(sOUName); @@ -2447,7 +2445,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasComment(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByCommentText") == 0) { - rtl::OUString sOUComment; + OUString sOUComment; if (rChangeProps[i].Value >>= sOUComment) { String sComment(sOUComment); @@ -2458,7 +2456,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasRange(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByRangesList") == 0) { - rtl::OUString sRanges; + OUString sRanges; if ((rChangeProps[i].Value >>= sRanges) && !sRanges.isEmpty()) { ScRangeList aRangeList; @@ -2482,7 +2480,7 @@ void ScXMLImport::SetViewSettings(const uno::Sequence<beans::PropertyValue>& aVi sal_Int32 nWidth(0); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(aViewProps[i].Name); + OUString sName(aViewProps[i].Name); if (sName.compareToAscii("VisibleAreaHeight") == 0) aViewProps[i].Value >>= nHeight; else if (sName.compareToAscii("VisibleAreaLeft") == 0) @@ -2528,14 +2526,14 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa if (xMultiServiceFactory.is()) { sal_Int32 nCount(aConfigProps.getLength()); - rtl::OUString sCTName("TrackedChangesProtectionKey"); - rtl::OUString sVBName("VBACompatibilityMode"); - rtl::OUString sSCName("ScriptConfiguration"); + OUString sCTName("TrackedChangesProtectionKey"); + OUString sVBName("VBACompatibilityMode"); + OUString sSCName("ScriptConfiguration"); for (sal_Int32 i = nCount - 1; i >= 0; --i) { if (aConfigProps[i].Name == sCTName) { - rtl::OUString sKey; + OUString sKey; if (aConfigProps[i].Value >>= sKey) { uno::Sequence<sal_Int8> aPass; @@ -2546,7 +2544,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa pDoc->GetChangeTrack()->SetProtection(aPass); else { - std::set<rtl::OUString> aUsers; + std::set<OUString> aUsers; ScChangeTrack* pTrack = new ScChangeTrack(pDoc, aUsers); pTrack->SetProtection(aPass); pDoc->SetChangeTrack(pTrack); @@ -2566,7 +2564,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa } } } - uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")); + uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(OUString("com.sun.star.comp.SpreadsheetSettings")); uno::Reference <beans::XPropertySet> xProperties(xInterface, uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(xProperties, aConfigProps); @@ -2574,7 +2572,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa } } -sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUString& rCurrency) +sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency) { uno::Reference <util::XNumberFormatsSupplier> xNumberFormatsSupplier(GetNumberFormatsSupplier()); if (xNumberFormatsSupplier.is()) @@ -2582,7 +2580,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri uno::Reference <util::XNumberFormats> xLocalNumberFormats(xNumberFormatsSupplier->getNumberFormats()); if (xLocalNumberFormats.is()) { - rtl::OUString sFormatString; + OUString sFormatString; try { uno::Reference <beans::XPropertySet> xProperties(xLocalNumberFormats->getByKey(nKey)); @@ -2594,7 +2592,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri { ScXMLImport::MutexGuard aGuard(*this); LocaleDataWrapper aLocaleData( comphelper::getComponentContext(GetDocument()->GetServiceManager()), LanguageTag( aLocale) ); - rtl::OUStringBuffer aBuffer(15); + OUStringBuffer aBuffer(15); aBuffer.appendAscii("#"); aBuffer.append( aLocaleData.getNumThousandSep() ); aBuffer.appendAscii("##0"); @@ -2613,11 +2611,11 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri } catch ( const util::MalformedNumberFormatException& rException ) { - rtl::OUString sErrorMessage("Fehler im Formatstring "); + OUString sErrorMessage("Fehler im Formatstring "); sErrorMessage += sFormatString; - sErrorMessage += rtl::OUString(" an Position "); - sErrorMessage += rtl::OUString::valueOf(rException.CheckPos); - uno::Sequence<rtl::OUString> aSeq(1); + sErrorMessage += OUString(" an Position "); + sErrorMessage += OUString::valueOf(rException.CheckPos); + uno::Sequence<OUString> aSeq(1); aSeq[0] = sErrorMessage; uno::Reference<xml::sax::XLocator> xLocator; SetError(XMLERROR_API | XMLERROR_FLAG_ERROR, aSeq, rException.Message, xLocator); @@ -2627,7 +2625,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri return nKey; } -bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrentCurrency, const rtl::OUString& sBankSymbol) +bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrentCurrency, const OUString& sBankSymbol) { uno::Reference <util::XNumberFormatsSupplier> xNumberFormatsSupplier(GetNumberFormatsSupplier()); if (xNumberFormatsSupplier.is()) @@ -2640,8 +2638,8 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUS uno::Reference <beans::XPropertySet> xNumberPropertySet(xLocalNumberFormats->getByKey(nNumberFormat)); if (xNumberPropertySet.is()) { - rtl::OUString sTemp; - if ( xNumberPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) + OUString sTemp; + if ( xNumberPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) { if (sCurrentCurrency.equals(sTemp)) return true; @@ -2673,7 +2671,7 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUS void ScXMLImport::SetType(uno::Reference <beans::XPropertySet>& rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, - const rtl::OUString& rCurrency) + const OUString& rCurrency) { if ((nCellType != util::NumberFormat::TEXT) && (nCellType != util::NumberFormat::UNDEFINED)) { @@ -2683,7 +2681,7 @@ void ScXMLImport::SetType(uno::Reference <beans::XPropertySet>& rProperties, bool bIsStandard; // sCurrentCurrency may be the ISO code abbreviation if the currency // symbol matches such, or if no match found the symbol itself! - rtl::OUString sCurrentCurrency; + OUString sCurrentCurrency; sal_Int32 nCurrentCellType( GetNumberFormatAttributesExportHelper()->GetCellType( rNumberFormat, sCurrentCurrency, bIsStandard) & ~util::NumberFormat::DEFINED); @@ -2746,7 +2744,7 @@ void ScXMLImport::AddStyleRange(const table::CellRangeAddress& rCellRange) { uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) - xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); + xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } @@ -2802,14 +2800,14 @@ void ScXMLImport::SetStyleToRanges() if (xMultiServiceFactory.is()) xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>( xMultiServiceFactory->createInstance( - rtl::OUString("com.sun.star.sheet.SheetCellRanges")), + OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); } OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } -void ScXMLImport::SetStyleToRange(const ScRange& rRange, const rtl::OUString* pStyleName, - const sal_Int16 nCellType, const rtl::OUString* pCurrency) +void ScXMLImport::SetStyleToRange(const ScRange& rRange, const OUString* pStyleName, + const sal_Int16 nCellType, const OUString* pCurrency) { if (sPrevStyleName.isEmpty()) { @@ -2899,7 +2897,7 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R } // XServiceInfo -::rtl::OUString SAL_CALL ScXMLImport::getImplementationName( ) +OUString SAL_CALL ScXMLImport::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { switch( getImportFlags() ) @@ -2954,7 +2952,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE xImportInfo.is() ? xImportInfo->getPropertySetInfo() : 0); if (xPropertySetInfo.is()) { - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); if (xPropertySetInfo->hasPropertyByName(sOrganizerMode)) { @@ -2969,16 +2967,16 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE UnlockSolarMutex(); } -sal_Int32 ScXMLImport::GetRangeType(const rtl::OUString sRangeType) const +sal_Int32 ScXMLImport::GetRangeType(const OUString sRangeType) const { sal_Int32 nRangeType(0); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; sal_Int16 i = 0; while (i <= sRangeType.getLength()) { if ((sRangeType[i] == ' ') || (i == sRangeType.getLength())) { - rtl::OUString sTemp = sBuffer.makeStringAndClear(); + OUString sTemp = sBuffer.makeStringAndClear(); if (sTemp.compareToAscii(SC_REPEAT_COLUMN) == 0) nRangeType |= sheet::NamedRangeFlag::COLUMN_HEADER; else if (sTemp.compareToAscii(SC_REPEAT_ROW) == 0) @@ -3003,8 +3001,8 @@ void ScXMLImport::SetLabelRanges() uno::Reference <beans::XPropertySet> xPropertySet (GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Any aColAny = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLLABELRNG))); - uno::Any aRowAny = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ROWLABELRNG))); + uno::Any aColAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLLABELRNG))); + uno::Any aRowAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ROWLABELRNG))); uno::Reference< sheet::XLabelRanges > xColRanges; uno::Reference< sheet::XLabelRanges > xRowRanges; @@ -3085,7 +3083,7 @@ public: { using namespace formula; - const ::rtl::OUString& aType = r.sRangeType; + const OUString& aType = r.sRangeType; sal_uInt32 nUnoType = mrXmlImport.GetRangeType(aType); sal_uInt16 nNewType = RT_NAME; @@ -3104,7 +3102,7 @@ public: if (bSuccess) { - ::rtl::OUString aContent = r.sContent; + OUString aContent = r.sContent; if (!r.bIsExpression) ScXMLConverter::ParseFormula(aContent, false); @@ -3170,10 +3168,10 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE sal_Int32 nCount (aSeq.getLength()); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(aSeq[i].Name); + OUString sName(aSeq[i].Name); if (sName.compareToAscii(SC_ACTIVETABLE) == 0) { - rtl::OUString sValue; + OUString sValue; if(aSeq[i].Value >>= sValue) { String sTabName(sValue); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 3b97f1807c15..52e5b614ca47 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -722,11 +722,11 @@ struct tScMyCellRange struct ScMyNamedExpression { - rtl::OUString sName; - rtl::OUString sContent; - rtl::OUString sContentNmsp; - rtl::OUString sBaseCellAddress; - rtl::OUString sRangeType; + OUString sName; + OUString sContent; + OUString sContentNmsp; + OUString sBaseCellAddress; + OUString sRangeType; formula::FormulaGrammar::Grammar eGrammar; bool bIsExpression; }; @@ -735,8 +735,8 @@ typedef ::boost::ptr_list<ScMyNamedExpression> ScMyNamedExpressions; struct ScMyLabelRange { - rtl::OUString sLabelRangeStr; - rtl::OUString sDataRangeStr; + OUString sLabelRangeStr; + OUString sDataRangeStr; bool bColumnOrientation; }; @@ -744,16 +744,16 @@ typedef std::list<const ScMyLabelRange*> ScMyLabelRanges; struct ScMyImportValidation { - rtl::OUString sName; - rtl::OUString sImputTitle; - rtl::OUString sImputMessage; - rtl::OUString sErrorTitle; - rtl::OUString sErrorMessage; - rtl::OUString sFormula1; - rtl::OUString sFormula2; - rtl::OUString sFormulaNmsp1; - rtl::OUString sFormulaNmsp2; - rtl::OUString sBaseCellAddress; // string is used directly + OUString sName; + OUString sImputTitle; + OUString sImputMessage; + OUString sErrorTitle; + OUString sErrorMessage; + OUString sFormula1; + OUString sFormula2; + OUString sFormulaNmsp1; + OUString sFormulaNmsp2; + OUString sBaseCellAddress; // string is used directly com::sun::star::sheet::ValidationAlertStyle aAlertStyle; com::sun::star::sheet::ValidationType aValidationType; com::sun::star::sheet::ConditionOperator aOperator; @@ -772,7 +772,7 @@ class ScXMLEditAttributeMap; class ScXMLImport: public SvXMLImport, boost::noncopyable { - typedef ::boost::unordered_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; + typedef ::boost::unordered_map< OUString, sal_Int16, OUStringHash > CellTypeMap; typedef ::boost::ptr_map<SCTAB, ScMyNamedExpressions> SheetNamedExpMap; CellTypeMap aCellTypeMap; @@ -784,11 +784,11 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; ScMyViewContextList aViewContextList; ScMyStylesImportHelper* pStylesImportHelper; - rtl::OUString sNumberFormat; - rtl::OUString sLocale; - rtl::OUString sCellStyle; - rtl::OUString sStandardFormat; - rtl::OUString sType; + OUString sNumberFormat; + OUString sLocale; + OUString sCellStyle; + OUString sStandardFormat; + OUString sType; UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; @@ -890,7 +890,7 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable ScMyImpDetectiveOpArray* pDetectiveOpArray; SolarMutexGuard* pSolarMutexGuard; - std::vector<rtl::OUString> aTableStyles; + std::vector<OUString> aTableStyles; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; ScMyStyleNumberFormats* pStyleNumberFormats; com::sun::star::uno::Reference <com::sun::star::util::XNumberFormats> xNumberFormats; @@ -898,9 +898,9 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable com::sun::star::uno::Reference <com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges; - rtl::OUString sEmpty; - rtl::OUString sPrevStyleName; - rtl::OUString sPrevCurrency; + OUString sEmpty; + OUString sPrevStyleName; + OUString sPrevCurrency; sal_uInt32 nSolarMutexLocked; sal_Int32 nProgressCount; sal_uInt16 nStyleFamilyMask;// Mask of styles to load @@ -919,7 +919,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual XMLShapeImportHelper* CreateShapeImport(); @@ -936,15 +936,15 @@ public: // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) SvXMLImportContext *CreateMetaContext( - const ::rtl::OUString& rLocalName ); - SvXMLImportContext *CreateFontDeclsContext(const sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + const OUString& rLocalName ); + SvXMLImportContext *CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); SvXMLImportContext *CreateScriptContext( - const ::rtl::OUString& rLocalName ); - SvXMLImportContext *CreateStylesContext(const ::rtl::OUString& rLocalName, + const OUString& rLocalName ); + SvXMLImportContext *CreateStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, bool bAutoStyles ); SvXMLImportContext *CreateBodyContext( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void SetStatistics( @@ -960,7 +960,7 @@ public: bool IsLatinDefaultStyle() const { return bLatinDefaultStyle; } - sal_Int16 GetCellType(const ::rtl::OUString& rStrValue) const; + sal_Int16 GetCellType(const OUString& rStrValue) const; UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return xCellStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return xColumnStylesPropertySetMapper; } @@ -1069,7 +1069,7 @@ public: if (!pValidations) pValidations = new ScMyImportValidations(); pValidations->push_back(rValidation); } - bool GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation); + bool GetValidation(const OUString& sName, ScMyImportValidation& aValidation); inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { if (!pDetectiveOpArray) @@ -1087,15 +1087,15 @@ public: virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps); virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps); - void SetTableStyle(const rtl::OUString& rValue) { aTableStyles.push_back(rValue); } - std::vector<rtl::OUString> GetTableStyle() { return aTableStyles; } + void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); } + std::vector<OUString> GetTableStyle() { return aTableStyles; } ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper; } - sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUString& rCurrency); - bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrencySymbol, const rtl::OUString& sBankSymbol); + sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency); + bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol); void SetType(com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet>& rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, - const rtl::OUString& rCurrency); + const OUString& rCurrency); void ProgressBarIncrement(bool bEditCell, sal_Int32 nInc = 1); @@ -1108,8 +1108,8 @@ private: void ExamineDefaultStyle(); public: - void SetStyleToRange(const ScRange& rRange, const rtl::OUString* pStyleName, - const sal_Int16 nCellType, const rtl::OUString* pCurrency); + void SetStyleToRange(const ScRange& rRange, const OUString* pStyleName, + const sal_Int16 nCellType, const OUString* pCurrency); bool SetNullDateOnUnitConverter(); XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper(); ScMyStyleNumberFormats* GetStyleNumberFormats(); @@ -1120,7 +1120,7 @@ public: virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -1148,7 +1148,7 @@ public: void SetRangeOverflowType(sal_uInt32 nType); - sal_Int32 GetRangeType(const rtl::OUString sRangeType) const; + sal_Int32 GetRangeType(const OUString sRangeType) const; void SetNamedRanges(); void SetSheetNamedRanges(); void SetLabelRanges(); @@ -1185,10 +1185,10 @@ public: with range operator. */ void ExtractFormulaNamespaceGrammar( - ::rtl::OUString& rFormula, - ::rtl::OUString& rFormulaNmsp, + OUString& rFormula, + OUString& rFormulaNmsp, ::formula::FormulaGrammar::Grammar& reGrammar, - const ::rtl::OUString& rAttrValue, + const OUString& rAttrValue, bool bRestrictToExternalNmsp = false ) const; bool IsFormulaErrorConstant( const OUString& rStr ) const; diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 48e8e42693a4..412e96106a4b 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -26,7 +26,6 @@ #include "xmlimprt.hxx" using namespace ::com::sun::star; -using ::rtl::OUString; using namespace xmloff::token; @@ -87,8 +86,8 @@ ScXMLLabelRangeContext::ScXMLLabelRangeContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index c70581c0fb8c..70b9d9517a44 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -36,14 +36,14 @@ public: ScXMLLabelRangesContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLLabelRangesContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -55,8 +55,8 @@ public: class ScXMLLabelRangeContext : public SvXMLImportContext { private: - ::rtl::OUString sLabelRangeStr; - ::rtl::OUString sDataRangeStr; + OUString sLabelRangeStr; + OUString sDataRangeStr; bool bColumnOrientation; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -66,14 +66,14 @@ public: ScXMLLabelRangeContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLLabelRangeContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index a32d4c42b833..4ddf05d323c8 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -49,7 +49,7 @@ void ScXMLNamedExpressionsContext::SheetLocalInserter::insert(ScMyNamedExpressio } ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -64,7 +64,7 @@ ScXMLNamedExpressionsContext::~ScXMLNamedExpressionsContext() } SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -98,7 +98,7 @@ void ScXMLNamedExpressionsContext::EndElement() ScXMLNamedRangeContext::ScXMLNamedRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -117,11 +117,11 @@ ScXMLNamedRangeContext::ScXMLNamedRangeContext( const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetNamedRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -156,7 +156,7 @@ ScXMLNamedRangeContext::~ScXMLNamedRangeContext() } SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -168,7 +168,7 @@ void ScXMLNamedRangeContext::EndElement() } ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -182,11 +182,11 @@ ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetNamedExpressionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -218,7 +218,7 @@ ScXMLNamedExpressionContext::~ScXMLNamedExpressionContext() } SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index d6133cdc6ba9..34543d7626c2 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -72,7 +72,7 @@ public: }; ScXMLNamedExpressionsContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, Inserter* pInserter ); @@ -80,7 +80,7 @@ public: virtual ~ScXMLNamedExpressionsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -98,7 +98,7 @@ class ScXMLNamedRangeContext : public SvXMLImportContext public: ScXMLNamedRangeContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); @@ -106,7 +106,7 @@ public: virtual ~ScXMLNamedRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -124,7 +124,7 @@ class ScXMLNamedExpressionContext : public SvXMLImportContext public: ScXMLNamedExpressionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); @@ -132,7 +132,7 @@ public: virtual ~ScXMLNamedExpressionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index ec4c5a5e10a1..d1c1b4fec3a2 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -49,7 +49,7 @@ using namespace xmloff::token; ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -57,16 +57,16 @@ ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, nRepeatedRows(1), bHasCell(false) { - rtl::OUString sCellStyleName; + OUString sCellStyleName; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetTableRowAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -107,7 +107,7 @@ ScXMLTableRowContext::~ScXMLTableRowContext() } SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -204,9 +204,9 @@ void ScXMLTableRowContext::EndElement() bFiltered = true; } if (!bVisible) - xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); + xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); if (bFiltered) - xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); + xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); } } } @@ -215,7 +215,7 @@ void ScXMLTableRowContext::EndElement() ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempHeader, const bool bTempGroup ) : @@ -241,11 +241,11 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if ((nPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(aLocalName, XML_DISPLAY)) bGroupDisplay = IsXMLToken(sValue, XML_TRUE); @@ -258,7 +258,7 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext() } SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index a900ff781d11..c24a103f9b6e 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -26,8 +26,8 @@ class ScXMLImport; class ScXMLTableRowContext : public SvXMLImportContext { - rtl::OUString sStyleName; - rtl::OUString sVisibility; + OUString sStyleName; + OUString sVisibility; sal_Int32 nRepeatedRows; bool bHasCell; @@ -37,14 +37,14 @@ class ScXMLTableRowContext : public SvXMLImportContext public: ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableRowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -67,7 +67,7 @@ class ScXMLTableRowsContext : public SvXMLImportContext public: ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bHeader, const bool bGroup); @@ -75,7 +75,7 @@ public: virtual ~ScXMLTableRowsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index caa4a70f4c34..19478d29b4f0 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -33,9 +33,7 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ @@ -58,11 +56,11 @@ ScXMLTableScenarioContext::ScXMLTableScenarioContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetTableScenarioAttrTokenMap()); for( sal_Int16 i = 0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sAttrName(xAttrList->getNameByIndex( i )); OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index c16098ed6f27..0690f08409c3 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -29,7 +29,7 @@ class ScXMLImport; class ScXMLTableScenarioContext : public SvXMLImportContext { private: - rtl::OUString sComment; + OUString sComment; Color aBorderColor; ScRangeList aScenarioRanges; bool bDisplayBorder; @@ -45,14 +45,14 @@ private: public: ScXMLTableScenarioContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableScenarioContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index d880d401c74f..129b87f38ad7 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -39,7 +39,7 @@ using namespace xmloff::token; ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -58,11 +58,11 @@ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetSortAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -105,7 +105,7 @@ ScXMLSortContext::~ScXMLSortContext() } SvXMLImportContext *ScXMLSortContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -139,37 +139,37 @@ void ScXMLSortContext::EndElement() if (nAlgoLength) ++i; uno::Sequence <beans::PropertyValue> aSortDescriptor(7 + i); - aSortDescriptor[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)); + aSortDescriptor[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)); aSortDescriptor[0].Value = ::cppu::bool2any(bBindFormatsToContent); - aSortDescriptor[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)); + aSortDescriptor[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)); aSortDescriptor[1].Value = ::cppu::bool2any(bCopyOutputData); - aSortDescriptor[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)); + aSortDescriptor[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)); aSortDescriptor[2].Value = ::cppu::bool2any(bIsCaseSensitive); - aSortDescriptor[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST)); + aSortDescriptor[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST)); aSortDescriptor[3].Value = ::cppu::bool2any(bEnabledUserList); - aSortDescriptor[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)); + aSortDescriptor[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)); aSortDescriptor[4].Value <<= aOutputPosition; - aSortDescriptor[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX)); + aSortDescriptor[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX)); aSortDescriptor[5].Value <<= nUserListIndex; - aSortDescriptor[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD)); + aSortDescriptor[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD)); aSortDescriptor[6].Value <<= aSortFields; if (nLangLength || nCountryLength) { lang::Locale aLocale; aLocale.Language = sLanguage; aLocale.Country = sCountry; - aSortDescriptor[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLLOC)); + aSortDescriptor[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLLOC)); aSortDescriptor[7].Value <<= aLocale; } if (nAlgoLength) { - aSortDescriptor[6 + i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLALG)); + aSortDescriptor[6 + i].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLALG)); aSortDescriptor[6 + i].Value <<= sAlgorithm; } pDatabaseRangeContext->SetSortSequence(aSortDescriptor); } -void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl::OUString& sDataType, const rtl::OUString& sOrder) +void ScXMLSortContext::AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder) { util::SortField aSortField; aSortField.Field = sFieldNumber.toInt32(); @@ -179,7 +179,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl aSortField.SortAscending = false; if (sDataType.getLength() > 8) { - rtl::OUString sTemp = sDataType.copy(0, 8); + OUString sTemp = sDataType.copy(0, 8); if (sTemp.compareToAscii(SC_USERLIST) == 0) { bEnabledUserList = true; @@ -205,7 +205,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSortContext* pTempSortContext) : @@ -218,11 +218,11 @@ ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetSortSortByAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -250,7 +250,7 @@ ScXMLSortByContext::~ScXMLSortByContext() } SvXMLImportContext *ScXMLSortByContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index d2de3775f655..419796893aed 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -34,9 +34,9 @@ class ScXMLSortContext : public SvXMLImportContext com::sun::star::uno::Sequence <com::sun::star::util::SortField> aSortFields; com::sun::star::table::CellAddress aOutputPosition; - rtl::OUString sCountry; - rtl::OUString sLanguage; - rtl::OUString sAlgorithm; + OUString sCountry; + OUString sLanguage; + OUString sAlgorithm; sal_Int16 nUserListIndex; bool bCopyOutputData; bool bBindFormatsToContent; @@ -49,7 +49,7 @@ class ScXMLSortContext : public SvXMLImportContext public: ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -57,22 +57,22 @@ public: virtual ~ScXMLSortContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void AddSortField(const rtl::OUString& sFieldNumber, const rtl::OUString& sDataType, const rtl::OUString& sOrder); + void AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder); }; class ScXMLSortByContext : public SvXMLImportContext { ScXMLSortContext* pSortContext; - rtl::OUString sFieldNumber; - rtl::OUString sDataType; - rtl::OUString sOrder; + OUString sFieldNumber; + OUString sDataType; + OUString sOrder; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -80,7 +80,7 @@ class ScXMLSortByContext : public SvXMLImportContext public: ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSortContext* pTempSortContext); @@ -88,7 +88,7 @@ public: virtual ~ScXMLSortByContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index 486f0b2911c0..a331b0a2926a 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; using namespace ::formula; -using ::rtl::OUString; #define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 } #define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT } @@ -629,7 +628,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( sal_Int32 nNumberFormat = 0; if (i->maValue >>= nNumberFormat) { - rtl::OUString sAttrValue(rScXMLExport.getDataStyleName(nNumberFormat)); + OUString sAttrValue(rScXMLExport.getDataStyleName(nNumberFormat)); if (!sAttrValue.isEmpty()) { GetExport().AddAttribute( @@ -656,7 +655,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( { case CTF_SC_MASTERPAGENAME : { - rtl::OUString sName; + OUString sName; if (i->maValue >>= sName) { GetExport().AddAttribute( @@ -705,7 +704,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( uno::Reference <sheet::XSheetConditionalEntry> xSheetConditionalEntry(xIndex->getByIndex(nCondition), uno::UNO_QUERY); if (xSheetConditionalEntry.is()) { - rtl::OUString sStyleName(xSheetConditionalEntry->getStyleName()); + OUString sStyleName(xSheetConditionalEntry->getStyleName()); uno::Reference <sheet::XSheetCondition> xSheetCondition(xSheetConditionalEntry, uno::UNO_QUERY); if (xSheetCondition.is()) { @@ -714,9 +713,9 @@ void ScXMLAutoStylePoolP::exportStyleContent( { if (aOperator == sheet::ConditionOperator_FORMULA) { - rtl::OUString sCondition("is-true-formula("); + OUString sCondition("is-true-formula("); sCondition += xSheetCondition->getFormula1(); - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName )); OUString sOUBaseAddress; @@ -728,41 +727,41 @@ void ScXMLAutoStylePoolP::exportStyleContent( } else { - rtl::OUString sCondition; + OUString sCondition; if (aOperator == sheet::ConditionOperator_BETWEEN || aOperator == sheet::ConditionOperator_NOT_BETWEEN) { if (aOperator == sheet::ConditionOperator_BETWEEN) - sCondition = rtl::OUString("cell-content-is-between("); + sCondition = OUString("cell-content-is-between("); else - sCondition = rtl::OUString("cell-content-is-not-between("); + sCondition = OUString("cell-content-is-not-between("); sCondition += xSheetCondition->getFormula1(); - sCondition += rtl::OUString(","); + sCondition += OUString(","); sCondition += xSheetCondition->getFormula2(); - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } else { - sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition = OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); switch (aOperator) { case sheet::ConditionOperator_LESS: - sCondition += rtl::OUString("<"); + sCondition += OUString("<"); break; case sheet::ConditionOperator_GREATER: - sCondition += rtl::OUString(">"); + sCondition += OUString(">"); break; case sheet::ConditionOperator_LESS_EQUAL: - sCondition += rtl::OUString("<="); + sCondition += OUString("<="); break; case sheet::ConditionOperator_GREATER_EQUAL: - sCondition += rtl::OUString(">="); + sCondition += OUString(">="); break; case sheet::ConditionOperator_EQUAL: - sCondition += rtl::OUString("="); + sCondition += OUString("="); break; case sheet::ConditionOperator_NOT_EQUAL: - sCondition += rtl::OUString("!="); + sCondition += OUString("!="); break; default: { @@ -812,7 +811,7 @@ void ScXMLStyleExport::exportStyleAttributes( if (xPropSet.is()) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo(xPropSet->getPropertySetInfo()); - rtl::OUString sNumberFormat("NumberFormat"); + OUString sNumberFormat("NumberFormat"); if( xPropSetInfo->hasPropertyByName( sNumberFormat ) ) { uno::Reference< beans::XPropertyState > xPropState( xPropSet, uno::UNO_QUERY ); @@ -836,7 +835,7 @@ void ScXMLStyleExport::exportStyleContent( ScXMLStyleExport::ScXMLStyleExport( SvXMLExport& rExp, - const ::rtl::OUString& rPoolStyleName, + const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP ) : XMLStyleExport(rExp, rPoolStyleName, pAutoStyleP) { @@ -964,7 +963,7 @@ bool XmlScPropHdl_CellProtection::equals( } sal_Bool XmlScPropHdl_CellProtection::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -993,8 +992,8 @@ sal_Bool XmlScPropHdl_CellProtection::importXML( sal_Int16 i(0); while (i < rStrImpValue.getLength() && rStrImpValue[i] != ' ') ++i; - rtl::OUString sFirst(rStrImpValue.copy(0, i)); - rtl::OUString sSecond(rStrImpValue.copy(i + 1)); + OUString sFirst(rStrImpValue.copy(0, i)); + OUString sSecond(rStrImpValue.copy(i + 1)); aCellProtection.IsFormulaHidden = false; aCellProtection.IsHidden = false; aCellProtection.IsLocked = false; @@ -1046,7 +1045,7 @@ sal_Bool XmlScPropHdl_CellProtection::importXML( } sal_Bool XmlScPropHdl_CellProtection::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1080,7 +1079,7 @@ sal_Bool XmlScPropHdl_CellProtection::exportXML( else if (aCellProtection.IsFormulaHidden && aCellProtection.IsLocked) { rStrExpValue = GetXMLToken(XML_PROTECTED); - rStrExpValue += rtl::OUString(" "); + rStrExpValue += OUString(" "); rStrExpValue += GetXMLToken(XML_FORMULA_HIDDEN); bRetval = sal_True; } @@ -1107,7 +1106,7 @@ bool XmlScPropHdl_PrintContent::equals( } sal_Bool XmlScPropHdl_PrintContent::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1137,7 +1136,7 @@ sal_Bool XmlScPropHdl_PrintContent::importXML( } sal_Bool XmlScPropHdl_PrintContent::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1146,7 +1145,7 @@ sal_Bool XmlScPropHdl_PrintContent::exportXML( util::CellProtection aCellProtection; if(rValue >>= aCellProtection) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertBool(sValue, !aCellProtection.IsPrintHidden); rStrExpValue = sValue.makeStringAndClear(); bRetval = sal_True; @@ -1172,7 +1171,7 @@ bool XmlScPropHdl_JustifyMethod::equals( } sal_Bool XmlScPropHdl_JustifyMethod::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1198,7 +1197,7 @@ sal_Bool XmlScPropHdl_JustifyMethod::importXML( } sal_Bool XmlScPropHdl_JustifyMethod::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1246,7 +1245,7 @@ bool XmlScPropHdl_HoriJustify::equals( } sal_Bool XmlScPropHdl_HoriJustify::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1288,7 +1287,7 @@ sal_Bool XmlScPropHdl_HoriJustify::importXML( } sal_Bool XmlScPropHdl_HoriJustify::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1350,7 +1349,7 @@ bool XmlScPropHdl_HoriJustifySource::equals( } sal_Bool XmlScPropHdl_HoriJustifySource::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1371,7 +1370,7 @@ sal_Bool XmlScPropHdl_HoriJustifySource::importXML( } sal_Bool XmlScPropHdl_HoriJustifySource::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1411,7 +1410,7 @@ bool XmlScPropHdl_HoriJustifyRepeat::equals( } sal_Bool XmlScPropHdl_HoriJustifyRepeat::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1432,7 +1431,7 @@ sal_Bool XmlScPropHdl_HoriJustifyRepeat::importXML( } sal_Bool XmlScPropHdl_HoriJustifyRepeat::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1472,7 +1471,7 @@ bool XmlScPropHdl_Orientation::equals( } sal_Bool XmlScPropHdl_Orientation::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1496,7 +1495,7 @@ sal_Bool XmlScPropHdl_Orientation::importXML( } sal_Bool XmlScPropHdl_Orientation::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1541,7 +1540,7 @@ bool XmlScPropHdl_RotateAngle::equals( } sal_Bool XmlScPropHdl_RotateAngle::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1559,7 +1558,7 @@ sal_Bool XmlScPropHdl_RotateAngle::importXML( } sal_Bool XmlScPropHdl_RotateAngle::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1568,7 +1567,7 @@ sal_Bool XmlScPropHdl_RotateAngle::exportXML( if(rValue >>= nVal) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertNumber(sValue, sal_Int32(nVal / 100)); rStrExpValue = sValue.makeStringAndClear(); bRetval = sal_True; @@ -1593,7 +1592,7 @@ bool XmlScPropHdl_RotateReference::equals( } sal_Bool XmlScPropHdl_RotateReference::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1629,7 +1628,7 @@ sal_Bool XmlScPropHdl_RotateReference::importXML( } sal_Bool XmlScPropHdl_RotateReference::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1690,7 +1689,7 @@ bool XmlScPropHdl_VertJustify::equals( } sal_Bool XmlScPropHdl_VertJustify::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1732,7 +1731,7 @@ sal_Bool XmlScPropHdl_VertJustify::importXML( } sal_Bool XmlScPropHdl_VertJustify::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1799,7 +1798,7 @@ bool XmlScPropHdl_BreakBefore::equals( } sal_Bool XmlScPropHdl_BreakBefore::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1823,7 +1822,7 @@ sal_Bool XmlScPropHdl_BreakBefore::importXML( } sal_Bool XmlScPropHdl_BreakBefore::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1855,7 +1854,7 @@ bool XmlScPropHdl_IsTextWrapped::equals( } sal_Bool XmlScPropHdl_IsTextWrapped::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1876,7 +1875,7 @@ sal_Bool XmlScPropHdl_IsTextWrapped::importXML( } sal_Bool XmlScPropHdl_IsTextWrapped::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1896,7 +1895,7 @@ sal_Bool XmlScPropHdl_IsTextWrapped::exportXML( return bRetval; } -sal_Bool XmlScPropHdl_IsEqual::importXML( const ::rtl::OUString& /* rStrImpValue */, +sal_Bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */, ::com::sun::star::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1904,7 +1903,7 @@ sal_Bool XmlScPropHdl_IsEqual::importXML( const ::rtl::OUString& /* rStrImpValue return false; } -sal_Bool XmlScPropHdl_IsEqual::exportXML( ::rtl::OUString& /* rStrExpValue */, +sal_Bool XmlScPropHdl_IsEqual::exportXML( OUString& /* rStrExpValue */, const ::com::sun::star::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1924,7 +1923,7 @@ bool XmlScPropHdl_Vertical::equals( } sal_Bool XmlScPropHdl_Vertical::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1945,7 +1944,7 @@ sal_Bool XmlScPropHdl_Vertical::importXML( } sal_Bool XmlScPropHdl_Vertical::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index feb62e55fbb8..e879ddf6e069 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -217,7 +217,7 @@ class ScXMLStyleExport : public XMLStyleExport public: ScXMLStyleExport( SvXMLExport& rExp, - const ::rtl::OUString& rPoolStyleName, + const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP=0 ); virtual ~ScXMLStyleExport(); }; @@ -235,8 +235,8 @@ class XmlScPropHdl_CellProtection : public XMLPropertyHandler public: virtual ~XmlScPropHdl_CellProtection(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_PrintContent : public XMLPropertyHandler @@ -244,8 +244,8 @@ class XmlScPropHdl_PrintContent : public XMLPropertyHandler public: virtual ~XmlScPropHdl_PrintContent(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler @@ -253,8 +253,8 @@ class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler public: virtual ~XmlScPropHdl_JustifyMethod(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustify : public XMLPropertyHandler @@ -262,8 +262,8 @@ class XmlScPropHdl_HoriJustify : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustify(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler @@ -271,8 +271,8 @@ class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustifySource(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler @@ -280,8 +280,8 @@ class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustifyRepeat(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_Orientation : public XMLPropertyHandler @@ -289,8 +289,8 @@ class XmlScPropHdl_Orientation : public XMLPropertyHandler public: virtual ~XmlScPropHdl_Orientation(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_RotateAngle : public XMLPropertyHandler @@ -298,8 +298,8 @@ class XmlScPropHdl_RotateAngle : public XMLPropertyHandler public: virtual ~XmlScPropHdl_RotateAngle(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_RotateReference : public XMLPropertyHandler @@ -307,8 +307,8 @@ class XmlScPropHdl_RotateReference : public XMLPropertyHandler public: virtual ~XmlScPropHdl_RotateReference(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_VertJustify : public XMLPropertyHandler @@ -316,8 +316,8 @@ class XmlScPropHdl_VertJustify : public XMLPropertyHandler public: virtual ~XmlScPropHdl_VertJustify(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_BreakBefore : public XMLPropertyHandler @@ -325,8 +325,8 @@ class XmlScPropHdl_BreakBefore : public XMLPropertyHandler public: virtual ~XmlScPropHdl_BreakBefore(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler @@ -334,8 +334,8 @@ class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler public: virtual ~XmlScPropHdl_IsTextWrapped(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_IsEqual : public XMLPropertyHandler @@ -343,8 +343,8 @@ class XmlScPropHdl_IsEqual : public XMLPropertyHandler public: virtual ~XmlScPropHdl_IsEqual() {} virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const { return sal_True; } - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_Vertical : public XMLPropertyHandler @@ -352,8 +352,8 @@ class XmlScPropHdl_Vertical : public XMLPropertyHandler public: virtual ~XmlScPropHdl_Vertical(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 249173dec035..7e024b7901b7 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -347,9 +347,9 @@ SvXMLImportContext* XMLTableCellPropsContext::CreateChildContext( sal_uInt16 nPr class ScXMLMapContext : public SvXMLImportContext { - rtl::OUString msApplyStyle; - rtl::OUString msCondition; - rtl::OUString msBaseCell; + OUString msApplyStyle; + OUString msCondition; + OUString msBaseCell; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -357,7 +357,7 @@ public: ScXMLMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~ScXMLMapContext(); @@ -410,7 +410,7 @@ ScCondFormatEntry* ScXMLMapContext::CreateConditionEntry() } ScConditionMode eMode = ScConditionEntry::GetModeFromApi(aParseResult.meOperator); - rtl::OUString aNmsp1, aNmsp2; + OUString aNmsp1, aNmsp2; ScDocument* pDoc = GetScImport().GetDocument(); ScCondFormatEntry* pEntry = new ScCondFormatEntry(eMode, aParseResult.maOperand1, aParseResult.maOperand2, pDoc, ScAddress(), msApplyStyle, @@ -577,7 +577,7 @@ void XMLTableStyleContext::SetDefaults() uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) FillPropertySet(xProperties); } @@ -709,10 +709,10 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport, const uno::Reference< XAttributeList > & xAttrList, const bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - sCellStyleServiceName( rtl::OUString( "com.sun.star.style.CellStyle" )), - sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), - sRowStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), - sTableStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), + sCellStyleServiceName( OUString( "com.sun.star.style.CellStyle" )), + sColumnStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), + sRowStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), + sTableStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), nNumberFormatIndex(-1), nConditionalFormatIndex(-1), nCellStyleIndex(-1), @@ -800,7 +800,7 @@ uno::Reference < XNameContainer > xStyles.set(xTableStyles); else sName = - OUString( rtl::OUString( "TableStyles" )); + OUString( OUString( "TableStyles" )); } break; case XML_STYLE_FAMILY_TABLE_CELL: @@ -809,7 +809,7 @@ uno::Reference < XNameContainer > xStyles.set(xCellStyles); else sName = - OUString( rtl::OUString( "CellStyles" )); + OUString( OUString( "CellStyles" )); } break; case XML_STYLE_FAMILY_TABLE_COLUMN: @@ -818,7 +818,7 @@ uno::Reference < XNameContainer > xStyles.set(xColumnStyles); else sName = - OUString( rtl::OUString( "ColumnStyles" )); + OUString( OUString( "ColumnStyles" )); } break; case XML_STYLE_FAMILY_TABLE_ROW: @@ -827,7 +827,7 @@ uno::Reference < XNameContainer > xStyles.set(xRowStyles); else sName = - OUString( rtl::OUString( "RowStyles" )); + OUString( OUString( "RowStyles" )); } break; } @@ -873,7 +873,7 @@ uno::Reference < XNameContainer > OUString XMLTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const { - rtl::OUString sServiceName(SvXMLStylesContext::GetServiceName(nFamily)); + OUString sServiceName(SvXMLStylesContext::GetServiceName(nFamily)); if (sServiceName.isEmpty()) { switch( nFamily ) @@ -1008,7 +1008,7 @@ SvXMLImportContext *ScMasterPageContext::CreateChildContext( SvXMLImportContext *ScMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, @@ -1030,7 +1030,7 @@ SvXMLImportContext *ScMasterPageContext::CreateHeaderFooterContext( bFooter, bLeft ); } -void ScMasterPageContext::ClearContent(const rtl::OUString& rContent) +void ScMasterPageContext::ClearContent(const OUString& rContent) { if (!xPropSet.is()) xPropSet.set(GetStyle(), UNO_QUERY ); @@ -1052,15 +1052,15 @@ void ScMasterPageContext::Finish( sal_Bool bOverwrite ) { XMLTextMasterPageContext::Finish(bOverwrite); if (!bContainsRightFooter) - ClearContent(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON))); + ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON))); if (!bContainsRightHeader) - ClearContent(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON))); + ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON))); } // --------------------------------------------------------------------------- ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) : XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), nLastSheet(-1) diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 09d61bae311f..865e4d00d974 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -69,8 +69,8 @@ public: class XMLTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString sDataStyleName; - rtl::OUString sPageStyle; + OUString sDataStyleName; + OUString sPageStyle; SvXMLStylesContext* pStyles; sal_Int32 nNumberFormat; SCTAB nLastSheet; @@ -84,22 +84,22 @@ class XMLTableStyleContext : public XMLPropStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~XMLTableStyleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void FillPropertySet(const ::com::sun::star::uno::Reference< @@ -131,10 +131,10 @@ class XMLTableStylesContext : public SvXMLStylesContext ::com::sun::star::container::XNameContainer > xRowStyles; ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > xTableStyles; - const ::rtl::OUString sCellStyleServiceName; - const ::rtl::OUString sColumnStyleServiceName; - const ::rtl::OUString sRowStyleServiceName; - const ::rtl::OUString sTableStyleServiceName; + const OUString sCellStyleServiceName; + const OUString sColumnStyleServiceName; + const OUString sRowStyleServiceName; + const OUString sTableStyleServiceName; sal_Int32 nNumberFormatIndex; sal_Int32 nConditionalFormatIndex; sal_Int32 nCellStyleIndex; @@ -155,19 +155,19 @@ protected: virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: XMLTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , - const ::rtl::OUString& rLName , + const OUString& rLName , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const bool bAutoStyles ); virtual ~XMLTableStylesContext(); @@ -179,7 +179,7 @@ public: virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; sal_Int32 GetIndex(const sal_Int16 nContextID); }; @@ -188,12 +188,12 @@ class ScXMLMasterStylesContext : public SvXMLStylesContext { protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -203,7 +203,7 @@ public: TYPEINFO(); ScXMLMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); @@ -218,17 +218,17 @@ namespace com { namespace sun { namespace star { class ScMasterPageContext : public XMLTextMasterPageContext { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet; - const rtl::OUString sEmpty; + const OUString sEmpty; sal_Bool bContainsRightHeader; sal_Bool bContainsRightFooter; - void ClearContent(const rtl::OUString& rContent); + void ClearContent(const OUString& rContent); public: TYPEINFO(); ScMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, bool bOverwrite ); @@ -236,12 +236,12 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, @@ -259,7 +259,7 @@ class ScCellTextStyleContext : public XMLTextStyleContext public: ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index c9f46b11e7ab..122882777cf6 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -99,7 +99,7 @@ uno::Reference<sheet::XSpreadsheet> getCurrentSheet(const uno::Reference<frame:: } -void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, +void ScMyTables::NewSheet(const OUString& sTableName, const OUString& sStyleName, const ScXMLTabProtectionData& rProtectData) { if (rImport.GetModel().is()) @@ -133,7 +133,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& } } -void ScMyTables::SetTableStyle(const rtl::OUString& sStyleName) +void ScMyTables::SetTableStyle(const OUString& sStyleName) { //these uno calls are a bit difficult to remove, XMLTableStyleContext::FillPropertySet uses //SvXMLImportPropertyMapper::FillPropertySet @@ -177,7 +177,7 @@ void ScMyTables::AddRow() maCurrentCellPos.SetCol(-1); //reset columns for new row } -void ScMyTables::SetRowStyle(const rtl::OUString& rCellStyleName) +void ScMyTables::SetRowStyle(const OUString& rCellStyleName) { rImport.GetStylesImportHelper()->SetRowStyle(rCellStyleName); } @@ -216,7 +216,7 @@ void ScMyTables::DeleteTable() } } -void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName) +void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyleName) { rImport.GetStylesImportHelper()->AddColumnStyle(rCellStyleName, nCurrentColCount, nRepeat); nCurrentColCount += nRepeat; @@ -261,14 +261,14 @@ bool ScMyTables::HasXShapes() } void ScMyTables::AddOLE(uno::Reference <drawing::XShape>& rShape, - const rtl::OUString &rRangeList) + const OUString &rRangeList) { aFixupOLEs.AddOLE(rShape, rRangeList); } void ScMyTables::AddMatrixRange( const SCCOL nStartColumn, const SCROW nStartRow, const SCCOL nEndColumn, const SCROW nEndRow, - const rtl::OUString& rFormula, const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) + const OUString& rFormula, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) { OSL_ENSURE(nEndRow >= nStartRow, "wrong row order"); OSL_ENSURE(nEndColumn >= nStartColumn, "wrong column order"); diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index b7707715a64d..58dd0ed5225d 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -37,7 +37,7 @@ class ScXMLImport; struct ScXMLTabProtectionData { - ::rtl::OUString maPassword; + OUString maPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; bool mbProtected; @@ -58,7 +58,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; - rtl::OUString sCurrentSheetName; + OUString sCurrentSheetName; ScAddress maCurrentCellPos; ScRangeList maMatrixRangeList; ScXMLTabProtectionData maProtectionData; @@ -69,23 +69,23 @@ private: void NewRow(); void NewColumn(bool bIsCovered); - void SetTableStyle(const rtl::OUString& sStyleName); + void SetTableStyle(const OUString& sStyleName); public: ScMyTables(ScXMLImport& rImport); ~ScMyTables(); - void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, + void NewSheet(const OUString& sTableName, const OUString& sStyleName, const ScXMLTabProtectionData& rProtectData); void AddRow(); - void SetRowStyle(const rtl::OUString& rCellStyleName); + void SetRowStyle(const OUString& rCellStyleName); void AddColumn(bool bIsCovered); void FixupOLEs() { aFixupOLEs.FixupOLEs(); } bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const { return ScMyOLEFixer::IsOLE(rShape); } void DeleteTable(); ScAddress GetCurrentCellPos() const { return maCurrentCellPos; }; - void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); + void AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyleName); ScXMLTabProtectionData& GetCurrentProtectionData() { return maProtectionData; } - rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } + OUString GetCurrentSheetName() const { return sCurrentSheetName; } SCTAB GetCurrentSheet() const { return (maCurrentCellPos.Tab() >= 0) ? maCurrentCellPos.Tab() : 0; } SCCOL GetCurrentColCount() const { return std::min<sal_Int32>(nCurrentColCount, MAXCOL); } SCROW GetCurrentRow() const { return (maCurrentCellPos.Row() >= 0) ? maCurrentCellPos.Row() : 0; } @@ -100,14 +100,14 @@ public: bool HasDrawPage(); bool HasXShapes(); void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, - const rtl::OUString &rRangeList); + const OUString &rRangeList); void AddMatrixRange( const SCCOL nStartColumn, const SCROW nStartRow, const SCCOL nEndColumn, const SCROW nEndRow, - const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, + const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar ); bool IsPartOfMatrix( const ScAddress& rScAddress) const; }; diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index f8dd920d60fd..a7f014cef506 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -55,7 +55,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::xml::sax::XAttributeList; -using ::rtl::OUString; /** * Determine whether this table is an external reference cache from its @@ -69,7 +68,7 @@ using ::rtl::OUString; * * @return */ -static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rUrl, rtl::OUString& rExtTabName) +static bool lcl_isExternalRefCache(const OUString& rName, OUString& rUrl, OUString& rExtTabName) { // 'file:///path/to/file.ods'#MySheet // 'file:///path/to/file.ods'#MySheet with space @@ -85,10 +84,10 @@ static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rU if ( eProt == INET_PROT_NOT_VALID ) return false; - rtl::OUString aPrefix = INetURLObject::GetScheme( eProt ); + OUString aPrefix = INetURLObject::GetScheme( eProt ); sal_Int32 nPrefLen = aPrefix.getLength(); - rtl::OUStringBuffer aUrlBuf, aTabNameBuf; + OUStringBuffer aUrlBuf, aTabNameBuf; aUrlBuf.append( aPrefix ); sal_Int32 n = rName.getLength(); const sal_Unicode* p = rName.getStr(); @@ -140,7 +139,7 @@ ScXMLExternalTabData::ScXMLExternalTabData() : ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -153,17 +152,17 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, nStartOffset = GetScImport().GetByteOffset(); ScXMLTabProtectionData aProtectData; - rtl::OUString sName; - rtl::OUString sStyleName; + OUString sName; + OUString sStyleName; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -197,7 +196,7 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, } } - rtl::OUString aExtUrl, aExtTabName; + OUString aExtUrl, aExtTabName; if (lcl_isExternalRefCache(sName, aExtUrl, aExtTabName)) { // This is an external ref cache table. @@ -224,7 +223,7 @@ ScXMLTableContext::~ScXMLTableContext() } SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 7476a0805d24..1caab63fcb3a 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -39,7 +39,7 @@ struct ScXMLExternalTabData class ScXMLTableContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; + OUString sPrintRanges; ::std::auto_ptr<ScXMLExternalTabData> pExternalRefInfo; sal_Int32 nStartOffset; bool bStartFormPage; @@ -51,14 +51,14 @@ class ScXMLTableContext : public SvXMLImportContext public: ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -73,14 +73,14 @@ class ScXMLTableProtectionContext : public SvXMLImportContext public: ScXMLTableProtectionContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableProtectionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 02d88a38f128..7ba722d77061 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -76,9 +76,7 @@ #define MAP_LEN(x) x, sizeof(x) - 1 using namespace com::sun::star; -using ::rtl::OUString; -using rtl::OUString; // ----------------------------------------------------------------------- @@ -109,8 +107,8 @@ uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator() sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiServiceFactory>& xServiceFactory, uno::Reference<frame::XModel>& xModel, uno::Reference<xml::sax::XParser>& xParser, xml::sax::InputSource& aParserInput, - const rtl::OUString& sComponentName, const rtl::OUString& sDocName, - const rtl::OUString& sOldDocName, uno::Sequence<uno::Any>& aArgs, + const OUString& sComponentName, const OUString& sDocName, + const OUString& sOldDocName, uno::Sequence<uno::Any>& aArgs, sal_Bool bMustBeSuccessfull) { uno::Reference < io::XStream > xDocStream; @@ -118,7 +116,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe xStorage = pMedium->GetStorage(); sal_Bool bEncrypted = false; - rtl::OUString sStream(sDocName); + OUString sStream(sDocName); if( xStorage.is() ) { try @@ -163,7 +161,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - rtl::OUString sPropName("StreamName"); + OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) ); } @@ -212,9 +210,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX parse exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -249,9 +247,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -263,9 +261,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const packages::zip::ZipIOException& r ) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Zip exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif @@ -276,9 +274,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const io::IOException& r ) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "IO exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -289,9 +287,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const uno::Exception& r ) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "uno exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -340,7 +338,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); if ( pObjSh ) { - rtl::OUString sEmpty; + OUString sEmpty; uno::Reference<frame::XModel> xModel(pObjSh->GetModel()); /** property map for export info set */ @@ -351,9 +349,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "NumberStyles" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "PrivateData" ), 0, &::getCppuType( (uno::Reference<uno::XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamName" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamName" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "BuildId" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "VBACompatibilityMode" ), 0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "ScriptConfiguration" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, @@ -389,13 +387,13 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { sal_Int32 nProgressRange(1000000); xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), nProgressRange); - xInfoSet->setPropertyValue(rtl::OUString("ProgressRange"), uno::makeAny(nProgressRange)); + xInfoSet->setPropertyValue(OUString("ProgressRange"), uno::makeAny(nProgressRange)); } // Set base URI OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); - ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : ::rtl::OUString(); - rtl::OUString sPropName("BaseURI"); + OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : OUString(); + OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links @@ -410,18 +408,18 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) aName = pDocHierarchItem->GetValue(); } else - aName = ::rtl::OUString( "dummyObjectName" ); + aName = OUString( "dummyObjectName" ); if( !aName.isEmpty() ) { - sPropName = rtl::OUString("StreamRelPath"); + sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } if (bStylesOnly) { - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True)); } @@ -472,8 +470,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) nMetaRetval = ImportFromComponent( xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLMetaImporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisMetaImporter") + : OUString("com.sun.star.comp.Calc.XMLMetaImporter"), "meta.xml", "Meta.xml", aMetaArgs, false); RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta import end" ); @@ -516,8 +514,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) nSettingsRetval = ImportFromComponent( xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsImporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisSettingsImporter") + : OUString("com.sun.star.comp.Calc.XMLSettingsImporter"), "settings.xml", sEmpty, aSettingsArgs, false); RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings import end" ); @@ -528,9 +526,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import start" ); nStylesRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLStylesImporter"), - rtl::OUString("styles.xml"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") + : OUString("com.sun.star.comp.Calc.XMLStylesImporter"), + OUString("styles.xml"), sEmpty, aStylesArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import end" ); @@ -549,10 +547,10 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import start" ); nDocRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLContentImporter"), - rtl::OUString("content.xml"), - rtl::OUString("Content.xml"), aDocArgs, + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") + : OUString("com.sun.star.comp.Calc.XMLContentImporter"), + OUString("content.xml"), + OUString("Content.xml"), aDocArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import end" ); @@ -661,8 +659,8 @@ static bool lcl_HasValidStream(ScDocument& rDoc) sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServiceFactory>& xServiceFactory, uno::Reference<frame::XModel>& xModel, uno::Reference<xml::sax::XWriter>& xWriter, - uno::Sequence<beans::PropertyValue>& aDescriptor, const rtl::OUString& sName, - const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, + uno::Sequence<beans::PropertyValue>& aDescriptor, const OUString& sName, + const OUString& sMediaType, const OUString& sComponentName, uno::Sequence<uno::Any>& aArgs, ScMySharedData*& pSharedData) { sal_Bool bRet(false); @@ -682,7 +680,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); if (xSet.is()) { - xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType)); + xSet->setPropertyValue(OUString("MediaType"), uno::makeAny(sMediaType)); OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); // advise storage impl to use common encryption @@ -699,7 +697,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - rtl::OUString sPropName("StreamName"); + OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( sName ) ); } @@ -805,10 +803,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "WrittenNumberStyles" ), 0, &::getCppuType((uno::Sequence<sal_Int32>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamName" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StyleNames" ), 0, &::getCppuType( (uno::Sequence<rtl::OUString>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamName" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StyleNames" ), 0, &::getCppuType( (uno::Sequence<OUString>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "StyleFamilies" ), 0, &::getCppuType( (uno::Sequence<sal_Int32>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "TargetStorage" ), 0, &embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { NULL, 0, 0, NULL, 0, 0 } @@ -834,8 +832,8 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) xInfoSet->setPropertyValue( sTargetStorage, uno::Any( xStorage ) ); OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); - ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : ::rtl::OUString(); - rtl::OUString sPropName("BaseURI"); + OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : OUString(); + OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links @@ -852,7 +850,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) if( !aName.isEmpty() ) { - sPropName = rtl::OUString("StreamRelPath"); + sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } @@ -871,9 +869,9 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) const uno::Reference< beans::XPropertySet > xPropSet( xStorage, uno::UNO_QUERY_THROW ); try { - ::rtl::OUString aVersion; + OUString aVersion; if (( xPropSet->getPropertyValue( - rtl::OUString("Version")) >>= aVersion ) + OUString("Version")) >>= aVersion ) && !aVersion.equals(ODFVER_010_TEXT) && !aVersion.equals(ODFVER_011_TEXT) ) { @@ -902,10 +900,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export start" ); bMetaRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("meta.xml"), + OUString("meta.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLMetaExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter") + : OUString("com.sun.star.comp.Calc.XMLMetaExporter"), aMetaArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" ); @@ -943,10 +941,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export start" ); bStylesRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("styles.xml"), + OUString("styles.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLStylesExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter") + : OUString("com.sun.star.comp.Calc.XMLStylesExporter"), aStylesArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" ); @@ -967,10 +965,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export start" ); bDocRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("content.xml"), + OUString("content.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLContentExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisContentExporter") + : OUString("com.sun.star.comp.Calc.XMLContentExporter"), aDocArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" ); @@ -995,10 +993,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export start" ); bSettingsRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("settings.xml"), + OUString("settings.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter") + : OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), aSettingsArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" ); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 7eb84d5bb8e8..e167eb2b4faf 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -266,22 +266,22 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleCell::getImplementationName(void) +OUString SAL_CALL ScAccessibleCell::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleCell"); + return OUString("ScAccessibleCell"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleCell::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessibleCell"); + pNames[nOldSize] = OUString("com.sun.star.sheet.AccessibleCell"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 7481e654030e..831386a88e04 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -113,7 +113,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CCOLOR))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CCOLOR))); aAny >>= nColor; } } @@ -154,7 +154,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLBACK))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLBACK))); aAny >>= nColor; } } @@ -199,16 +199,16 @@ sal_Int32 return mnIndex; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleCellBase::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_CELL_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_CELL_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleCellBase::createAccessibleName(void) throw (uno::RuntimeException) { @@ -222,7 +222,7 @@ sal_Int32 contained in cell A1, ZT reads "cell A twelve" instead of "cell A1 - 2". Simple solution: Append a space character to the cell address. */ sName.Append( ' ' ); - return rtl::OUString(sName); + return OUString(sName); } //===== XAccessibleValue ================================================ @@ -287,10 +287,10 @@ uno::Any SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleCellBase"); + return OUString("ScAccessibleCellBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index f19eb7c4692a..3b58ba1fb40b 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -313,7 +313,7 @@ sal_Int16 SAL_CALL return maRole; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::getAccessibleDescription(void) throw (uno::RuntimeException) { @@ -463,7 +463,7 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent( //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::getImplementationName(void) throw (uno::RuntimeException) { @@ -476,7 +476,7 @@ sal_Bool SAL_CALL { // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); sal_Int32 nLength(aSupportedServices.getLength()); const OUString* pServiceNames = aSupportedServices.getConstArray(); @@ -486,7 +486,7 @@ sal_Bool SAL_CALL return false; } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleContextBase::getSupportedServiceNames(void) throw (uno::RuntimeException) { @@ -523,20 +523,20 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ============================================================ -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::createAccessibleDescription(void) throw (uno::RuntimeException) { OSL_FAIL("should be implemented in the abrevated class"); - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::createAccessibleName(void) throw (uno::RuntimeException) { OSL_FAIL("should be implemented in the abrevated class"); - return rtl::OUString(); + return OUString(); } void ScAccessibleContextBase::CommitChange(const AccessibleEventObject& rEvent) const @@ -552,7 +552,7 @@ void ScAccessibleContextBase::ChangeName() aEvent.Source = uno::Reference< XAccessibleContext >(const_cast<ScAccessibleContextBase*>(this)); aEvent.OldValue <<= msName; - msName = rtl::OUString(); // reset the name so it will be hold again + msName = OUString(); // reset the name so it will be hold again getAccessibleName(); // create the new name aEvent.NewValue <<= msName; diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index deb600879345..65f8778d50a2 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -48,8 +48,6 @@ // ause #include "editutil.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::utl::AccessibleRelationSetHelper; using ::utl::AccessibleStateSetHelper; using ::accessibility::AccessibleStaticTextBase; @@ -455,7 +453,7 @@ sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex ) } Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* aRequestedAttributes */ ) + const ::com::sun::star::uno::Sequence< OUString >& /* aRequestedAttributes */ ) throw( IndexOutOfBoundsException, RuntimeException ) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index 0b3141f7f3a8..6c7134459770 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -102,7 +102,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); @@ -116,12 +116,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -447,10 +447,10 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAc ///===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) +OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleDataPilotControl"); + return OUString("ScAccessibleDataPilotControl"); } ///===== XTypeProvider =================================================== @@ -468,7 +468,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementation //===== internal ======================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleDescription(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -476,10 +476,10 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementation if (mpFieldWindow) return mpFieldWindow->GetDescription(); - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -487,7 +487,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementation if (mpFieldWindow) return mpFieldWindow->GetName(); - return rtl::OUString(); + return OUString(); } Rectangle ScAccessibleDataPilotControl::GetBoundingBoxOnScreen(void) const @@ -658,10 +658,10 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAcc ///===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) +OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString("ScAccessibleDataPilotButton"); + return OUString("ScAccessibleDataPilotButton"); } ///===== XTypeProvider =================================================== @@ -677,13 +677,13 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationI return theScAccessibleDataPilotButtonImplementationId::get().getSeq(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -691,7 +691,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationI if (mpFieldWindow) return mpFieldWindow->GetFieldText(getAccessibleIndexInParent()); - return rtl::OUString(); + return OUString(); } Rectangle ScAccessibleDataPilotButton::GetBoundingBoxOnScreen(void) const diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 76f84f0441ed..d22416ee542d 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -88,8 +88,8 @@ ScAccessibleShapeData::~ScAccessibleShapeData() struct ScShapeDataLess { - rtl::OUString msLayerId; - rtl::OUString msZOrder; + OUString msLayerId; + OUString msZOrder; ScShapeDataLess() : msLayerId(RTL_CONSTASCII_USTRINGPARAM( "LayerID" )), msZOrder(RTL_CONSTASCII_USTRINGPARAM( "ZOrder" )) @@ -1040,7 +1040,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, s uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString( "LayerID" )); + uno::Any aPropAny = xShapeProp->getPropertyValue(OUString( "LayerID" )); sal_Int16 nLayerID = 0; if( aPropAny >>= nLayerID ) { @@ -1361,7 +1361,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { mpTempAccEdit = new ScAccessibleEditObject(this, mpViewShell->GetViewData()->GetEditView(meSplitPos), mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(), - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::CellInEditMode); + OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::CellInEditMode); uno::Reference<XAccessible> xAcc = mpTempAccEdit; AddChild(xAcc, sal_True); @@ -1783,23 +1783,23 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString("ScAccessibleDocument"); + return OUString("ScAccessibleDocument"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleDocument::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); return aSequence; } @@ -1916,23 +1916,23 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA return pRelationSet; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_DOC_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_DOC_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::createAccessibleName(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; IsObjectValid(); - rtl::OUString sName = String(ScResId(STR_ACC_DOC_NAME)); + OUString sName = String(ScResId(STR_ACC_DOC_NAME)); sal_Int32 nNumber(sal_Int32(meSplitPos) + 1); - sName += rtl::OUString::valueOf(nNumber); + sName += OUString::valueOf(nNumber); return sName; } @@ -2057,7 +2057,7 @@ void ScAccessibleDocument::RemoveChild(const uno::Reference<XAccessible>& xAcc, } } -rtl::OUString ScAccessibleDocument::GetCurrentCellName() const +OUString ScAccessibleDocument::GetCurrentCellName() const { String sName( ScResId(STR_ACC_CELL_NAME) ); if (mpViewShell) @@ -2067,12 +2067,12 @@ rtl::OUString ScAccessibleDocument::GetCurrentCellName() const mpViewShell->GetViewData()->GetCurPos().Format( sAddress, SCA_VALID, NULL ); sName.SearchAndReplaceAscii("%1", sAddress); } - return rtl::OUString(sName); + return OUString(sName); } -rtl::OUString ScAccessibleDocument::GetCurrentCellDescription() const +OUString ScAccessibleDocument::GetCurrentCellDescription() const { - return rtl::OUString(); + return OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 99927af07599..afcd4ff01bc3 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1591,21 +1591,21 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString("ScAccessibleDocumentPagePreview"); + return OUString("ScAccessibleDocumentPagePreview"); } -uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) +uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetPageView"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheetPageView"); return aSequence; } @@ -1626,17 +1626,17 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ======================================================== -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_PREVIEWDOC_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_PREVIEWDOC_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) throw (uno::RuntimeException) { - rtl::OUString sName = String(ScResId(STR_ACC_PREVIEWDOC_NAME)); + OUString sName = String(ScResId(STR_ACC_PREVIEWDOC_NAME)); return sName; } diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 8c8583ecf9cb..93d175d446c4 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -42,8 +42,8 @@ using namespace ::com::sun::star::accessibility; ScAccessibleEditObject::ScAccessibleEditObject( const uno::Reference<XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const rtl::OUString& rName, - const rtl::OUString& rDescription, EditObjectType eObjectType) + EditView* pEditView, Window* pWin, const OUString& rName, + const OUString& rDescription, EditObjectType eObjectType) : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT_FRAME), mpTextHelper(NULL), @@ -228,20 +228,20 @@ uno::Reference<XAccessibleStateSet> SAL_CALL return pStateSet; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleEditObject::createAccessibleDescription(void) throw (uno::RuntimeException) { // OSL_FAIL("Should never be called, because is set in the constructor.") - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleEditObject::createAccessibleName(void) throw (uno::RuntimeException) { OSL_FAIL("Should never be called, because is set in the constructor."); - return rtl::OUString(); + return OUString(); } ///===== XAccessibleEventBroadcaster ===================================== @@ -272,10 +272,10 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) +OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleEditObject"); + return OUString("ScAccessibleEditObject"); } //===== XTypeProvider ======================================================= diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index d2618789456a..637b5d589ee7 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -48,7 +48,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; using ::std::for_each; using ::std::vector; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index dfaae342ba46..2104515fccb3 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -40,7 +40,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; ScAccessibleFilterMenuItem::ScAccessibleFilterMenuItem( const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index c5511140c64b..fda7ef5b5208 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::accessibility; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; ScAccessibleFilterTopWindow::ScAccessibleFilterTopWindow( const Reference<XAccessible>& rxParent, ScCheckListMenuWindow* pWin, const OUString& rName) : diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 7291e3ffc7ef..0cf9957f1675 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -316,40 +316,40 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePageHeader"); + return OUString("ScAccessiblePageHeader"); } -uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.text.AccessibleHeaderFooterView"); + pNames[nOldSize] = OUString("com.sun.star.text.AccessibleHeaderFooterView"); return aSequence; } //==== internal ========================================================= -::rtl::OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR)); sDesc.SearchAndReplaceAscii("%1", String(ScResId(SCSTR_UNKNOWN))); - return rtl::OUString( sDesc ); + return OUString( sDesc ); } -::rtl::OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME)); sName.SearchAndReplaceAscii("%1", String(ScResId(SCSTR_UNKNOWN))); - return rtl::OUString( sName ); + return OUString( sName ); } Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 61efa0e810e1..79b9e37c8e68 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -181,23 +181,23 @@ uno::Reference<XAccessibleStateSet> SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessiblePageHeaderArea::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessiblePageHeaderArea"); + return OUString("ScAccessiblePageHeaderArea"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessiblePageHeaderArea::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); + pNames[nOldSize] = OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); return aSequence; } @@ -217,10 +217,10 @@ uno::Sequence<sal_Int8> SAL_CALL } //===== internal ============================================================== -rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) throw(uno::RuntimeException) { - rtl::OUString sDesc; + OUString sDesc; switch (meAdjust) { case SVX_ADJUST_LEFT : @@ -239,10 +239,10 @@ rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(v return sDesc; } -rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) throw (uno::RuntimeException) { - rtl::OUString sName; + OUString sName; switch (meAdjust) { case SVX_ADJUST_LEFT : diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index ce6a79a52da1..2b8df1b29faa 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -180,20 +180,20 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewCell"); + return OUString("ScAccessiblePreviewCell"); } -uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 3f747ee53947..12315f148b96 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -266,20 +266,20 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewHeaderCell"); + return OUString("ScAccessiblePreviewHeaderCell"); } -uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } @@ -360,15 +360,15 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::Runt return Rectangle(); } -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_HEADERCELL_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_HEADERCELL_DESCR)); return sDescription; } -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException) { - rtl::OUString sName = String(ScResId(STR_ACC_HEADERCELL_NAME)); + OUString sName = String(ScResId(STR_ACC_HEADERCELL_NAME)); if ( mbColumnHeader ) { @@ -376,7 +376,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr { //! name for corner cell? -// sName = rtl::OUString("Column/Row Header"); +// sName = OUString("Column/Row Header"); } else { @@ -387,7 +387,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr else { // name of row header - sName += rtl::OUString::valueOf( (sal_Int32) ( maCellPos.Row() + 1 ) ); + sName += OUString::valueOf( (sal_Int32) ( maCellPos.Row() + 1 ) ); } return sName; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 557db8336f5f..2ed5c55fcb5f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnCount() throw (u return nRet; } -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int32 nRow ) +OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -167,10 +167,10 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa if ( nRow < 0 || (mpTableInfo && nRow >= mpTableInfo->GetRows()) ) throw lang::IndexOutOfBoundsException(); - return rtl::OUString(); + return OUString(); } -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_Int32 nColumn ) +OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -178,7 +178,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( if ( nColumn < 0 || (mpTableInfo && nColumn >= mpTableInfo->GetCols()) ) throw lang::IndexOutOfBoundsException(); - return rtl::OUString(); + return OUString(); } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) @@ -566,20 +566,20 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewTable"); + return OUString("ScAccessiblePreviewTable"); } -uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleTableView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleTableView"); return aSequence; } @@ -605,14 +605,14 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() //==== internal ========================================================= -::rtl::OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(STR_ACC_TABLE_DESCR)); - return rtl::OUString(sDesc); + return OUString(sDesc); } -::rtl::OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(STR_ACC_TABLE_NAME)); @@ -623,13 +623,13 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() if ( mpTableInfo ) { - rtl::OUString sCoreName; + OUString sCoreName; if (mpViewShell->GetDocument()->GetName( mpTableInfo->GetTab(), sCoreName )) sName.SearchAndReplaceAscii("%1", sCoreName); } } - return rtl::OUString(sName); + return OUString(sName); } Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 88037b59b4c5..2dddb0627fdd 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -795,22 +795,22 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) +OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleSpreadsheet"); + return OUString("ScAccessibleSpreadsheet"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleSpreadsheet::getSupportedServiceNames (void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheet"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheet"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index b5de4ab84886..95d8e1b293bf 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -98,7 +98,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) return maRange.aEnd.Col() - maRange.aStart.Col() + 1; } -::rtl::OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow ) +OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { OSL_FAIL("Here should be a implementation to fill the description"); @@ -107,10 +107,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) throw lang::IndexOutOfBoundsException(); //setAccessibleRowDescription(nRow, xAccessible); // to remember the created Description - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn ) +OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { OSL_FAIL("Here should be a implementation to fill the description"); @@ -119,7 +119,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) throw lang::IndexOutOfBoundsException(); //setAccessibleColumnDescription(nColumn, xAccessible); // to remember the created Description - return rtl::OUString(); + return OUString(); } sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) @@ -346,23 +346,23 @@ uno::Reference< XAccessible > SAL_CALL return getAccessibleCellAt(nRow, nColumn); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleTableBase::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(STR_ACC_TABLE_DESCR)); - return rtl::OUString(sDesc); + return OUString(sDesc); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleTableBase::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(STR_ACC_TABLE_NAME)); - rtl::OUString sCoreName; + OUString sCoreName; if (mpDoc && mpDoc->GetName( maRange.aStart.Tab(), sCoreName )) sName.SearchAndReplaceAscii("%1", sCoreName); - return rtl::OUString(sName); + return OUString(sName); } uno::Reference<XAccessibleRelationSet> SAL_CALL @@ -436,10 +436,10 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleTableBase"); + return OUString("ScAccessibleTableBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx index a87fce64a219..58c219857c18 100644 --- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx +++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx @@ -74,9 +74,9 @@ void ScDrawModelBroadcaster::Notify( SfxBroadcaster&, { (void) r; #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Runtime exception caught while notifying shape.:\n")); - aError.append(rtl::OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 6ac43354cb71..fab510e3e8b0 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -152,9 +152,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType( "ButtonType" ); - rtl::OUString sPropTargetURL( "TargetURL" ); - rtl::OUString sPropLabel( "Label" ); + OUString sPropButtonType( "ButtonType" ); + OUString sPropTargetURL( "TargetURL" ); + OUString sPropLabel( "Label" ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -166,7 +166,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain if(xInfo->hasPropertyByName( sPropTargetURL )) { aAny = xPropSet->getPropertyValue( sPropTargetURL ); - rtl::OUString sTmp; + OUString sTmp; if ( (aAny >>= sTmp) && !sTmp.isEmpty() ) { String aUrl = sTmp; @@ -537,7 +537,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse try { uno::Sequence < beans::PropertyValue > aSeq; - ::rtl::OUString aDummyName("Dummy"); + OUString aDummyName("Dummy"); xPers->storeToEntry( xWorkStore, aDummyName, aSeq, aSeq ); if ( xWorkStore->isStreamElement( aDummyName ) ) { diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 349b1e29b6d7..7f6ac08c6f95 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -105,7 +105,7 @@ sal_Unicode lcl_getSheetSeparator(ScDocument* pDoc) ScTypedCaseStrSet::const_iterator findText( const ScTypedCaseStrSet& rDataSet, ScTypedCaseStrSet::const_iterator itPos, - const rtl::OUString& rStart, rtl::OUString& rResult, bool bBack) + const OUString& rStart, OUString& rResult, bool bBack) { if (bBack) // rueckwaerts { @@ -161,7 +161,7 @@ ScTypedCaseStrSet::const_iterator findText( return rDataSet.end(); // no matching text found. } -rtl::OUString getExactMatch(const ScTypedCaseStrSet& rDataSet, const rtl::OUString& rString) +OUString getExactMatch(const ScTypedCaseStrSet& rDataSet, const OUString& rString) { ScTypedCaseStrSet::const_iterator it = rDataSet.begin(), itEnd = rDataSet.end(); for (; it != itEnd; ++it) @@ -178,9 +178,9 @@ rtl::OUString getExactMatch(const ScTypedCaseStrSet& rDataSet, const rtl::OUStri return rString; } -void removeChars(rtl::OUString& rStr, sal_Unicode c) +void removeChars(OUString& rStr, sal_Unicode c) { - rtl::OUStringBuffer aBuf(rStr); + OUStringBuffer aBuf(rStr); for (sal_Int32 i = 0, n = aBuf.getLength(); i < n; ++i) { if (aBuf[i] == c) @@ -202,7 +202,7 @@ void ScInputHandler::InitRangeFinder( const String& rFormula ) return; String aDelimiters = ScEditUtil::ModifyDelimiters( - rtl::OUString::createFromAscii( pMinDelimiters ) ); + OUString::createFromAscii( pMinDelimiters ) ); xub_StrLen nColon = aDelimiters.Search(':'); if ( nColon != STRING_NOTFOUND ) @@ -384,12 +384,12 @@ inline String GetEditText(EditEngine* pEng) return ScEditUtil::GetSpaceDelimitedString(*pEng); } -static void lcl_RemoveTabs(rtl::OUString& rStr) +static void lcl_RemoveTabs(OUString& rStr) { removeChars(rStr, sal_Unicode('\t')); } -static void lcl_RemoveLineEnd(rtl::OUString& rStr) +static void lcl_RemoveLineEnd(OUString& rStr) { rStr = convertLineEnd(rStr, LINEEND_LF); removeChars(rStr, sal_Unicode('\n')); @@ -787,7 +787,7 @@ void ScInputHandler::HideTip() nTipVisible = 0; pTipVisibleParent = NULL; } - aManualTip = rtl::OUString(); + aManualTip = OUString(); } void ScInputHandler::HideTipBelow() { @@ -799,7 +799,7 @@ void ScInputHandler::HideTipBelow() nTipVisibleSec = 0; pTipVisibleSecParent = NULL; } - aManualTip = rtl::OUString(); + aManualTip = OUString(); } void ScInputHandler::ShowTipCursor() @@ -826,7 +826,7 @@ void ScInputHandler::ShowTipCursor() xub_StrLen nNextFEnd = 0; xub_StrLen nArgPos = 0; const IFunctionDescription* ppFDesc; - ::std::vector< ::rtl::OUString> aArgs; + ::std::vector< OUString> aArgs; sal_uInt16 nArgs; bool bFound = false; FormulaHelper aHelper(ScGlobal::GetStarCalcFunctionMgr()); @@ -848,7 +848,7 @@ void ScInputHandler::ShowTipCursor() nArgPos = aHelper.GetArgStart( aSelText, nNextFStart, 0 ); nArgs = static_cast<sal_uInt16>(ppFDesc->getParameterCount()); - rtl::OUString aNew; + OUString aNew; ScTypedCaseStrSet::const_iterator it = findText(*pFormulaDataPara, pFormulaDataPara->end(), ppFDesc->getFunctionName(), aNew, false); if (it != pFormulaDataPara->end()) @@ -934,7 +934,7 @@ void ScInputHandler::ShowTipCursor() if (nStartPosition > 0) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aNew.copy(0, nStartPosition)); aBuf.append(static_cast<sal_Unicode>(0x25BA)); aBuf.append(aNew.copy(nStartPosition)); @@ -960,7 +960,7 @@ void ScInputHandler::ShowTipCursor() { break; } - rtl::OUString aNew; + OUString aNew; nPosition = aText.Len()+1; ScTypedCaseStrSet::const_iterator it = findText(*pFormulaDataPara, pFormulaDataPara->end(), aText, aNew, false); @@ -1062,14 +1062,14 @@ void ScInputHandler::UseFormulaData() xub_StrLen nNextFEnd = 0; xub_StrLen nArgPos = 0; const IFunctionDescription* ppFDesc; - ::std::vector< ::rtl::OUString> aArgs; + ::std::vector< OUString> aArgs; sal_uInt16 nArgs; bool bFound = false; - rtl::OUString aText = pEngine->GetWord( 0, aSel.nEndPos-1 ); + OUString aText = pEngine->GetWord( 0, aSel.nEndPos-1 ); if (!aText.isEmpty()) { - rtl::OUString aNew; + OUString aNew; miAutoPosFormula = pFormulaData->end(); miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, aText, aNew, false); if (miAutoPosFormula != pFormulaData->end()) @@ -1099,7 +1099,7 @@ void ScInputHandler::UseFormulaData() nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 0 ); nArgs = static_cast<sal_uInt16>(ppFDesc->getParameterCount()); - rtl::OUString aNew; + OUString aNew; ScTypedCaseStrSet::const_iterator it = findText(*pFormulaDataPara, pFormulaDataPara->end(), ppFDesc->getFunctionName(), aNew, false); if (it != pFormulaDataPara->end()) @@ -1185,7 +1185,7 @@ void ScInputHandler::UseFormulaData() if (nStartPosition > 0) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aNew.copy(0, nStartPosition)); aBuf.append(static_cast<sal_Unicode>(0x25BA)); aBuf.append(aNew.copy(nStartPosition)); @@ -1212,7 +1212,7 @@ void ScInputHandler::NextFormulaEntry( bool bBack ) EditView* pActiveView = pTopView ? pTopView : pTableView; if ( pActiveView && pFormulaData ) { - rtl::OUString aNew; + OUString aNew; ScTypedCaseStrSet::const_iterator itNew = findText(*pFormulaData, miAutoPosFormula, aAutoSearch, aNew, bBack); if (itNew != pFormulaData->end()) { @@ -1275,7 +1275,7 @@ void ScInputHandler::PasteFunctionData() if (pFormulaData && miAutoPosFormula != pFormulaData->end()) { const ScTypedStrData& rData = *miAutoPosFormula; - const rtl::OUString& aInsert = rData.GetString(); + const OUString& aInsert = rData.GetString(); bool bParInserted = false; DataChanging(); // kann nicht neu sein @@ -1321,7 +1321,7 @@ static String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScA if ( pCell->GetCode()->GetCodeLen() <= 1 ) { // ==1: einzelner ist als Parameter immer Bereich // ==0: es waere vielleicht einer, wenn.. - rtl::OUStringBuffer aBraced; + OUStringBuffer aBraced; aBraced.append('('); aBraced.append(rFormula); aBraced.append(')'); @@ -1378,7 +1378,7 @@ static String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScA void ScInputHandler::FormulaPreview() { - rtl::OUString aValue; + OUString aValue; EditView* pActiveView = pTopView ? pTopView : pTableView; if ( pActiveView && pActiveViewSh ) { @@ -1555,10 +1555,10 @@ void ScInputHandler::UseColData() // beim Tippen xub_StrLen nParLen = pEngine->GetTextLen( aSel.nEndPara ); if ( aSel.nEndPos == nParLen ) { - rtl::OUString aText = GetEditText(pEngine); + OUString aText = GetEditText(pEngine); if (!aText.isEmpty()) { - rtl::OUString aNew; + OUString aNew; miAutoPosColumn = pColumnData->end(); miAutoPosColumn = findText(*pColumnData, miAutoPosColumn, aText, aNew, false); if (miAutoPosColumn != pColumnData->end()) @@ -1573,7 +1573,7 @@ void ScInputHandler::UseColData() // beim Tippen // ein Space zwischen Absaetzen: sal_Int32 nEdLen = pEngine->GetTextLen() + nParCnt - 1; - rtl::OUString aIns = aNew.copy(nEdLen); + OUString aIns = aNew.copy(nEdLen); // selection must be "backwards", so the cursor stays behind the last // typed character @@ -1599,7 +1599,7 @@ void ScInputHandler::UseColData() // beim Tippen // Wenn der eingegebene Text gefunden wurde, TAB nur dann // verschlucken, wenn noch etwas kommt - rtl::OUString aDummy; + OUString aDummy; ScTypedCaseStrSet::const_iterator itNextPos = findText(*pColumnData, miAutoPosColumn, aText, aDummy, false); bUseTab = itNextPos != pColumnData->end(); @@ -1627,12 +1627,12 @@ void ScInputHandler::NextAutoEntry( bool bBack ) sal_uInt16 nParCnt = pEngine->GetParagraphCount(); if ( aSel.nEndPara+1 == nParCnt && aSel.nStartPara == aSel.nEndPara ) { - rtl::OUString aText = GetEditText(pEngine); + OUString aText = GetEditText(pEngine); xub_StrLen nSelLen = aSel.nEndPos - aSel.nStartPos; xub_StrLen nParLen = pEngine->GetTextLen( aSel.nEndPara ); if ( aSel.nEndPos == nParLen && aText.getLength() == aAutoSearch.getLength() + nSelLen ) { - rtl::OUString aNew; + OUString aNew; ScTypedCaseStrSet::const_iterator itNew = findText(*pColumnData, miAutoPosColumn, aAutoSearch, aNew, bBack); @@ -1643,7 +1643,7 @@ void ScInputHandler::NextAutoEntry( bool bBack ) bInOwnChange = true; // disable ModifyHdl (reset below) lcl_RemoveLineEnd( aNew ); - rtl::OUString aIns = aNew.copy(aAutoSearch.getLength()); + OUString aIns = aNew.copy(aAutoSearch.getLength()); // when editing in input line, apply to both edit views if ( pTableView ) @@ -2060,7 +2060,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn pEngine->SetText(aCurrentText); aStr = aCurrentText; bTextValid = false; - aCurrentText = rtl::OUString(); + aCurrentText = OUString(); } else aStr = GetEditText(pEngine); @@ -2154,7 +2154,7 @@ IMPL_LINK_NOARG(ScInputHandler, ModifyHdl) // update input line from ModifyHdl for changes that are not // wrapped by DataChanging/DataChanged calls (like Drag&Drop) - rtl::OUString aText; + OUString aText; if ( pInputWin->IsMultiLineInput() ) aText = ScEditUtil::GetMultilineString(*pEngine); else @@ -2207,7 +2207,7 @@ void ScInputHandler::DataChanged( bool bFromTopNotify, bool bSetModified ) if (eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE) { - rtl::OUString aText; + OUString aText; if ( pInputWin && pInputWin->IsMultiLineInput() ) aText = ScEditUtil::GetMultilineString(*pEngine); else @@ -2496,7 +2496,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) ScPatternAttr* pCellAttrs = NULL; bool bForget = false; // wegen Gueltigkeit streichen ? - rtl::OUString aString = GetEditText(pEngine); + OUString aString = GetEditText(pEngine); EditView* pActiveView = pTopView ? pTopView : pTableView; if (bModified && pActiveView && !aString.isEmpty() && !lcl_IsNumber(aString)) { @@ -2753,37 +2753,37 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) SvxAutoCorrect* pAuto = SvxAutoCorrCfg::Get().GetAutoCorrect(); if ( pAuto ) { - rtl::OUString aReplace(pAuto->GetStartDoubleQuote()); + OUString aReplace(pAuto->GetStartDoubleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkStart(); if (!aReplace.equalsAsciiL("\"", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); + OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); - aReplace = rtl::OUString(pAuto->GetEndDoubleQuote()); + aReplace = OUString(pAuto->GetEndDoubleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkEnd(); if (!aReplace.equalsAsciiL("\"", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); + OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); - aReplace = rtl::OUString(pAuto->GetStartSingleQuote()); + aReplace = OUString(pAuto->GetStartSingleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getQuotationMarkStart(); if (!aReplace.equalsAsciiL("'", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString("'")); + OUString("'")); - aReplace = rtl::OUString(pAuto->GetEndSingleQuote()); + aReplace = OUString(pAuto->GetEndSingleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getQuotationMarkEnd(); if (!aReplace.equalsAsciiL("'", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString("'")); + OUString("'")); } } @@ -2828,7 +2828,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) HideTipBelow(); nFormSelStart = nFormSelEnd = 0; - aFormText = rtl::OUString(); + aFormText = OUString(); bInOwnChange = false; bInEnterHandler = false; @@ -2880,7 +2880,7 @@ void ScInputHandler::CancelHandler() NotifyChange( pLastState, true ); nFormSelStart = nFormSelEnd = 0; - aFormText = rtl::OUString(); + aFormText = OUString(); bInOwnChange = false; } @@ -2905,9 +2905,9 @@ void ScInputHandler::AddRefEntry() RemoveSelection(); if (pTableView) - pTableView->InsertText( rtl::OUString(cSep), false ); + pTableView->InsertText( OUString(cSep), false ); if (pTopView) - pTopView->InsertText( rtl::OUString(cSep), false ); + pTopView->InsertText( OUString(cSep), false ); DataChanged(); } @@ -3502,7 +3502,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, const ScAddress& rSPos = pState->GetStartPos(); const ScAddress& rEPos = pState->GetEndPos(); const EditTextObject* pData = pState->GetEditData(); - rtl::OUString aString = pState->GetString(); + OUString aString = pState->GetString(); bool bTxtMod = false; ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); @@ -3529,7 +3529,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, aString = GetEditText(pEngine); lcl_RemoveTabs(aString); bTextValid = false; - aCurrentText = rtl::OUString(); + aCurrentText = OUString(); } else { @@ -3543,7 +3543,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, if ( pInputWin ) // Bereichsanzeige { - rtl::OUString aPosStr; + OUString aPosStr; const ScAddress::Details aAddrDetails( pDoc, aCursorPos ); // Ist der Bereich ein Name? @@ -3730,7 +3730,7 @@ void ScInputHandler::InputChanged( EditView* pView, bool bFromNotify ) SyncViews( pView ); } -const rtl::OUString& ScInputHandler::GetEditString() +const OUString& ScInputHandler::GetEditString() { if (pEngine) { @@ -3779,7 +3779,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) { xub_StrLen nLen = rDestEngine.GetTextLen( (sal_uInt16)0 ); ESelection aSel( 0,nLen, 1,0 ); - rDestEngine.QuickInsertText( rtl::OUString(' '), aSel ); // Umbruch durch Space ersetzen + rDestEngine.QuickInsertText( OUString(' '), aSel ); // Umbruch durch Space ersetzen --nParCnt; } @@ -3852,7 +3852,7 @@ void ScInputHandler::InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd ) //------------------------------------------------------------------------ -void ScInputHandler::InputReplaceSelection( const rtl::OUString& rStr ) +void ScInputHandler::InputReplaceSelection( const OUString& rStr ) { if (!pRefViewSh) pRefViewSh = pActiveViewSh; @@ -3862,7 +3862,7 @@ void ScInputHandler::InputReplaceSelection( const rtl::OUString& rStr ) sal_Int32 nOldLen = nFormSelEnd - nFormSelStart; sal_Int32 nNewLen = rStr.getLength(); - rtl::OUStringBuffer aBuf(aFormText); + OUStringBuffer aBuf(aFormText); if (nOldLen) aBuf.remove(nFormSelStart, nOldLen); if (nNewLen) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 27ff958d4176..aa069dbf7659 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -510,7 +510,7 @@ void ScInputWindow::Select() if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt { aTextWindow.StartEditEngine(); - aTextWindow.SetTextString(rtl::OUString('=')); + aTextWindow.SetTextString(OUString('=')); EditView* pView = aTextWindow.GetEditView(); if (pView) @@ -1088,7 +1088,7 @@ void ScInputBarGroup::TriggerToolboxLayout() if ( xPropSet.is() ) { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } @@ -1998,8 +1998,8 @@ void ScTextWnd::ImplInitSettings() ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScTextWnd::CreateAccessible() { return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), NULL, this, - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_NAME))), - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::EditLine); + OUString(String(ScResId(STR_ACC_EDITLINE_NAME))), + OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::EditLine); } void ScTextWnd::InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) @@ -2047,7 +2047,7 @@ ScPosWnd::ScPosWnd( Window* pParent ) : nTipVisible ( 0 ), bFormulaMode( false ) { - Size aSize( GetTextWidth( rtl::OUString("GW99999:GW99999") ), + Size aSize( GetTextWidth( OUString("GW99999:GW99999") ), GetTextHeight() ); aSize.Width() += 25; // ?? aSize.Height() = CalcWindowSizePixel(11); // Funktionen: 10 MRU + "andere..." @@ -2093,12 +2093,12 @@ void ScPosWnd::SetPos( const String& rPosStr ) namespace { -rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName) +OUString createLocalRangeName(const OUString& rName, const OUString& rTableName) { - rtl::OUStringBuffer aString (rName); - aString.append(rtl::OUString(" (")); + OUStringBuffer aString (rName); + aString.append(OUString(" (")); aString.append(rTableName); - aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aString.append(OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); return aString.makeStringAndClear(); } @@ -2117,7 +2117,7 @@ void ScPosWnd::FillRangeNames() SetSeparatorPos(0); ScRange aDummy; - std::set<rtl::OUString> aSet; + std::set<OUString> aSet; ScRangeName* pRangeNames = pDoc->GetRangeName(); if (!pRangeNames->empty()) { @@ -2133,7 +2133,7 @@ void ScPosWnd::FillRangeNames() ScRangeName* pLocalRangeName = pDoc->GetRangeName(i); if (pLocalRangeName && !pLocalRangeName->empty()) { - rtl::OUString aTableName; + OUString aTableName; pDoc->GetName(i, aTableName); for (ScRangeName::const_iterator itr = pLocalRangeName->begin(); itr != pLocalRangeName->end(); ++itr) { @@ -2145,7 +2145,7 @@ void ScPosWnd::FillRangeNames() if (!aSet.empty()) { - for (std::set<rtl::OUString>::iterator itr = aSet.begin(); + for (std::set<OUString>::iterator itr = aSet.begin(); itr != aSet.end(); ++itr) { InsertEntry(*itr); diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index f72718831606..8d20ac100798 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -43,7 +43,7 @@ static SfxItemInfo const aMsgItemInfos[] = //------------------------------------------------------------------------ ScMessagePool::ScMessagePool() - : SfxItemPool ( rtl::OUString("ScMessagePool"), + : SfxItemPool ( OUString("ScMessagePool"), MSGPOOL_START, MSGPOOL_END, aMsgItemInfos, NULL ), // diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 01602ecf8460..7b79ae85adf6 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -136,7 +136,7 @@ void ScDLL::Init() ScModule* pMod = new ScModule( &ScDocShell::Factory() ); (*ppShlPtr) = pMod; - ScDocShell::Factory().SetDocumentServiceName( rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); + ScDocShell::Factory().SetDocumentServiceName( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); ScGlobal::Init(); // erst wenn der ResManager initialisiert ist // erst nach ScGlobal::Init duerfen die App-Optionen diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index a177050668d6..63ab473ea7a9 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -150,7 +150,7 @@ ScModule::ScModule( SfxObjectFactory* pFact ) : { // im ctor ist der ResManager (DLL-Daten) noch nicht initialisiert! - SetName(rtl::OUString("StarCalc")); // fuer Basic + SetName(OUString("StarCalc")); // fuer Basic ResetDragObject(); SetClipObject( NULL, NULL ); @@ -378,13 +378,13 @@ void ScModule::Execute( SfxRequest& rReq ) { case SID_CHOOSE_DESIGN: { - rtl::OUString aMacroName("Template.Samples.ShowStyles"); + OUString aMacroName("Template.Samples.ShowStyles"); SfxApplication::CallAppBasic( aMacroName ); } break; case SID_EURO_CONVERTER: { - rtl::OUString aMacroName("Euro.ConvertRun.Main"); + OUString aMacroName("Euro.ConvertRun.Main"); SfxApplication::CallAppBasic( aMacroName ); } break; @@ -641,11 +641,11 @@ void ScModule::ResetDragObject() mpDragData->pCellTransfer = NULL; mpDragData->pDrawTransfer = NULL; mpDragData->pJumpLocalDoc = NULL; - mpDragData->aLinkDoc = rtl::OUString(); - mpDragData->aLinkTable = rtl::OUString(); - mpDragData->aLinkArea = rtl::OUString(); - mpDragData->aJumpTarget = rtl::OUString(); - mpDragData->aJumpText = rtl::OUString(); + mpDragData->aLinkDoc = OUString(); + mpDragData->aLinkTable = OUString(); + mpDragData->aLinkArea = OUString(); + mpDragData->aJumpTarget = OUString(); + mpDragData->aJumpText = OUString(); } const ScDragData& ScModule::GetDragData() const @@ -661,7 +661,7 @@ void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawO } void ScModule::SetDragLink( - const rtl::OUString& rDoc, const rtl::OUString& rTab, const rtl::OUString& rArea ) + const OUString& rDoc, const OUString& rTab, const OUString& rArea ) { ResetDragObject(); mpDragData->aLinkDoc = rDoc; @@ -670,7 +670,7 @@ void ScModule::SetDragLink( } void ScModule::SetDragJump( - ScDocument* pLocalDoc, const rtl::OUString& rTarget, const rtl::OUString& rText ) + ScDocument* pLocalDoc, const OUString& rTarget, const OUString& rText ) { ResetDragObject(); @@ -2245,7 +2245,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) else { OSL_FAIL("unbekannter Feldbefehl"); - pInfo->SetRepresentation(rtl::OUString('?')); + pInfo->SetRepresentation(OUString('?')); } } diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 417f3c28fa99..425a868b7e11 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -59,7 +59,7 @@ void ScModule::SetAutoSpellProperty( sal_Bool bSet ) uno::Any aAny; aAny <<= bSet; - aConfig.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LINGUPROP_AUTOSPELL )), aAny ); + aConfig.SetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( LINGUPROP_AUTOSPELL )), aAny ); } diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 5c84e26cbb6e..4b504dc36943 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -55,7 +55,7 @@ static sal_Bool lcl_IsURLButton( SdrObject* pObject ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType( "ButtonType" ); + OUString sPropButtonType( "ButtonType" ); if(xInfo->hasPropertyByName( sPropButtonType )) { uno::Any aAny = xPropSet->getPropertyValue( sPropButtonType ); diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 721b4b2f95e6..6bf6d931d80d 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -322,9 +322,9 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) // DataType depends on format type: - if ( rFlavor.DataType.equals( ::getCppuType( (const ::rtl::OUString*) 0 ) ) ) + if ( rFlavor.DataType.equals( ::getCppuType( (const OUString*) 0 ) ) ) { - rtl::OUString aString; + OUString aString; if ( aObj.ExportString( aString, nFormat ) ) bOK = SetString( aString, rFlavor ); } @@ -598,7 +598,7 @@ void ScTransferObj::InitDocShell() pDestDoc->SetDocOptions( pDoc->GetDocOptions() ); // #i42666# - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( aBlock.aStart.Tab(), aTabName ); pDestDoc->RenameTab( 0, aTabName, false ); // no UpdateRef (empty) diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 158079109f60..724ceec86d8a 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -77,7 +77,7 @@ ScInputStatusItem::~ScInputStatusItem() String ScInputStatusItem::GetValueText() const { - return rtl::OUString("InputStatus"); + return OUString("InputStatus"); } int ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const @@ -185,7 +185,7 @@ ScSortItem::~ScSortItem() String ScSortItem::GetValueText() const { - return rtl::OUString("SortItem"); + return OUString("SortItem"); } //------------------------------------------------------------------------ @@ -292,7 +292,7 @@ bool ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const String ScQueryItem::GetValueText() const { - return rtl::OUString("QueryItem"); + return OUString("QueryItem"); } //------------------------------------------------------------------------ @@ -356,7 +356,7 @@ ScSubTotalItem::~ScSubTotalItem() String ScSubTotalItem::GetValueText() const { - return rtl::OUString("SubTotalItem"); + return OUString("SubTotalItem"); } //------------------------------------------------------------------------ @@ -417,7 +417,7 @@ ScUserListItem::~ScUserListItem() String ScUserListItem::GetValueText() const { - return rtl::OUString("ScUserListItem"); + return OUString("ScUserListItem"); } //------------------------------------------------------------------------ @@ -483,7 +483,7 @@ ScConsolidateItem::~ScConsolidateItem() String ScConsolidateItem::GetValueText() const { - return rtl::OUString("ScConsolidateItem"); + return OUString("ScConsolidateItem"); } //------------------------------------------------------------------------ @@ -544,7 +544,7 @@ ScPivotItem::~ScPivotItem() String ScPivotItem::GetValueText() const { - return rtl::OUString("ScPivotItem"); + return OUString("ScPivotItem"); } //------------------------------------------------------------------------ @@ -597,7 +597,7 @@ ScSolveItem::~ScSolveItem() String ScSolveItem::GetValueText() const { - return rtl::OUString("ScSolveItem"); + return OUString("ScSolveItem"); } //------------------------------------------------------------------------ @@ -647,7 +647,7 @@ ScTabOpItem::~ScTabOpItem() String ScTabOpItem::GetValueText() const { - return rtl::OUString("ScTabOpItem"); + return OUString("ScTabOpItem"); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 910b6c50d9c4..10be2588d8cd 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -23,7 +23,6 @@ #include <osl/module.hxx> #include <rtl/ustrbuf.hxx> -using ::rtl::OUStringBuffer; typedef ScAbstractDialogFactory* (SAL_CALL *ScFuncPtrCreateDialogFactory)(); @@ -49,7 +48,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( ScAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") ); + aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ); if ( fp ) return fp(); return 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index e511c7bb7e0f..0c4304075392 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -218,12 +218,12 @@ bool AbstractScDataPilotSourceTypeDlg_Impl::IsNamedRange() const return pDlg->IsNamedRange(); } -rtl::OUString AbstractScDataPilotSourceTypeDlg_Impl::GetSelectedNamedRange() const +OUString AbstractScDataPilotSourceTypeDlg_Impl::GetSelectedNamedRange() const { return pDlg->GetSelectedNamedRange(); } -void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const ::rtl::OUString& rName) +void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rName) { pDlg->AppendNamedRange(rName); } @@ -483,7 +483,7 @@ bool AbstractScMoveTableDlg_Impl::GetRenameTable() const { return pDlg->GetRenameTable(); } -void AbstractScMoveTableDlg_Impl::GetTabNameString( rtl::OUString& rString ) const +void AbstractScMoveTableDlg_Impl::GetTabNameString( OUString& rString ) const { pDlg->GetTabNameString( rString ); } @@ -510,7 +510,7 @@ sal_uInt16 AbstractScNameCreateDlg_Impl::GetFlags() const -std::vector<rtl::OUString> AbstractScNamePasteDlg_Impl::GetSelectedNames() const +std::vector<OUString> AbstractScNamePasteDlg_Impl::GetSelectedNames() const { return pDlg->GetSelectedNames(); } @@ -572,13 +572,13 @@ String AbstractScDPShowDetailDlg_Impl::GetDimensionName() const } void AbstractScNewScenarioDlg_Impl::SetScenarioData( - const rtl::OUString& rName, const rtl::OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) + const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { pDlg->SetScenarioData(rName, rComment, rColor, nFlags); } void AbstractScNewScenarioDlg_Impl::GetScenarioData( - rtl::OUString& rName, rtl::OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const + OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const { pDlg->GetScenarioData(rName, rComment, rColor, rFlags); } @@ -594,7 +594,7 @@ sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryCount() const } void AbstractScShowTabDlg_Impl::SetDescription( const String& rTitle, const String& rFixedText, - const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId ) + const OString& sDlgHelpId, const OString& sLbHelpId ) { pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId ); } @@ -609,7 +609,7 @@ String AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const -void AbstractScStringInputDlg_Impl::GetInputString( rtl::OUString& rString ) const +void AbstractScStringInputDlg_Impl::GetInputString( OUString& rString ) const { pDlg->GetInputString( rString ); } @@ -811,7 +811,7 @@ AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilo AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent, - const com::sun::star::uno::Sequence<rtl::OUString>& rServices, + const com::sun::star::uno::Sequence<OUString>& rServices, int nId ) { ScDataPilotServiceDlg * pDlg=NULL; @@ -1268,7 +1268,7 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window 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 ) { ScStringInputDlg * pDlg=NULL; @@ -1293,7 +1293,7 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg ( const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - const rtl::OString& sHelpId , + const OString& sHelpId , int nId ) { ScTabBgColorDlg * pDlg=NULL; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 5720c691ca72..55d11513b44e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -146,8 +146,8 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy virtual bool IsDatabase() const; virtual bool IsExternal() const; virtual bool IsNamedRange() const; - virtual rtl::OUString GetSelectedNamedRange() const; - virtual void AppendNamedRange(const ::rtl::OUString& rName); + virtual OUString GetSelectedNamedRange() const; + virtual void AppendNamedRange(const OUString& rName); }; class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg //add for ScDataPilotServiceDlg @@ -265,7 +265,7 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM virtual sal_uInt16 GetSelectedTable () const; virtual bool GetCopyTable () const; virtual bool GetRenameTable () const; - virtual void GetTabNameString( rtl::OUString& rString ) const; + virtual void GetTabNameString( OUString& rString ) const; virtual void SetForceCopyTable (); virtual void EnableCopyTable (sal_Bool bFlag=true); virtual void EnableRenameTable (sal_Bool bFlag=true); @@ -280,7 +280,7 @@ class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg //add for S class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg //add for ScNamePasteDlg { DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg ) - virtual std::vector<rtl::OUString> GetSelectedNames() const; + virtual std::vector<OUString> GetSelectedNames() const; virtual bool IsAllSelected() const; }; @@ -326,10 +326,10 @@ class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg //add for ScNewScenarioDlg { DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg ) - 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 ); - virtual void GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, + virtual void GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const; }; @@ -338,7 +338,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowT DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) virtual void Insert( const String& rString, sal_Bool bSelected ); virtual sal_uInt16 GetSelectEntryCount() const; - virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId ); + virtual void SetDescription(const String& rTitle, const String& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ); virtual String GetSelectEntry(sal_uInt16 nPos) const; virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const; }; @@ -346,7 +346,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowT class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg //add for ScStringInputDlg { DECL_ABSTDLG_BASE( AbstractScStringInputDlg_Impl, ScStringInputDlg ) - virtual void GetInputString( rtl::OUString& rString ) const; + virtual void GetInputString( OUString& rString ) const; }; class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg //add for ScTabBgColorDlg @@ -422,7 +422,7 @@ public: virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) ; //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 ); virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, sal_Bool bDisallowCellMove = false ); //add for ScDeleteCellDlg @@ -529,14 +529,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 ); virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScStringInputDlg const String& rTitle, //Dialog Title const String& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color - const rtl::OString& sHelpId , + const OString& sHelpId , int nId ); virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index e13894aef1f1..3d33e800e2a9 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -33,8 +33,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::accessibility::XAccessible; using ::com::sun::star::accessibility::XAccessibleContext; -using ::rtl::OUString; -using ::rtl::OUStringHash; using ::std::vector; using ::boost::unordered_map; using ::std::auto_ptr; diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index ab583cb3d5d0..5c1d41563b7e 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -27,7 +27,6 @@ #include "docpool.hxx" #include "patattr.hxx" -using rtl::OUString; ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY, ScDocument* pDoc) : mpDoc(pDoc), diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index d7b8013f8b12..71abbf914955 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -52,7 +52,7 @@ ScDoubleField::ScDoubleField( Window* pParent, const ResId& rResId ) : bool ScDoubleField::GetValue( double& rfValue ) const { - rtl::OUString aStr(comphelper::string::strip(GetText(), ' ')); + OUString aStr(comphelper::string::strip(GetText(), ' ')); bool bOk = !aStr.isEmpty(); if( bOk ) { diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index af9a1345dd58..5d6e2181817f 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -68,8 +68,8 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, { nLastSlotId = pItem->GetValue(); sal_uInt16 nImageId = nLastSlotId ? nLastSlotId : GetSlotId(); - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nImageId )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() @@ -84,17 +84,17 @@ SfxPopupWindow* ScTbxInsertCtrl::CreatePopupWindow() sal_uInt16 nSlotId = GetSlotId(); if (nSlotId == SID_TBXCTL_INSERT) { - rtl::OUString aInsertBarResStr( "private:resource/toolbar/insertbar" ); + OUString aInsertBarResStr( "private:resource/toolbar/insertbar" ); createAndPositionSubToolBar( aInsertBarResStr ); } else if (nSlotId == SID_TBXCTL_INSCELLS) { - rtl::OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" ); + OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" ); createAndPositionSubToolBar( aInsertCellsBarResStr ); } else { - rtl::OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" ); + OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" ); createAndPositionSubToolBar( aInsertObjectBarResStr ); } return NULL; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 120a633b4812..9dbab51bbff3 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -311,10 +311,10 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ScalingFactor" ); + aArgs[0].Name = OUString( "ScalingFactor" ); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } @@ -351,10 +351,10 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ScalingFactor" ); + aArgs[0].Name = OUString( "ScalingFactor" ); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } diff --git a/sc/source/ui/collab/sccollaboration.cxx b/sc/source/ui/collab/sccollaboration.cxx index 26d688f3534c..422f50064f56 100644 --- a/sc/source/ui/collab/sccollaboration.cxx +++ b/sc/source/ui/collab/sccollaboration.cxx @@ -47,12 +47,12 @@ void ScCollaboration::SaveAndSendFile( TpContact* pContact ) const OUString aTmpPath = utl::TempFile::CreateTempName(); aTmpPath += ".ods"; - rtl::OUString aFileURL; + OUString aFileURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL ); ::comphelper::MediaDescriptor aDescriptor; // some issue with hyperlinks: - aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= ::rtl::OUString(); + aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString(); try { css::uno::Reference< css::document::XDocumentRecovery > xDocRecovery( mpScDocShell->GetBaseModel(), css::uno::UNO_QUERY_THROW); diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index a02cf54d09b5..44f7795873aa 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -69,10 +69,10 @@ struct ProtocolError { }; class ScChangeOpReader { - std::vector< rtl::OUString > maArgs; + std::vector< OUString > maArgs; public: - ScChangeOpReader( const rtl::OUString &rString) + ScChangeOpReader( const OUString &rString) { // will need to handle escaping etc. // Surely someone else wrote this before ! [!?] @@ -127,28 +127,28 @@ public: } ~ScChangeOpReader() {} - rtl::OUString getMethod() + OUString getMethod() { return maArgs[0]; } size_t getArgCount() { return maArgs.size(); } - rtl::OUString getString( sal_Int32 n ) + OUString getString( sal_Int32 n ) { if (n > 0 && (size_t)n < getArgCount() ) { - rtl::OUString aUStr( maArgs[ n ] ); + OUString aUStr( maArgs[ n ] ); ScGlobal::EraseQuotes( aUStr ); return aUStr; } else - return rtl::OUString(); + return OUString(); } ScAddress getAddress( sal_Int32 n ) { ScAddress aAddr; - rtl::OUString aToken( getString( n ) ); + OUString aToken( getString( n ) ); aAddr.Parse( aToken ); return aAddr; } @@ -186,7 +186,7 @@ public: // method name ';' then arguments ; separated class ScChangeOpWriter { - rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; void appendSeparator() { aMessage.append( sal_Unicode( ';' ) ); @@ -199,12 +199,12 @@ public: appendSeparator(); } - void appendString( const rtl::OUString &rStr ) + void appendString( const OUString &rStr ) { if ( rStr.indexOf( sal_Unicode( '"' ) ) >= 0 || rStr.indexOf( sal_Unicode( ';' ) ) >= 0 ) { - rtl::OUString aQuoted( rStr ); + OUString aQuoted( rStr ); ScGlobal::AddQuotes( aQuoted, sal_Unicode( '"' ) ); aMessage.append( aQuoted ); } @@ -215,7 +215,7 @@ public: void appendAddress( const ScAddress &rPos ) { - rtl::OUString aStr; + OUString aStr; rPos.Format( aStr, SCA_VALID ); aMessage.append( aStr ); appendSeparator(); @@ -249,16 +249,16 @@ public: appendSeparator(); } - rtl::OString toString() + OString toString() { - return rtl::OUStringToOString( aMessage.toString(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aMessage.toString(), RTL_TEXTENCODING_UTF8 ); } }; -void ScDocFuncSend::RecvMessage( const rtl::OString &rString ) +void ScDocFuncSend::RecvMessage( const OString &rString ) { try { - ScChangeOpReader aReader( rtl::OUString( rString.getStr(), + ScChangeOpReader aReader( OUString( rString.getStr(), rString.getLength(), RTL_TEXTENCODING_UTF8 ) ); // FIXME: have some hash to enumeration mapping here @@ -352,10 +352,10 @@ sal_Bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& r o_rbNumFmtSet = false; - if ( rtl::OUString( rText ) == "saveme" ) + if ( OUString( rText ) == "saveme" ) mpCollaboration->SaveAndSendFile( NULL ); - if ( rtl::OUString( rText ) == "contacts" ) + if ( OUString( rText ) == "contacts" ) mpCollaboration->DisplayContacts(); return true; // needs some code auditing action diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx index fa2d1fcee4a1..6efeb2562e33 100644 --- a/sc/source/ui/collab/sendfunc.hxx +++ b/sc/source/ui/collab/sendfunc.hxx @@ -22,7 +22,7 @@ class ScDocFuncSend : public ScDocFunc ScCollaboration* mpCollaboration; friend class ScCollaboration; - void RecvMessage( const rtl::OString &rString ); + void RecvMessage( const OString &rString ); void SendMessage( ScChangeOpWriter &rOp ); public: // FIXME: really ScDocFunc should be an abstract base, so diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 45303e61c341..8a3fa214f52f 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -72,7 +72,7 @@ void SetValue( ScColorScaleEntry* pEntry, Edit& aEdit) if(pEntry->GetType() == COLORSCALE_FORMULA) aEdit.SetText(pEntry->GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); else if(pEntry->GetType() != COLORSCALE_MIN && pEntry->GetType() != COLORSCALE_MAX) - aEdit.SetText(rtl::OUString::valueOf(pEntry->GetValue())); + aEdit.SetText(OUString::valueOf(pEntry->GetValue())); else aEdit.Disable(); } @@ -234,8 +234,8 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl ) if(nSelectMax != COLORSCALE_FORMULA && nSelectMax != COLORSCALE_AUTO) { - rtl::OUString aMinString = maEdMin.GetText(); - rtl::OUString aMaxString = maEdMax.GetText(); + OUString aMinString = maEdMin.GetText(); + OUString aMaxString = maEdMax.GetText(); double nMinValue = 0; sal_uInt32 nIndex = 0; mpNumberFormatter->IsNumberFormat(aMinString, nIndex, nMinValue); diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 4896f55b4234..c22d8f61556c 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -383,9 +383,9 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond mpDoc(pDoc), mpLastEdit(NULL) { - rtl::OUStringBuffer aTitle( GetText() ); - aTitle.append(rtl::OUString(" ")); - rtl::OUString aRangeString; + OUStringBuffer aTitle( GetText() ); + aTitle.append(OUString(" ")); + OUString aRangeString; rRange.Format(aRangeString, SCA_VALID, pDoc, pDoc->GetAddressConvention()); aTitle.append(aRangeString); SetText(aTitle.makeStringAndClear()); @@ -451,7 +451,7 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*) if(rRef.aStart != rRef.aEnd) RefInputStart(pEdit); - rtl::OUString aRefStr; + OUString aRefStr; sal_uInt16 n = 0; if(mpLastEdit && mpLastEdit != &maEdRange) n = ABS_DREF3D; @@ -465,7 +465,7 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*) ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const { - rtl::OUString aRangeStr = maEdRange.GetText(); + OUString aRangeStr = maEdRange.GetText(); if(aRangeStr.isEmpty()) return NULL; @@ -491,7 +491,7 @@ void ScCondFormatDlg::InvalidateRefData() IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) { - rtl::OUString aRangeStr = pEdit->GetText(); + OUString aRangeStr = pEdit->GetText(); ScRangeList aRange; sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention()); if(nFlags & SCA_VALID) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 0d17859f42a1..249431058b9c 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -65,8 +65,8 @@ long ScCondFrmtEntry::Notify( NotifyEvent& rNEvt ) void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) { mnIndex = nIndex; - rtl::OUStringBuffer aBuffer(maStrCondition); - aBuffer.append(rtl::OUString::valueOf(nIndex)); + OUStringBuffer aBuffer(maStrCondition); + aBuffer.append(OUString::valueOf(nIndex)); maFtCondNr.SetText(aBuffer.makeStringAndClear()); } @@ -97,7 +97,7 @@ void ScCondFrmtEntry::SetHeight() void ScCondFrmtEntry::Select() { - maFtCondition.SetText(rtl::OUString()); + maFtCondition.SetText(OUString()); maFtCondition.Hide(); maLbType.Show(); mbActive = true; @@ -106,7 +106,7 @@ void ScCondFrmtEntry::Select() void ScCondFrmtEntry::Deselect() { - rtl::OUString maCondText = GetExpressionString(); + OUString maCondText = GetExpressionString(); maFtCondition.SetText(maCondText); maFtCondition.Show(); maLbType.Hide(); @@ -121,7 +121,7 @@ bool ScCondFrmtEntry::IsSelected() const IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) { - rtl::OUString aFormula = pEdit->GetText(); + OUString aFormula = pEdit->GetText(); ScCompiler aComp( mpDoc, maPos ); aComp.SetGrammar( mpDoc->GetGrammar() ); boost::scoped_ptr<ScTokenArray> mpCode(aComp.CompileString(aFormula)); @@ -144,14 +144,14 @@ namespace { void FillStyleListBox( ScDocument* pDoc, ListBox& rLbStyle ) { rLbStyle.SetSeparatorPos(0); - std::set<rtl::OUString> aStyleNames; + std::set<OUString> aStyleNames; SfxStyleSheetIterator aStyleIter( pDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) { - rtl::OUString aName = pStyle->GetName(); + OUString aName = pStyle->GetName(); aStyleNames.insert(aName); } - for(std::set<rtl::OUString>::const_iterator itr = aStyleNames.begin(), itrEnd = aStyleNames.end(); + for(std::set<OUString>::const_iterator itr = aStyleNames.begin(), itrEnd = aStyleNames.end(); itr != itrEnd; ++itr) { rLbStyle.InsertEntry( *itr ); @@ -177,7 +177,7 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c if(pFormatEntry) { - rtl::OUString aStyleName = pFormatEntry->GetStyle(); + OUString aStyleName = pFormatEntry->GetStyle(); maLbStyle.SelectEntry(aStyleName); StyleSelectHdl(NULL); ScConditionMode eMode = pFormatEntry->GetOperation(); @@ -306,7 +306,7 @@ void ScConditionFrmtEntry::Init() ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const { ScConditionMode eMode; - rtl::OUString aExpr2; + OUString aExpr2; switch(maLbCondType.GetSelectEntryPos()) { case 0: @@ -392,14 +392,14 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const return NULL; } - rtl::OUString aExpr1 = maEdVal1.GetText(); + OUString aExpr1 = maEdVal1.GetText(); ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); return pEntry; } -rtl::OUString ScConditionFrmtEntry::GetExpressionString() +OUString ScConditionFrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression(CONDITION, maLbCondType.GetSelectEntryPos(), maEdVal1.GetText(), maEdVal2.GetText()); } @@ -467,12 +467,12 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre bool bFound = false; for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle && !bFound; pStyle = aStyleIter.Next() ) { - rtl::OUString aName = pStyle->GetName(); + OUString aName = pStyle->GetName(); if ( rLbStyle.GetEntryPos(aName) == LISTBOX_ENTRY_NOTFOUND ) // all lists contain the same entries { for( sal_uInt16 i = 1, n = rLbStyle.GetEntryCount(); i <= n && !bFound; ++i) { - rtl::OUString aStyleName = ScGlobal::pCharClass->uppercase(rtl::OUString(rLbStyle.GetEntry(i))); + OUString aStyleName = ScGlobal::pCharClass->uppercase(OUString(rLbStyle.GetEntry(i))); if( i == n ) { rLbStyle.InsertEntry(aName); @@ -490,7 +490,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre } } - rtl::OUString aStyleName = rLbStyle.GetSelectEntry(); + OUString aStyleName = rLbStyle.GetSelectEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); if(pStyleSheet) { @@ -553,11 +553,11 @@ IMPL_LINK_NOARG(ScFormulaFrmtEntry, StyleSelectHdl) ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const { ScConditionMode eMode = SC_COND_DIRECT; - rtl::OUString aFormula = maEdFormula.GetText(); + OUString aFormula = maEdFormula.GetText(); if(aFormula.isEmpty()) return NULL; - rtl::OUString aExpr2; + OUString aExpr2; ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aFormula, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); return pEntry; } @@ -567,7 +567,7 @@ ScFormatEntry* ScFormulaFrmtEntry::GetEntry() const return createFormulaEntry(); } -rtl::OUString ScFormulaFrmtEntry::GetExpressionString() +OUString ScFormulaFrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression(FORMULA, 0, maEdFormula.GetText()); } @@ -613,7 +613,7 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, { double nVal = rEntry.GetValue(); SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); - rtl::OUString aText; + OUString aText; pNumberFormatter->GetInputLineString(nVal, 0, aText); rEdit.SetText(aText); } @@ -755,7 +755,7 @@ ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const return pColorScale; } -rtl::OUString ScColorScale2FrmtEntry::GetExpressionString() +OUString ScColorScale2FrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression( COLORSCALE, 0 ); } @@ -921,7 +921,7 @@ ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const return pColorScale; } -rtl::OUString ScColorScale3FrmtEntry::GetExpressionString() +OUString ScColorScale3FrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression( COLORSCALE, 0 ); } @@ -1040,7 +1040,7 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed { double nVal = rEntry.GetValue(); SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); - rtl::OUString aText; + OUString aText; pNumberFormatter->GetInputLineString(nVal, 0, aText); rEdit.SetText(aText); } @@ -1116,7 +1116,7 @@ ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const return pDataBar; } -rtl::OUString ScDataBarFrmtEntry::GetExpressionString() +OUString ScDataBarFrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression( DATABAR, 0 ); } @@ -1194,7 +1194,7 @@ ScDateFrmtEntry::ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCon sal_Int32 nPos = static_cast<sal_Int32>(pFormat->GetDateType()); maLbDateEntry.SelectEntryPos(nPos); - rtl::OUString aStyleName = pFormat->GetStyleName(); + OUString aStyleName = pFormat->GetStyleName(); maLbStyle.SelectEntry(aStyleName); } @@ -1238,7 +1238,7 @@ ScFormatEntry* ScDateFrmtEntry::GetEntry() const return pNewEntry; } -rtl::OUString ScDateFrmtEntry::GetExpressionString() +OUString ScDateFrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression(DATE, 0); } @@ -1308,7 +1308,7 @@ ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType e ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const { sal_Int32 nPos = maLbEntryType.GetSelectEntryPos(); - rtl::OUString aText = maEdEntry.GetText(); + OUString aText = maEdEntry.GetText(); ScColorScaleEntry* pEntry = new ScColorScaleEntry(); sal_uInt32 nIndex = 0; diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx index 6cbc8a2ec5d5..ad1c1cb50cb3 100644 --- a/sc/source/ui/condformat/condformathelper.cxx +++ b/sc/source/ui/condformat/condformathelper.cxx @@ -13,7 +13,7 @@ namespace { -rtl::OUString getTextForType(ScCondFormatEntryType eType) +OUString getTextForType(ScCondFormatEntryType eType) { switch(eType) { @@ -33,25 +33,25 @@ rtl::OUString getTextForType(ScCondFormatEntryType eType) break; } - return rtl::OUString(""); + return OUString(""); } -rtl::OUString getExpression(sal_Int32 nIndex) +OUString getExpression(sal_Int32 nIndex) { switch(nIndex) { case 0: - return rtl::OUString("="); + return OUString("="); case 1: - return rtl::OUString("<"); + return OUString("<"); case 2: - return rtl::OUString(">"); + return OUString(">"); case 3: - return rtl::OUString("<="); + return OUString("<="); case 4: - return rtl::OUString(">="); + return OUString(">="); case 5: - return rtl::OUString("!="); + return OUString("!="); case 6: return ScGlobal::GetRscString(STR_COND_BETWEEN); case 7: @@ -91,24 +91,24 @@ rtl::OUString getExpression(sal_Int32 nIndex) case 24: return ScGlobal::GetRscString(STR_COND_NOT_CONTAINS); } - return rtl::OUString(); + return OUString(); } -rtl::OUString getDateString(sal_Int32 nIndex) +OUString getDateString(sal_Int32 nIndex) { sal_Int32 nStringIndex = STR_COND_TODAY + nIndex; if(nStringIndex <= STR_COND_NEXTYEAR) return ScGlobal::GetRscString(nStringIndex); assert(false); - return rtl::OUString(); + return OUString(); } } -rtl::OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos) +OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if(!rFormat.IsEmpty()) { switch(rFormat.GetEntry(0)->GetType()) @@ -126,13 +126,13 @@ rtl::OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rForm else { aBuffer.append(getTextForType(CONDITION)); - aBuffer.append(rtl::OUString(" ")); + aBuffer.append(OUString(" ")); aBuffer.append(getExpression(static_cast<sal_Int32>(eMode))); - aBuffer.append(rtl::OUString(" ")); + aBuffer.append(OUString(" ")); if(eMode == SC_COND_BETWEEN || eMode == SC_COND_NOTBETWEEN) { aBuffer.append(pEntry->GetExpression(rPos, 0)); - aBuffer.append(rtl::OUString(" and ")); + aBuffer.append(OUString(" and ")); aBuffer.append(pEntry->GetExpression(rPos, 1)); } else if(eMode <= SC_COND_NOTEQUAL || eMode >= SC_COND_BEGINS_WITH) @@ -165,11 +165,11 @@ rtl::OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rForm return aBuffer.makeStringAndClear(); } -rtl::OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, - rtl::OUString aStr1, rtl::OUString aStr2 ) +OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, + OUString aStr1, OUString aStr2 ) { - rtl::OUStringBuffer aBuffer(getTextForType(eType)); - aBuffer.append(rtl::OUString(" ")); + OUStringBuffer aBuffer(getTextForType(eType)); + aBuffer.append(OUString(" ")); if(eType == CONDITION) { // workaround missing FORMULA option in the conditions case diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index a7f9db8d2d90..2a195ade828c 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -38,7 +38,7 @@ static const sal_Char pStrMrg[] = "MRG"; ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), - aFieldSeps ( rtl::OUString(';') ), + aFieldSeps ( OUString(';') ), bMergeFieldSeps ( false ), bQuotedFieldAsText(false), bDetectSpecialNumber(false), diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 428aa75f5a4d..4b0dd47a9035 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -109,7 +109,7 @@ void ScCsvGrid::UpdateLayoutData() { DisableRepaint(); SetFont( maMonoFont ); - Execute( CSVCMD_SETCHARWIDTH, GetTextWidth( rtl::OUString( 'X' ) ) ); + Execute( CSVCMD_SETCHARWIDTH, GetTextWidth( OUString( 'X' ) ) ); Execute( CSVCMD_SETLINEHEIGHT, GetTextHeight() + 1 ); SetFont( maHeaderFont ); Execute( CSVCMD_SETHDRHEIGHT, GetTextHeight() + 1 ); @@ -123,7 +123,7 @@ void ScCsvGrid::UpdateOffsetX() sal_Int32 nDigits = 2; while( nLastLine /= 10 ) ++nDigits; nDigits = Max( nDigits, sal_Int32( 3 ) ); - Execute( CSVCMD_SETHDRWIDTH, GetTextWidth( rtl::OUString( '0' ) ) * nDigits ); + Execute( CSVCMD_SETHDRWIDTH, GetTextWidth( OUString( '0' ) ) * nDigits ); } void ScCsvGrid::ApplyLayout( const ScCsvLayoutData& rOldData ) @@ -717,7 +717,7 @@ void ScCsvGrid::DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier ) // cell contents -------------------------------------------------------------- void ScCsvGrid::ImplSetTextLineSep( - sal_Int32 nLine, const rtl::OUString& rTextLine, + sal_Int32 nLine, const OUString& rTextLine, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ) { if( nLine < GetFirstVisLine() ) return; @@ -777,7 +777,7 @@ void ScCsvGrid::ImplSetTextLineSep( InvalidateGfx(); } -void ScCsvGrid::ImplSetTextLineFix( sal_Int32 nLine, const rtl::OUString& rTextLine ) +void ScCsvGrid::ImplSetTextLineFix( sal_Int32 nLine, const OUString& rTextLine ) { if( nLine < GetFirstVisLine() ) return; diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index a077eb7efde5..d790c6c54c2d 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 94c822281b00..b0c2e3bb1ea8 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -190,14 +190,14 @@ void ScCsvTableBox::MakePosVisible( sal_Int32 nPos ) // cell contents -------------------------------------------------------------- void ScCsvTableBox::SetUniStrings( - const rtl::OUString* pTextLines, const String& rSepChars, + const OUString* pTextLines, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ) { // assuming that pTextLines is a string array with size CSV_PREVIEW_LINES // -> will be dynamic sometime DisableRepaint(); sal_Int32 nEndLine = GetFirstVisLine() + CSV_PREVIEW_LINES; - const rtl::OUString* pString = pTextLines; + const OUString* pString = pTextLines; for( sal_Int32 nLine = GetFirstVisLine(); nLine < nEndLine; ++nLine, ++pString ) { if( mbFixedMode ) diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 89617f743608..3e15e44ce149 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -78,9 +78,9 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : uno::Reference<sdb::XDatabaseContext> xContext = sdb::DatabaseContext::create( comphelper::getProcessComponentContext() ); - uno::Sequence<rtl::OUString> aNames = xContext->getElementNames(); + uno::Sequence<OUString> aNames = xContext->getElementNames(); long nCount = aNames.getLength(); - const rtl::OUString* pArray = aNames.getConstArray(); + const OUString* pArray = aNames.getConstArray(); for (long nPos = 0; nPos < nCount; nPos++) { String aName = pArray[nPos]; @@ -160,7 +160,7 @@ void ScDataPilotDatabaseDlg::FillObjects() uno::Reference<sdbc::XConnection> xConnection = xSource->connectWithCompletion( xHandler ); - uno::Sequence<rtl::OUString> aNames; + uno::Sequence<OUString> aNames; if ( nSelect == DP_TYPELIST_TABLE ) { // get all tables @@ -189,7 +189,7 @@ void ScDataPilotDatabaseDlg::FillObjects() // fill list long nCount = aNames.getLength(); - const rtl::OUString* pArray = aNames.getConstArray(); + const OUString* pArray = aNames.getConstArray(); for( long nPos=0; nPos<nCount; nPos++ ) { String aName = pArray[nPos]; diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index cad35323de62..2ccd998c5aac 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -30,7 +30,6 @@ #include "dapitype.hrc" using namespace com::sun::star; -using ::rtl::OUString; //------------------------------------------------------------------------- @@ -109,7 +108,7 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) //------------------------------------------------------------------------- ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, - const uno::Sequence<rtl::OUString>& rServices ) : + const uno::Sequence<OUString>& rServices ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DAPISERVICE ) ), // aFlFrame ( this, ScResId( FL_FRAME ) ), @@ -128,7 +127,7 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, aBtnHelp ( this, ScResId( BTN_HELP ) ) { long nCount = rServices.getLength(); - const rtl::OUString* pArray = rServices.getConstArray(); + const OUString* pArray = rServices.getConstArray(); for (long i=0; i<nCount; i++) { String aName = pArray[i]; diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 78e19fd81d4d..bad2f0123462 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -243,7 +243,7 @@ void ScDbNameDlg::Init() && (rStart.Col() == nCol1) && (rStart.Row() == nRow1) && (rEnd.Col() == nCol2) && (rEnd.Row() == nRow2 ) ) { - rtl::OUString aDBName = pDBData->GetName(); + OUString aDBName = pDBData->GetName(); if ( aDBName != STR_DB_LOCAL_NONAME ) aEdName.SetText(aDBName); @@ -267,7 +267,7 @@ void ScDbNameDlg::Init() void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) { - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrSource); if (pDBData) { @@ -382,7 +382,7 @@ void ScDbNameDlg::UpdateDBData( const String& rStrName ) pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd ); theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ), ScAddress( nColEnd, nRowEnd, nTab ) ); - ::rtl::OUString theArea; + OUString theArea; theCurArea.Format( theArea, ABS_DREF3D, pDoc, aAddrDetails ); aEdAssign.SetText( theArea ); aBtnAdd.SetText( aStrModify ); @@ -527,9 +527,9 @@ namespace { class FindByName : public ::std::unary_function<ScDBData, bool> { - const ::rtl::OUString& mrName; + const OUString& mrName; public: - FindByName(const ::rtl::OUString& rName) : mrName(rName) {} + FindByName(const OUString& rName) : mrName(rName) {} bool operator() (const ScDBData& r) const { return r.GetName().equals(mrName); @@ -540,7 +540,7 @@ public: IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) { - ::rtl::OUString aStrEntry = aEdName.GetText(); + OUString aStrEntry = aEdName.GetText(); ScDBCollection::NamedDBs& rDBs = aLocalDbCol.getNamedDBs(); ScDBCollection::NamedDBs::iterator itr = ::std::find_if(rDBs.begin(), rDBs.end(), FindByName(aStrEntry)); @@ -549,7 +549,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) { String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrDelMsg.GetToken(0, '#')); aBuf.append(aStrEntry); aBuf.append(aStrDelMsg.GetToken(1, '#')); diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 46579d2c54b6..2abc85c3a26d 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -52,7 +52,6 @@ #include "pivot.hrc" using namespace com::sun::star; -using ::rtl::OUString; using ::std::vector; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::WeakReference; @@ -80,15 +79,15 @@ void DumpAllFuncData(const ScDPFieldControlBase::FuncDataType& rData) } -ScDPFieldControlBase::FieldName::FieldName(const rtl::OUString& rText, bool bFits, sal_uInt8 nDupCount) : +ScDPFieldControlBase::FieldName::FieldName(const OUString& rText, bool bFits, sal_uInt8 nDupCount) : maText(rText), mbFits(bFits), mnDupCount(nDupCount) {} ScDPFieldControlBase::FieldName::FieldName(const FieldName& r) : maText(r.maText), mbFits(r.mbFits), mnDupCount(r.mnDupCount) {} -rtl::OUString ScDPFieldControlBase::FieldName::getDisplayedText() const +OUString ScDPFieldControlBase::FieldName::getDisplayedText() const { - rtl::OUStringBuffer aBuf(maText); + OUStringBuffer aBuf(maText); if (mnDupCount > 0) aBuf.append(static_cast<sal_Int32>(mnDupCount+1)); return aBuf.makeStringAndClear(); @@ -150,7 +149,7 @@ bool ScDPFieldControlBase::IsExistingIndex( size_t nIndex ) const return nIndex < maFieldNames.size(); } -void ScDPFieldControlBase::AppendField( const rtl::OUString& rText, const ScPivotFuncData& rFunc ) +void ScDPFieldControlBase::AppendField( const OUString& rText, const ScPivotFuncData& rFunc ) { size_t nNewIndex = maFieldNames.size(); @@ -164,7 +163,7 @@ void ScDPFieldControlBase::AppendField( const rtl::OUString& rText, const ScPivo } size_t ScDPFieldControlBase::AddField( - const rtl::OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc) + const OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc) { size_t nNewIndex = GetFieldIndex(rPos); if (nNewIndex == PIVOTFIELD_INVALID) @@ -280,7 +279,7 @@ void ScDPFieldControlBase::ClearFields() maFuncData.clear(); } -void ScDPFieldControlBase::SetFieldText(const rtl::OUString& rText, size_t nIndex, sal_uInt8 nDupCount) +void ScDPFieldControlBase::SetFieldText(const OUString& rText, size_t nIndex, sal_uInt8 nDupCount) { if( IsExistingIndex( nIndex ) ) { @@ -293,11 +292,11 @@ void ScDPFieldControlBase::SetFieldText(const rtl::OUString& rText, size_t nInde } } -rtl::OUString ScDPFieldControlBase::GetFieldText( size_t nIndex ) const +OUString ScDPFieldControlBase::GetFieldText( size_t nIndex ) const { if( IsExistingIndex( nIndex ) ) return maFieldNames[nIndex].maText; - return rtl::OUString(); + return OUString(); } void ScDPFieldControlBase::GetExistingIndex( const Point& rPos, size_t& rnIndex ) @@ -600,7 +599,7 @@ void ScDPFieldControlBase::DrawField( // #i97623# VirtualDevice is always LTR while other windows derive direction from parent aVirDev.EnableRTL( IsRTLEnabled() ); - rtl::OUString aText = rText.getDisplayedText(); + OUString aText = rText.getDisplayedText(); Size aDevSize( rRect.GetSize() ); long nWidth = aDevSize.Width(); @@ -618,7 +617,7 @@ void ScDPFieldControlBase::DrawField( do { sal_Int32 nCurrLen = (nMinLen + nMaxLen) / 2; - rtl::OUStringBuffer aBuf(rText.maText.copy(0, nCurrLen)); + OUStringBuffer aBuf(rText.maText.copy(0, nCurrLen)); aBuf.appendAscii("..."); aText = aBuf.makeStringAndClear(); nLabelWidth = rDev.GetTextWidth( aText ); @@ -731,7 +730,7 @@ void ScDPFieldControlBase::MoveSelection(SCsCOL nDX, SCsROW nDY) MoveSelection( nNewIndex ); } -sal_uInt8 ScDPFieldControlBase::GetNextDupCount(const rtl::OUString& rFieldText) const +sal_uInt8 ScDPFieldControlBase::GetNextDupCount(const OUString& rFieldText) const { sal_uInt8 nMax = 0; FieldNames::const_iterator it = maFieldNames.begin(), itEnd = maFieldNames.end(); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index a5a45262ec43..f1d73c6fbe48 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -42,8 +42,6 @@ #include <limits> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString(rid) ).Execute() @@ -280,7 +278,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) for (size_t i = 0; i < QUERY_ENTRY_COUNT; ++i) { - rtl::OUString aValStr; + OUString aValStr; size_t nCondPos = 0; size_t nFieldSelPos = 0; @@ -439,7 +437,7 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if ( rRef.aStart != rRef.aEnd ) RefInputStart( &aEdCopyArea ); - rtl::OUString aRefStr; + OUString aRefStr; rRef.aStart.Format( aRefStr, SCA_ABS_3D, pDocP, pDocP->GetAddressConvention() ); aEdCopyArea.SetRefString( aRefStr ); } @@ -477,7 +475,7 @@ void ScFilterDlg::FillFieldLists() if ( pDoc ) { - rtl::OUString aFieldName; + OUString aFieldName; SCTAB nTab = nSrcTab; SCCOL nFirstCol = theQueryData.nCol1; SCROW nFirstRow = theQueryData.nRow1; @@ -490,7 +488,7 @@ void ScFilterDlg::FillFieldLists() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if (!aBtnHeader.IsChecked() || aFieldName.isEmpty()) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrColumn); aBuf.append(sal_Unicode(' ')); aBuf.append(ScColToAlpha(col)); @@ -514,7 +512,7 @@ void ScFilterDlg::UpdateValueList( size_t nList ) ComboBox* pValList = maValueEdArr[nList-1]; sal_uInt16 nFieldSelPos = maFieldLbArr[nList-1]->GetSelectEntryPos(); sal_uInt16 nListPos = 0; - rtl::OUString aCurValue = pValList->GetText(); + OUString aCurValue = pValList->GetText(); pValList->Clear(); pValList->InsertEntry( aStrNotEmpty, 0 ); @@ -629,7 +627,7 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList ) const ScTypedStrData& rHdrEntry = maEntryLists[nColumn].maList[nPos]; - const rtl::OUString& aHdrStr = rHdrEntry.GetString(); + const OUString& aHdrStr = rHdrEntry.GetString(); bool bWasThere = aHdrStr.equals(pValList->GetEntry(nListPos)); bool bInclude = !aBtnHeader.IsChecked(); @@ -1106,7 +1104,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) size_t nQE = i + nOffset; if ( pEd ) { - rtl::OUString aStrVal = pEd->GetText(); + OUString aStrVal = pEd->GetText(); ListBox* pLbCond = &aLbCond1; ListBox* pLbField = &aLbField1; if ( pEd == &aEdVal2 ) @@ -1133,7 +1131,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) { - pLbCond->SelectEntry(rtl::OUString('=')); + pLbCond->SelectEntry(OUString('=')); pLbCond->Disable(); } else @@ -1210,7 +1208,7 @@ void ScFilterDlg::RefreshEditRow( size_t nOffset ) for (size_t i = 0; i < QUERY_ENTRY_COUNT; ++i) { - rtl::OUString aValStr; + OUString aValStr; size_t nCondPos = 0; size_t nFieldSelPos = 0; size_t nQE = i + nOffset; @@ -1226,7 +1224,7 @@ void ScFilterDlg::RefreshEditRow( size_t nOffset ) nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); const ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - const rtl::OUString& rQueryStr = rItem.maString; + const OUString& rQueryStr = rItem.maString; if (rEntry.IsQueryByEmpty()) { aValStr = aStrEmpty; diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index df40f72c34be..55b71790559c 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -117,7 +117,7 @@ void ScFilterOptionsMgr::Init() if ( pViewData && pDoc ) { - rtl::OUString theAreaStr; + OUString theAreaStr; ScRange theCurArea ( ScAddress( rQueryData.nCol1, rQueryData.nRow1, pViewData->GetTabNo() ), @@ -125,8 +125,8 @@ void ScFilterOptionsMgr::Init() rQueryData.nRow2, pViewData->GetTabNo() ) ); ScDBCollection* pDBColl = pDoc->GetDBCollection(); - rtl::OUStringBuffer theDbArea; - rtl::OUString theDbName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUStringBuffer theDbArea; + OUString theDbName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv ); @@ -186,8 +186,8 @@ void ScFilterOptionsMgr::Init() } else { - rFtDbAreaLabel.SetText( rtl::OUString() ); - rFtDbArea.SetText( rtl::OUString() ); + rFtDbAreaLabel.SetText( OUString() ); + rFtDbArea.SetText( OUString() ); } //------------------------------------------------------ diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 6d6b50fa50b6..58ba39f4890e 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -153,7 +153,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) if ( pViewData && pDoc ) { - rtl::OUString theAreaStr; + OUString theAreaStr; ScRange theCurArea ( ScAddress( theQueryData.nCol1, theQueryData.nRow1, nSrcTab ), @@ -161,7 +161,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) theQueryData.nRow2, nSrcTab ) ); ScDBCollection* pDBColl = pDoc->GetDBCollection(); - ::rtl::OUString theDbName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); /* * Ueberpruefen, ob es sich bei dem uebergebenen @@ -181,7 +181,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) theDbName = pDBData->GetName(); } - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.appendAscii(" ("); aBuf.append(theDbName); aBuf.append(sal_Unicode(')')); @@ -202,7 +202,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryEntry& rEntry = theQueryData.GetEntry(i); const ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - rtl::OUString aValStr = rItem.maString; + OUString aValStr = rItem.maString; if (rEntry.IsQueryByEmpty()) aValStr = aStrEmpty; else if (rEntry.IsQueryByNonEmpty()) @@ -281,7 +281,7 @@ void ScPivotFilterDlg::FillFieldLists() if ( pDoc ) { - rtl::OUString aFieldName; + OUString aFieldName; SCTAB nTab = nSrcTab; SCCOL nFirstCol = theQueryData.nCol1; SCROW nFirstRow = theQueryData.nRow1; @@ -294,7 +294,7 @@ void ScPivotFilterDlg::FillFieldLists() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if ( aFieldName.isEmpty() ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrColumn); aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); } @@ -316,7 +316,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) ComboBox* pValList = aValueEdArr[nList-1]; sal_uInt16 nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); sal_uInt16 nListPos = 0; - rtl::OUString aCurValue = pValList->GetText(); + OUString aCurValue = pValList->GetText(); pValList->Clear(); pValList->InsertEntry( aStrNotEmpty, 0 ); @@ -398,7 +398,7 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() ScQueryEntry& rEntry = theParam.GetEntry(i); ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - rtl::OUString aStrVal = aValueEdArr[i]->GetText(); + OUString aStrVal = aValueEdArr[i]->GetText(); /* * Dialog liefert die ausgezeichneten Feldwerte "leer"/"nicht leer" @@ -556,9 +556,9 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) for (sal_uInt16 i=0; i<=MAXCOL; i++) DELETEZ( pEntryLists[i] ); - rtl::OUString aCurVal1 = aEdVal1.GetText(); - rtl::OUString aCurVal2 = aEdVal2.GetText(); - rtl::OUString aCurVal3 = aEdVal3.GetText(); + OUString aCurVal1 = aEdVal1.GetText(); + OUString aCurVal2 = aEdVal2.GetText(); + OUString aCurVal3 = aEdVal3.GetText(); UpdateValueList( 1 ); UpdateValueList( 2 ); UpdateValueList( 3 ); @@ -576,7 +576,7 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) { if ( pEd ) { - rtl::OUString aStrVal = pEd->GetText(); + OUString aStrVal = pEd->GetText(); ListBox* pLb = &aLbCond1; if ( pEd == &aEdVal2 ) pLb = &aLbCond2; @@ -587,7 +587,7 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) { - pLb->SelectEntry(rtl::OUString('=')); + pLb->SelectEntry(OUString('=')); pLb->Disable(); } else diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 7b64ec8babeb..42d048f01725 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::sheet; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::std::vector; diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index e232de90d5a5..3e01453dac8c 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -65,7 +65,6 @@ #include <boost/scoped_ptr.hpp> using namespace com::sun::star; -using ::rtl::OUString; using ::std::vector; using ::std::for_each; @@ -178,7 +177,7 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window maEdInPos.SetText(aRangeName); else { - rtl::OUString aStr; + OUString aStr; maOldRange = p->GetSourceRange(); maOldRange.Format(aStr, SCR_ABS_3D, mpDoc, mpDoc->GetAddressConvention()); maEdInPos.SetText(aStr); @@ -218,9 +217,9 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window maLbOutPos.InsertEntry( maStrNewTable, 1 ); ScAreaNameIterator aIter( mpDoc ); - rtl::OUString aName; + OUString aName; ScRange aRange; - rtl::OUString aRefStr; + OUString aRefStr; while ( aIter.Next( aName, aRange ) ) { if ( !aIter.WasDBName() ) // hier keine DB-Bereiche ! @@ -247,7 +246,7 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window if ( maPivotData.nTab != MAXTAB+1 ) { - rtl::OUString aStr; + OUString aStr; ScAddress( maPivotData.nCol, maPivotData.nRow, maPivotData.nTab ).Format( aStr, STD_FORMAT, mpDoc, mpDoc->GetAddressConvention() ); @@ -1007,13 +1006,13 @@ ScDPLabelData* ScPivotLayoutDlg::GetLabelData( SCCOL nCol ) return it == maLabelData.end() ? NULL : &(*it); } -rtl::OUString ScPivotLayoutDlg::GetLabelString( SCsCOL nCol ) +OUString ScPivotLayoutDlg::GetLabelString( SCsCOL nCol ) { ScDPLabelData* pData = GetLabelData( nCol ); OSL_ENSURE( pData, "LabelData not found" ); if (pData) return pData->getDisplayName(); - return rtl::OUString(); + return OUString(); } bool ScPivotLayoutDlg::IsOrientationAllowed( SCsCOL nCol, ScPivotFieldType eType ) @@ -1039,9 +1038,9 @@ bool ScPivotLayoutDlg::IsOrientationAllowed( SCsCOL nCol, ScPivotFieldType eType return bAllowed; } -rtl::OUString ScPivotLayoutDlg::GetFuncString( sal_uInt16& rFuncMask, bool bIsValue ) +OUString ScPivotLayoutDlg::GetFuncString( sal_uInt16& rFuncMask, bool bIsValue ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if ( rFuncMask == PIVOT_FUNC_NONE || rFuncMask == PIVOT_FUNC_AUTO ) @@ -1234,7 +1233,7 @@ bool ScPivotLayoutDlg::GetPivotArrays( void ScPivotLayoutDlg::UpdateSrcRange() { - rtl::OUString aSrcStr = maEdInPos.GetText(); + OUString aSrcStr = maEdInPos.GetText(); sal_uInt16 nResult = ScRange().Parse(aSrcStr, mpDoc, mpDoc->GetAddressConvention()); DataSrcType eSrcType = SRC_INVALID; ScRange aNewRange; @@ -1469,13 +1468,13 @@ void ScPivotLayoutDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) if (mpRefInputEdit == &maEdInPos) { - rtl::OUString aRefStr; + OUString aRefStr; rRef.Format( aRefStr, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() ); mpRefInputEdit->SetRefString(aRefStr); } else if (mpRefInputEdit == &maEdOutPos) { - rtl::OUString aRefStr; + OUString aRefStr; rRef.aStart.Format( aRefStr, STD_FORMAT, pDoc, pDoc->GetAddressConvention() ); mpRefInputEdit->SetRefString(aRefStr); maOutputRefStr = aRefStr; @@ -1529,7 +1528,7 @@ IMPL_LINK( ScPivotLayoutDlg, ClickHdl, PushButton *, pBtn ) IMPL_LINK_NOARG(ScPivotLayoutDlg, OkHdl) { - rtl::OUString aOutPosStr = maEdOutPos.GetText(); + OUString aOutPosStr = maEdOutPos.GetText(); ScAddress aAdrDest; bool bToNewTable = (maLbOutPos.GetSelectEntryPos() == 1); sal_uInt16 nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, mpDoc, mpDoc->GetAddressConvention() ) : 0; diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 5bb9dd745c6a..31c11d482fac 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -148,7 +148,7 @@ ScNewScenarioDlg::~ScNewScenarioDlg() //------------------------------------------------------------------------ -void ScNewScenarioDlg::GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, +void ScNewScenarioDlg::GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const { rComment = aEdComment.GetText(); @@ -180,7 +180,7 @@ void ScNewScenarioDlg::GetScenarioData( rtl::OUString& rName, rtl::OUString& rCo rFlags = nBits; } -void ScNewScenarioDlg::SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment, +void ScNewScenarioDlg::SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { aEdComment.SetText(rComment); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 0d7264121f35..e6ff9c0ff5bb 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -42,7 +42,6 @@ const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT; using namespace com::sun::star::uno; -using ::rtl::OUString; // Defines - CSV Import Preserve Options #define FIXED_WIDTH "FixedWidth" @@ -460,7 +459,7 @@ ScImportAsciiDlg::~ScImportAsciiDlg() // ---------------------------------------------------------------------------- -bool ScImportAsciiDlg::GetLine( sal_uLong nLine, rtl::OUString &rText ) +bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) { if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream) return false; @@ -560,7 +559,7 @@ void ScImportAsciiDlg::SaveParameters() void ScImportAsciiDlg::SetSeparators() { - rtl::OString sString(rtl::OUStringToOString(maFieldSeparators, + OString sString(OUStringToOString(maFieldSeparators, RTL_TEXTENCODING_MS_1252)); const sal_Char *aSep = sString.getStr(); int len = maFieldSeparators.Len(); @@ -722,7 +721,7 @@ IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl) break; } for (; i < CSV_PREVIEW_LINES; i++) - maPreviewLine[i] = rtl::OUString(); + maPreviewLine[i] = OUString(); mpTableBox->Execute( CSVCMD_SETLINECOUNT, mnRowPosCount); bool bMergeSep = (pCkbAsOnce->IsChecked() == sal_True); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 1c231bf1e340..a28b7264d150 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -185,7 +185,7 @@ ScImportOptionsDlg::ScImportOptionsDlg( aStr = pFieldSepTab->GetDelimiter( nCode ); if ( !aStr.Len() ) - aEdFieldSep.SetText( rtl::OUString((sal_Unicode)nCode) ); + aEdFieldSep.SetText( OUString((sal_Unicode)nCode) ); else aEdFieldSep.SetText( aStr ); @@ -193,7 +193,7 @@ ScImportOptionsDlg::ScImportOptionsDlg( aStr = pTextSepTab->GetDelimiter( nCode ); if ( !aStr.Len() ) - aEdTextSep.SetText( rtl::OUString((sal_Unicode)nCode) ); + aEdTextSep.SetText( OUString((sal_Unicode)nCode) ); else aEdTextSep.SetText( aStr ); } diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 19f72ec80611..5d277626d813 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -162,7 +162,7 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) continue; nInsert = aLbFilterArea.InsertEntry(itr->second->GetName()); - rtl::OUString aSymbol; + OUString aSymbol; itr->second->GetSymbol(aSymbol); aLbFilterArea.SetEntryData(nInsert, new String(aSymbol)); } diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index c4a51aa184a6..4c56058da302 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -363,7 +363,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) if ( bSortByRows ) { - rtl::OUString aFieldName; + OUString aFieldName; SCCOL nMaxCol = aSortData.nCol2; SCCOL col; @@ -372,7 +372,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) aFieldName = pDoc->GetString(col, nFirstSortRow, nTab); if ( !bHasHeader || aFieldName.isEmpty() ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrColumn); aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); } @@ -386,7 +386,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) } else { - rtl::OUString aFieldName; + OUString aFieldName; SCROW nMaxRow = aSortData.nRow2; SCROW row; @@ -395,8 +395,8 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) aFieldName = pDoc->GetString(nFirstSortCol, row, nTab); if ( !bHasHeader || aFieldName.isEmpty() ) { - rtl::OUStringBuffer aBuf; - rtl::OUStringBuffer tempBuf; + OUStringBuffer aBuf; + OUStringBuffer tempBuf; aBuf.append(aStrRow); tempBuf.append(row+1 ); @@ -440,7 +440,7 @@ sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) { - rtl::OUString aSelEntry = pLb->GetSelectEntry(); + OUString aSelEntry = pLb->GetSelectEntry(); ScSortKeyItems::iterator pIter; sal_uInt16 nSortKeyIndex = nSortKeyCount; @@ -542,7 +542,7 @@ ScTabPageSortOptions::~ScTabPageSortOptions() sal_uInt16 nEntries = m_pLbOutPos->GetEntryCount(); for ( sal_uInt16 i=1; i<nEntries; i++ ) - delete (rtl::OUString*)m_pLbOutPos->GetEntryData( i ); + delete (OUString*)m_pLbOutPos->GetEntryData( i ); delete pColRes; delete pColWrap; //! not if from document @@ -579,7 +579,7 @@ void ScTabPageSortOptions::Init() String theArea; ScDBCollection* pDBColl = pDoc->GetDBCollection(); const SCTAB nCurTab = pViewData->GetTabNo(); - rtl::OUString theDbName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); m_pLbOutPos->Clear(); @@ -587,15 +587,15 @@ void ScTabPageSortOptions::Init() m_pLbOutPos->Disable(); ScAreaNameIterator aIter( pDoc ); - rtl::OUString aName; + OUString aName; ScRange aRange; - rtl::OUString aRefStr; + OUString aRefStr; while ( aIter.Next( aName, aRange ) ) { sal_uInt16 nInsert = m_pLbOutPos->InsertEntry( aName ); aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv ); - m_pLbOutPos->SetEntryData( nInsert, new rtl::OUString( aRefStr ) ); + m_pLbOutPos->SetEntryData( nInsert, new OUString( aRefStr ) ); } m_pLbOutPos->SelectEntryPos( 0 ); @@ -688,7 +688,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) if ( pDoc && !aSortData.bInplace ) { - rtl::OUString aStr; + OUString aStr; sal_uInt16 nFormat = (aSortData.nDestTab != pViewData->GetTabNo()) ? SCR_ABS_3D : SCR_ABS; @@ -748,10 +748,10 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) aNewSortData.aCollatorLocale = LanguageTag( eLang ).getLocale( false ); // get algorithm - rtl::OUString sAlg; + OUString sAlg; if ( eLang != LANGUAGE_SYSTEM ) { - uno::Sequence<rtl::OUString> aAlgos = pColWrap->listCollatorAlgorithms( + uno::Sequence<OUString> aAlgos = pColWrap->listCollatorAlgorithms( aNewSortData.aCollatorLocale ); sal_uInt16 nSel = m_pLbAlgorithm->GetSelectEntryPos(); if ( nSel < aAlgos.getLength() ) @@ -898,7 +898,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) { if (pLb == m_pLbOutPos) { - rtl::OUString aString; + OUString aString; sal_uInt16 nSelPos = m_pLbOutPos->GetSelectEntryPos(); if ( nSelPos > 0 ) @@ -973,10 +973,10 @@ IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) else { lang::Locale aLocale( LanguageTag( eLang ).getLocale()); - uno::Sequence<rtl::OUString> aAlgos = pColWrap->listCollatorAlgorithms( aLocale ); + uno::Sequence<OUString> aAlgos = pColWrap->listCollatorAlgorithms( aLocale ); long nCount = aAlgos.getLength(); - const rtl::OUString* pArray = aAlgos.getConstArray(); + const OUString* pArray = aAlgos.getConstArray(); for (long i=0; i<nCount; i++) { String sAlg = pArray[i]; diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 4bb4475f4fd0..b2a9f9a01177 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -266,7 +266,7 @@ void ScTpSubTotalGroup::FillListBoxes() SCTAB nTab = pViewData->GetTabNo(); SCCOL nMaxCol = rSubTotalData.nCol2; SCCOL col; - rtl::OUString aFieldName; + OUString aFieldName; aLbGroup.Clear(); aLbColumns.Clear(); @@ -278,7 +278,7 @@ void ScTpSubTotalGroup::FillListBoxes() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if ( aFieldName.isEmpty() ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrColumn); aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); } diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 33f3ff737ff3..005df94c4e39 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -882,7 +882,7 @@ IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) // Use static SfxApplication method to bring up selector dialog for // choosing a script - ::rtl::OUString aScriptURL = SfxApplication::ChooseScript(); + OUString aScriptURL = SfxApplication::ChooseScript(); Application::SetDefDialogParent( pOld ); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 260801e160ca..bd48b87c3e2c 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -114,7 +114,7 @@ void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ ) sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); if (pLinkManager!=NULL) { - rtl::OUString aFile, aArea, aFilter; + OUString aFile, aArea, aFilter; pLinkManager->GetDisplayNames(this, NULL, &aFile, &aArea, &aFilter); // the file dialog returns the filter name with the application prefix diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 6e4ca2bdfb69..5a4b6fd62c89 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------- -bool ScDBDocFunc::AddDBRange( const ::rtl::OUString& rName, const ScRange& rRange, sal_Bool /* bApi */ ) +bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, sal_Bool /* bApi */ ) { ScDocShellModificator aModificator( rDocShell ); @@ -110,7 +110,7 @@ bool ScDBDocFunc::AddDBRange( const ::rtl::OUString& rName, const ScRange& rRang return true; } -bool ScDBDocFunc::DeleteDBRange(const ::rtl::OUString& rName) +bool ScDBDocFunc::DeleteDBRange(const OUString& rName) { bool bDone = false; ScDocument* pDoc = rDocShell.GetDocument(); @@ -241,7 +241,7 @@ bool ScDBDocFunc::ModifyDBData( const ScDBData& rNewData ) // ----------------------------------------------------------------- -bool ScDBDocFunc::RepeatDB( const ::rtl::OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab ) +bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab ) { //! auch fuer ScDBFunc::RepeatDB benutzen! @@ -1695,8 +1695,8 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const svx::ODataAccessDes ScImportParam aImportParam; pData->GetImportParam( aImportParam ); - rtl::OUString sDBName; - rtl::OUString sDBTable; + OUString sDBName; + OUString sDBTable; sal_Int32 nCommandType = 0; rDescriptor[svx::daDataSource] >>= sDBName; rDescriptor[svx::daCommand] >>= sDBTable; diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 23fdc2329f0f..0730d04ba080 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -75,7 +75,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram uno::Reference<frame::XDispatchProvider> xDP(xFrame, uno::UNO_QUERY); uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame( - rtl::OUString("_beamer"), + OUString("_beamer"), frame::FrameSearchFlag::CHILDREN); if (xBeamerFrame.is()) { @@ -211,7 +211,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, bDispose = sal_True; xRowSet = uno::Reference<sdbc::XRowSet>( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); OSL_ENSURE( xRowProp.is(), "can't get RowSet" ); @@ -228,15 +228,15 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, aAny <<= rParam.aDBName; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny ); aAny <<= rParam.aStatement; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); aAny <<= nType; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY ); if ( xExecute.is() ) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index fbdfdc07e8a8..104b0d0dd039 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2851,7 +2851,7 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St uno::Reference< uno::XInterface > xDocModuleApiObject; if ( xSF.is() ) { - xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY ); + xVBACodeNamedObjectAccess.set( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY ); xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY ); } return xDocModuleApiObject; @@ -2866,7 +2866,7 @@ static script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sM return sModuleInfo; } -void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModuleName, const rtl::OUString& sSource ) +void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sSource ) { SfxObjectShell& rDocSh = *rDoc.GetDocumentShell(); uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer(); @@ -2892,16 +2892,16 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul genModuleName = sModuleName; else { - genModuleName = rtl::OUString( "Sheet1" ); + genModuleName = OUString( "Sheet1" ); nNum = 1; } while( xLib->hasByName( genModuleName ) ) - genModuleName = rtl::OUString( "Sheet") + rtl::OUString::valueOf( ++nNum ); + genModuleName = OUString( "Sheet") + OUString::valueOf( ++nNum ); uno::Any aSourceAny; - rtl::OUString sTmpSource = sSource; + OUString sTmpSource = sSource; if ( sTmpSource.isEmpty() ) - sTmpSource = ::rtl::OUString( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ); + sTmpSource = OUString( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ); aSourceAny <<= sTmpSource; uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() ) @@ -2915,7 +2915,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul } } -void VBA_DeleteModule( ScDocShell& rDocSh, const rtl::OUString& sModuleName ) +void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ) { uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer(); OSL_ENSURE( xLibContainer.is(), "No BasicContainer!" ); @@ -2981,7 +2981,7 @@ sal_Bool ScDocFunc::InsertTable( SCTAB nTab, const String& rName, sal_Bool bReco // Only insert vba modules if vba mode ( and not currently importing XML ) if( bInsertDocModule ) { - rtl::OUString sSource, sCodeName; + OUString sSource, sCodeName; VBA_InsertModule( *pDoc, nTab, sCodeName, sSource ); } rDocShell.Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab ) ); @@ -3022,7 +3022,7 @@ sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,false, pUndoDoc ); - rtl::OUString aOldName; + OUString aOldName; pDoc->GetName( nTab, aOldName ); pUndoDoc->RenameTab( nTab, aOldName, false ); if (bWasLinked) @@ -3034,7 +3034,7 @@ sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi if ( pDoc->IsScenario(nTab) ) { pUndoDoc->SetScenario( nTab, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags ); @@ -3064,7 +3064,7 @@ sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi // Views updaten: if( bVbaEnabled ) { - rtl::OUString sCodeName; + OUString sCodeName; if( pDoc->GetCodeName( nTab, sCodeName ) ) { VBA_DeleteModule( rDocShell, sCodeName ); @@ -3197,7 +3197,7 @@ sal_Bool ScDocFunc::RenameTable( SCTAB nTab, const String& rName, sal_Bool bReco ScDocShellModificator aModificator( rDocShell ); sal_Bool bSuccess = false; - rtl::OUString sOldName; + OUString sOldName; pDoc->GetName(nTab, sOldName); if (pDoc->RenameTab( nTab, rName )) { @@ -4864,14 +4864,14 @@ bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc, SCTA return true; } -void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap ) +void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map<OUString, ScRangeName>& rRangeMap ) { ScDocShellModificator aModificator(rDocShell); ScDocument* pDoc = rDocShell.GetDocument(); if (pDoc->IsUndoEnabled()) { - std::map<rtl::OUString, ScRangeName*> aOldRangeMap; + std::map<OUString, ScRangeName*> aOldRangeMap; pDoc->GetRangeNameMap(aOldRangeMap); rDocShell.GetUndoManager()->AddUndoAction( new ScUndoAllRangeNames(&rDocShell, aOldRangeMap, rRangeMap)); @@ -5117,8 +5117,8 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi ) qsort( (void*)ppSortArray, nValidCount, sizeof(ScRangeData*), ICCQsortNameCompare ); #endif - rtl::OUString aName; - rtl::OUStringBuffer aContent; + OUString aName; + OUStringBuffer aContent; String aFormula; SCROW nOutRow = nStartRow; for (j=0; j<nValidCount; j++) @@ -5258,8 +5258,8 @@ sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, ++nLinkPos; } - rtl::OUString aFilterName = rFilter; - rtl::OUString aNewOptions = rOptions; + OUString aFilterName = rFilter; + OUString aNewOptions = rOptions; if (aFilterName.isEmpty()) ScDocumentLoader::GetFilterName( rFile, aFilterName, aNewOptions, true, !bApi ); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 45bb6ae53e26..16942554d809 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -200,7 +200,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, { *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE : SOT_FORMATSTR_ID_STARCALC_8; - *pFullTypeName = rtl::OUString("calc8"); + *pFullTypeName = OUString("calc8"); *pShortTypeName = ScResId(SCSTR_SHORT_SCDOC_NAME).toString(); } else @@ -294,9 +294,9 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) { if (aDocument.IsLinked( i )) { - rtl::OUString aName; + OUString aName; aDocument.GetName(i, aName); - rtl::OUString aLinkTabName = aDocument.GetLinkTab(i); + OUString aLinkTabName = aDocument.GetLinkTab(i); sal_Int32 nLinkTabNameLength = aLinkTabName.getLength(); sal_Int32 nNameLength = aName.getLength(); if (nLinkTabNameLength < nNameLength) @@ -307,7 +307,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) if ( *pNameBuffer == '\'' && // all docnames have to have a ' character on the first pos ScGlobal::UnicodeStrChr( pNameBuffer, SC_COMPILER_FILE_TAB_SEP ) ) { - rtl::OUStringBuffer aDocURLBuffer; + OUStringBuffer aDocURLBuffer; sal_Bool bQuote = sal_True; // Dokumentenname ist immer quoted ++pNameBuffer; while ( bQuote && *pNameBuffer ) @@ -429,7 +429,7 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un bRet = aImport.Import(sal_True, nError); if ( nError ) - pLoadMedium->SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pLoadMedium->SetError( nError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); //if the document was not generated by LibreOffice, do hard recalc in case some other document //generator saved cached formula results that differ from LibreOffice's calculated results or @@ -561,10 +561,10 @@ sal_Bool ScDocShell::Load( SfxMedium& rMedium ) } if (!bRet && !rMedium.GetError()) - rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); if (rMedium.GetError()) - SetError( rMedium.GetError(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( rMedium.GetError(), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); InitItems(); CalcOutputFactor(); @@ -690,7 +690,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::UNO_QUERY_THROW ); uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); + OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() ) @@ -708,7 +708,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); - aArgsForJob[0] = beans::NamedValue( ::rtl::OUString( "SpreadsheetView" ), + aArgsForJob[0] = beans::NamedValue( OUString( "SpreadsheetView" ), uno::makeAny( xSpreadsheetView ) ); xJob->execute( aArgsForJob ); } @@ -772,7 +772,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) try { ::svt::DocumentLockFile aLockFile( GetSharedFileURL() ); - uno::Sequence< ::rtl::OUString > aData = aLockFile.GetLockData(); + uno::Sequence< OUString > aData = aLockFile.GetLockData(); if ( aData.getLength() > LOCKFILE_SYSUSERNAME_ID ) { if ( !aData[LOCKFILE_OOOUSERNAME_ID].isEmpty() ) @@ -837,8 +837,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference< frame::XStorable > xStor( GetModel(), uno::UNO_QUERY_THROW ); // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge uno::Sequence< beans::PropertyValue > aValues(1); - aValues[0].Name = ::rtl::OUString( "FilterName"); - aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() ); + aValues[0].Name = OUString( "FilterName"); + aValues[0].Value <<= OUString( GetMedium()->GetFilter()->GetFilterName() ); SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) @@ -904,7 +904,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } if ( !bSuccess ) - SetError( ERRCODE_IO_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process + SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process } #endif @@ -921,7 +921,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( RET_NO == aBox.Execute()) { - SetError( ERRCODE_IO_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process + SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process } } } // fall through @@ -1062,7 +1062,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else bRet = sal_True; @@ -1091,7 +1091,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1128,13 +1128,13 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError == SCWARN_IMPORT_RANGE_OVERFLOW) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); bRet = sal_True; } else if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else bRet = true; @@ -1159,7 +1159,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) // ISO8859-1/MS_1252 encoding, comma, double quotes aOptions.SetCharSet( RTL_TEXTENCODING_MS_1252 ); - aOptions.SetFieldSeps( rtl::OUString(',') ); + aOptions.SetFieldSeps( OUString(',') ); aOptions.SetTextSep( '"' ); } @@ -1194,7 +1194,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else if (!GetError() && (bOverflowRow || bOverflowCol || bOverflowCell)) { @@ -1202,7 +1202,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) FltError nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW : (bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW : SCWARN_IMPORT_CELL_OVERFLOW)); - SetError( nWarn, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError( nWarn, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } bSetColWidths = sal_True; bSetSimpleTextColWidths = sal_True; @@ -1234,7 +1234,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); bRet = ( eError == SCWARN_IMPORT_RANGE_OVERFLOW ); } else @@ -1272,7 +1272,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1307,7 +1307,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); bSetColWidths = sal_True; bSetSimpleTextColWidths = sal_True; bSetRowHeights = sal_True; @@ -1318,7 +1318,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; } @@ -1344,7 +1344,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1363,7 +1363,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ)) { @@ -1395,7 +1395,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1412,12 +1412,12 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else { if (!GetError()) - SetError(SCERR_IMPORT_NI, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } if (!bCalc3) @@ -1664,16 +1664,16 @@ sal_Int32 lcl_ScDocShell_GetColWidthInChars( sal_uInt16 nWidth ) } -void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& rDoc, +void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol, sal_Bool bValue, SvxCellHorJustify eHorJust ) { - rtl::OUString aString = rStr; + OUString aString = rStr; sal_Int32 nLen = lcl_ScDocShell_GetColWidthInChars( rDoc.GetColWidth( nCol, nTab ) ); //If the text won't fit in the column if ( nLen < aString.getLength() ) { - rtl::OUStringBuffer aReplacement; + OUStringBuffer aReplacement; if (bValue) aReplacement.appendAscii(RTL_CONSTASCII_STRINGPARAM("###")); else @@ -1691,7 +1691,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& { case SVX_HOR_JUSTIFY_RIGHT: { - rtl::OUStringBuffer aTmp; + OUStringBuffer aTmp; aTmp = comphelper::string::padToLength( aTmp, nBlanks, ' ' ); aString = aTmp.append(aString).makeStringAndClear(); } @@ -1699,7 +1699,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& case SVX_HOR_JUSTIFY_CENTER: { sal_Int32 nLeftPad = nBlanks / 2; - rtl::OUStringBuffer aTmp; + OUStringBuffer aTmp; comphelper::string::padToLength( aTmp, nLeftPad, ' ' ); aTmp.append(aString); comphelper::string::padToLength( aTmp, nLen, ' ' ); @@ -1708,7 +1708,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& break; default: { - rtl::OUStringBuffer aTmp(aString); + OUStringBuffer aTmp(aString); comphelper::string::padToLength( aTmp, nLen, ' ' ); aString = aTmp.makeStringAndClear(); } @@ -1721,7 +1721,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& void lcl_ScDocShell_WriteEmptyFixedWidthString( SvStream& rStream, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol ) { - rtl::OUString aString; + OUString aString; lcl_ScDocShell_GetFixedWidthString( aString, rDoc, nTab, nCol, false, SVX_HOR_JUSTIFY_STANDARD ); rStream.WriteUnicodeOrByteText( aString ); @@ -1766,10 +1766,10 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt CharSet eOldCharSet = rStream.GetStreamCharSet(); rStream.SetStreamCharSet( eCharSet ); sal_uInt16 nOldNumberFormatInt = rStream.GetNumberFormatInt(); - rtl::OString aStrDelimEncoded; // only used if not Unicode - rtl::OUString aStrDelimDecoded; // only used if context encoding - rtl::OString aDelimEncoded; - rtl::OUString aDelimDecoded; + OString aStrDelimEncoded; // only used if not Unicode + OUString aStrDelimDecoded; // only used if context encoding + OString aDelimEncoded; + OUString aDelimDecoded; bool bContextOrNotAsciiEncoding; if ( eCharSet == RTL_TEXTENCODING_UNICODE ) { @@ -1778,8 +1778,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - aStrDelimEncoded = rtl::OString(&cStrDelim, 1, eCharSet); - aDelimEncoded = rtl::OString(&cDelim, 1, eCharSet); + aStrDelimEncoded = OString(&cStrDelim, 1, eCharSet); + aDelimEncoded = OString(&cDelim, 1, eCharSet); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof(aInfo); if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) ) @@ -1789,8 +1789,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0)); if ( bContextOrNotAsciiEncoding ) { - aStrDelimDecoded = rtl::OStringToOUString(aStrDelimEncoded, eCharSet); - aDelimDecoded = rtl::OStringToOUString(aDelimEncoded, eCharSet); + aStrDelimDecoded = OStringToOUString(aStrDelimEncoded, eCharSet); + aDelimDecoded = OStringToOUString(aDelimEncoded, eCharSet); } } else @@ -1806,7 +1806,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt ScProgress aProgress( this, ScGlobal::GetRscString( STR_SAVE_DOC ), nEndRow ); - rtl::OUString aString; + OUString aString; bool bTabProtect = aDocument.IsTabProtected( nTab ); @@ -1896,7 +1896,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt { case CELLTYPE_NOTE: case CELLTYPE_NONE: - aString = rtl::OUString(); + aString = OUString(); bString = false; break; case CELLTYPE_FORMULA : @@ -1980,7 +1980,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt break; default: OSL_FAIL( "ScDocShell::AsciiSave: unknown CellType" ); - aString = rtl::OUString(); + aString = OUString(); bString = false; } @@ -1995,7 +1995,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - rtl::OUString aUniString = aString;//remove that later + OUString aUniString = aString;//remove that later if (!bString && cStrDelim != 0 && !aUniString.isEmpty()) { sal_Unicode c = aUniString[0]; @@ -2015,8 +2015,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt sal_Int32 nPos = getTextSepPos( aUniString, rAsciiOpt, cStrDelim, cDelim, bNeedQuotes); - escapeTextSep<rtl::OUString, rtl::OUStringBuffer>( - nPos, rtl::OUString(cStrDelim), aUniString); + escapeTextSep<OUString, OUStringBuffer>( + nPos, OUString(cStrDelim), aUniString); if ( bNeedQuotes ) rStream.WriteUniOrByteChar( cStrDelim, eCharSet ); @@ -2043,16 +2043,16 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt if ( bContextOrNotAsciiEncoding ) { // to byte encoding - rtl::OString aStrEnc = rtl::OUStringToOString(aUniString, eCharSet); + OString aStrEnc = OUStringToOString(aUniString, eCharSet); // back to Unicode - rtl::OUString aStrDec = rtl::OStringToOUString(aStrEnc, eCharSet); + OUString aStrDec = OStringToOUString(aStrEnc, eCharSet); // search on re-decoded string bool bNeedQuotes = false; sal_Int32 nPos = getTextSepPos( aStrDec, rAsciiOpt, aStrDelimDecoded, aDelimDecoded, bNeedQuotes); - escapeTextSep<rtl::OUString, rtl::OUStringBuffer>( + escapeTextSep<OUString, OUStringBuffer>( nPos, aStrDelimDecoded, aStrDec); // write byte re-encoded @@ -2064,14 +2064,14 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - rtl::OString aStrEnc = rtl::OUStringToOString(aUniString, eCharSet); + OString aStrEnc = OUStringToOString(aUniString, eCharSet); // search on encoded string bool bNeedQuotes = false; sal_Int32 nPos = getTextSepPos( aStrEnc, rAsciiOpt, aStrDelimEncoded, aDelimEncoded, bNeedQuotes); - escapeTextSep<rtl::OString, rtl::OStringBuffer>( + escapeTextSep<OString, OStringBuffer>( nPos, aStrDelimEncoded, aStrEnc); // write byte encoded @@ -2205,7 +2205,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 ); if( eError && !GetError() ) - SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // don't return false for warnings bRet = ((eError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK) || (eError == eERR_OK); @@ -2213,7 +2213,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) else { // export aborted, i.e. "Save without password" warning - SetError( ERRCODE_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( ERRCODE_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } else if (aFltName.EqualsAscii(pFilterAscii)) @@ -2246,7 +2246,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } } else if (aFltName.EqualsAscii(pFilterDBase)) @@ -2283,11 +2283,11 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) INetURLObject aTmpFile( rMed.GetPhysicalName(), INET_PROT_FILE ); if ( bHasMemo ) - aTmpFile.setExtension(rtl::OUString("dbt")); + aTmpFile.setExtension(OUString("dbt")); if ( eError != eERR_OK ) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if ( bHasMemo && IsDocument( aTmpFile ) ) KillFile( aTmpFile ); } @@ -2299,7 +2299,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SfxStringItem* pNameItem = (SfxStringItem*) rMed.GetItemSet()->GetItem( SID_FILE_NAME ); INetURLObject aDbtFile( pNameItem->GetValue(), INET_PROT_FILE ); - aDbtFile.setExtension(rtl::OUString("dbt")); + aDbtFile.setExtension(OUString("dbt")); if ( IsDocument( aDbtFile ) && !KillFile( aDbtFile ) ) bRet = false; if ( bRet && !MoveFile( aTmpFile, aDbtFile ) ) @@ -2308,7 +2308,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) { KillFile( aTmpFile ); if ( !GetError() ) - SetError( SCERR_EXPORT_DATA, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( SCERR_EXPORT_DATA, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } } @@ -2342,7 +2342,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } } else if (aFltName.EqualsAscii(pFilterSylk)) @@ -2375,13 +2375,13 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SetError( *new StringErrorInfo( SCWARN_EXPORT_NONCONVERTIBLE_CHARS, aImExport.GetNonConvertibleChars(), - ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } else { if (GetError()) - SetError(SCERR_IMPORT_NI, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } return bRet; } @@ -2511,37 +2511,37 @@ void ScDocShell::PrepareReload() String ScDocShell::GetOwnFilterName() { - return rtl::OUString(pFilterSc50); + return OUString(pFilterSc50); } String ScDocShell::GetHtmlFilterName() { - return rtl::OUString(pFilterHtml); + return OUString(pFilterHtml); } String ScDocShell::GetWebQueryFilterName() { - return rtl::OUString(pFilterHtmlWebQ); + return OUString(pFilterHtmlWebQ); } String ScDocShell::GetAsciiFilterName() { - return rtl::OUString(pFilterAscii); + return OUString(pFilterAscii); } String ScDocShell::GetLotusFilterName() { - return rtl::OUString(pFilterLotus); + return OUString(pFilterLotus); } String ScDocShell::GetDBaseFilterName() { - return rtl::OUString(pFilterDBase); + return OUString(pFilterDBase); } String ScDocShell::GetDifFilterName() { - return rtl::OUString(pFilterDif); + return OUString(pFilterDif); } sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter ) @@ -2578,7 +2578,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : SfxObjectShell( rShell.GetCreateMode() ), SfxListener(), aDocument ( SCDOCMODE_DOCUMENT, this ), - aDdeTextFmt(rtl::OUString("TEXT")), + aDdeTextFmt(OUString("TEXT")), nPrtToScreenFactor( 1.0 ), pImpl ( new DocShell_Impl ), bHeaderOn ( true ), @@ -2627,7 +2627,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : SfxObjectShell( i_nSfxCreationFlags ), aDocument ( SCDOCMODE_DOCUMENT, this ), - aDdeTextFmt(rtl::OUString("TEXT")), + aDdeTextFmt(OUString("TEXT")), nPrtToScreenFactor( 1.0 ), pImpl ( new DocShell_Impl ), bHeaderOn ( true ), diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 361de67402fa..d64966bc9299 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -362,7 +362,7 @@ void ScDocShell::CalcOutputFactor() return; } - rtl::OUString aTestString( + OUString aTestString( "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789"); long nPrinterWidth = 0; long nWindowWidth = 0; @@ -766,9 +766,9 @@ static bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScD pAction->GetDateTimeUTC() == pA->GetDateTimeUTC() ) && pAction->GetBigRange() == pA->GetBigRange() ) { - rtl::OUString aActionDesc; + OUString aActionDesc; pAction->GetDescription(aActionDesc, pDoc, true); - rtl::OUString aADesc; + OUString aADesc; pA->GetDescription(aADesc, pSearchDoc, true); if (aActionDesc.equals(aADesc)) { @@ -847,7 +847,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck return; //! nichts zu tun - Fehlermeldung? // ab hier kein return mehr - ScProgress aProgress( this, rtl::OUString("..."), + ScProgress aProgress( this, OUString("..."), nNewActionCount ); sal_uLong nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber(); @@ -938,10 +938,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck //! ??? Loesch-Aktion rueckgaengig machen ??? //! ??? Aktion irgendwo anders speichern ??? #if OSL_DEBUG_LEVEL > 0 - rtl::OUString aValue; + OUString aValue; if ( eSourceType == SC_CAT_CONTENT ) ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue ); - rtl::OStringBuffer aError(rtl::OUStringToOString(aValue, + OStringBuffer aError(OUStringToOString(aValue, osl_getThreadTextEncoding())); aError.append(RTL_CONSTASCII_STRINGPARAM(" weggelassen")); OSL_FAIL( aError.getStr() ); @@ -1004,7 +1004,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck OSL_ENSURE( aSourceRange.aStart == aSourceRange.aEnd, "huch?" ); ScAddress aPos = aSourceRange.aStart; - rtl::OUString aValue; + OUString aValue; ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue ); sal_uInt8 eMatrix = MM_NONE; const ScCellValue& rCell = ((const ScChangeActionContent*)pSourceAction)->GetNewCell(); @@ -1041,7 +1041,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck break; case SC_CAT_INSERT_TABS : { - rtl::OUString aName; + OUString aName; aDocument.CreateValidTabName( aName ); GetDocFunc().InsertTable( aSourceRange.aStart.Tab(), aName, sal_True, false ); } @@ -1208,7 +1208,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) ScDocument* pTmpDoc = new ScDocument; for ( sal_Int32 nIndex = 0; nIndex < aDocument.GetTableCount(); ++nIndex ) { - rtl::OUString sTabName; + OUString sTabName; pTmpDoc->CreateValidTabName( sTabName ); pTmpDoc->InsertTab( SC_TAB_APPEND, sTabName ); } @@ -1253,7 +1253,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) pTmpDoc = new ScDocument; for ( sal_Int32 nIndex = 0; nIndex < aDocument.GetTableCount(); ++nIndex ) { - rtl::OUString sTabName; + OUString sTabName; pTmpDoc->CreateValidTabName( sTabName ); pTmpDoc->InsertTab( SC_TAB_APPEND, sTabName ); } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 70c911d10352..663a6b7a5d9e 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -663,16 +663,16 @@ void ScDocShell::Execute( SfxRequest& rReq ) pReqArgs->GetItemState( SID_FILE_NAME, sal_True, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { - rtl::OUString aFileName = + OUString aFileName = static_cast<const SfxStringItem*>(pItem)->GetValue(); - rtl::OUString aFilterName; + OUString aFilterName; if ( pReqArgs->GetItemState( SID_FILTER_NAME, sal_True, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { aFilterName = static_cast<const SfxStringItem*>(pItem)->GetValue(); } - rtl::OUString aOptions; + OUString aOptions; if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { @@ -709,7 +709,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) pImpl->pRequest = new SfxRequest( rReq ); delete pImpl->pDocInserter; pImpl->pDocInserter = new ::sfx2::DocumentInserter( - rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); + OUString::createFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); pImpl->pDocInserter->StartExecuteModal( LINK( this, ScDocShell, DialogClosedHdl ) ); return ; } @@ -831,13 +831,13 @@ void ScDocShell::Execute( SfxRequest& rReq ) { if ( pItem->ISA(SfxStringItem) ) { - rtl::OUString aName = ((const SfxStringItem*)pItem)->GetValue(); + OUString aName = ((const SfxStringItem*)pItem)->GetValue(); SCTAB nTab; if (aDocument.GetTable( aName, nTab )) { if (aDocument.IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; aDocument.GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -994,7 +994,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) try { ::svt::DocumentLockFile aLockFile( GetSharedFileURL() ); - uno::Sequence< ::rtl::OUString > aData = aLockFile.GetLockData(); + uno::Sequence< OUString > aData = aLockFile.GetLockData(); if ( aData.getLength() > LOCKFILE_SYSUSERNAME_ID ) { if ( !aData[LOCKFILE_OOOUSERNAME_ID].isEmpty() ) @@ -1080,8 +1080,8 @@ void ScDocShell::Execute( SfxRequest& rReq ) #endif case SID_OPEN_CALC: { - SfxStringItem aApp(SID_DOC_SERVICE, rtl::OUString("com.sun.star.sheet.SpreadsheetDocument")); - SfxStringItem aTarget(SID_TARGETNAME, rtl::OUString("_blank")); + SfxStringItem aApp(SID_DOC_SERVICE, OUString("com.sun.star.sheet.SpreadsheetDocument")); + SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank")); GetViewData()->GetDispatcher().Execute( SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aApp, &aTarget, 0L); } @@ -1299,8 +1299,8 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) { ScDocShellModificator aModificator( *this ); - rtl::OUString aNewName = pStyle->GetName(); - rtl::OUString aOldName = aNewName; + OUString aNewName = pStyle->GetName(); + OUString aOldName = aNewName; sal_Bool bExtended = rHint.ISA(SfxStyleSheetHintExtended); // Name geaendert? if (bExtended) aOldName = ((SfxStyleSheetHintExtended&)rHint).GetOldName(); @@ -1337,8 +1337,8 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) { if ( nId == SFX_STYLESHEET_MODIFIED) { - rtl::OUString aNewName = pStyle->GetName(); - rtl::OUString aOldName = aNewName; + OUString aNewName = pStyle->GetName(); + OUString aOldName = aNewName; sal_Bool bExtended = rHint.ISA(SfxStyleSheetHintExtended); if (bExtended) aOldName = ((SfxStyleSheetHintExtended&)rHint).GetOldName(); @@ -1472,7 +1472,7 @@ bool ScDocShell::AdjustPrintZoom( const ScRange& rRange ) return bChange; } -void ScDocShell::PageStyleModified( const rtl::OUString& rStyleName, sal_Bool bApi ) +void ScDocShell::PageStyleModified( const OUString& rStyleName, sal_Bool bApi ) { ScDocShellModificator aModificator( *this ); @@ -2072,7 +2072,7 @@ long ScDocShell::DdeGetData( const String& rItem, { if( rItem.EqualsIgnoreCaseAscii( "Format" ) ) { - rtl::OString aFmtByte(rtl::OUStringToOString(aDdeTextFmt, + OString aFmtByte(OUStringToOString(aDdeTextFmt, osl_getThreadTextEncoding())); rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( (const sal_Int8*)aFmtByte.getStr(), @@ -2088,7 +2088,7 @@ long ScDocShell::DdeGetData( const String& rItem, if( aDdeTextFmt.EqualsAscii( "SYLK" ) || aDdeTextFmt.EqualsAscii( "FSYLK" ) ) { - rtl::OString aData; + OString aData; if( aObj.ExportByteString( aData, osl_getThreadTextEncoding(), SOT_FORMATSTR_ID_SYLK ) ) { @@ -2345,7 +2345,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() SC_MOD()->SetInSharedDocLoading( true ); uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Sequence < beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "Hidden" ); + aArgs[0].Name = OUString( "Hidden" ); aArgs[0].Value <<= sal_True; if ( GetMedium() ) @@ -2360,7 +2360,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() } xModel.set( - xLoader->loadComponentFromURL( GetSharedFileURL(), ::rtl::OUString( "_blank" ), 0, aArgs ), + xLoader->loadComponentFromURL( GetSharedFileURL(), OUString( "_blank" ), 0, aArgs ), uno::UNO_QUERY_THROW ); SC_MOD()->SetInSharedDocLoading( false ); } diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index ea2de10698be..e40ae12de3c1 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -49,7 +49,7 @@ #include "clipparam.hxx" // defined in docfunc.cxx -void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModuleName, const rtl::OUString& sModuleSource ); +void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sModuleSource ); using com::sun::star::script::XLibraryContainer; using com::sun::star::script::vba::XVBACompatibility; @@ -277,7 +277,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe } else { - aNewName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); pNoNameData = new ScDBData(aNewName , nTab, nStartCol,nStartRow, nEndCol,nEndRow, sal_True, bHasHeader ); @@ -448,9 +448,9 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource ) } } -static rtl::OUString lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea ) +static OUString lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea ) { - rtl::OUString aName; + OUString aName; sal_Bool bOk = false; ScDBData* pData = pDoc->GetDBAtArea( pArea->nTab, pArea->nColStart, pArea->nRowStart, pArea->nColEnd, pArea->nRowEnd ); @@ -630,7 +630,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord SCTAB nTabCount = aDocument.GetTableCount(); SCTAB nSrcTab = SCTAB_MAX; SCTAB nEndTab = nTab; - rtl::OUString aCompare; + OUString aCompare; while ( nEndTab+1 < nTabCount && aDocument.IsScenario(nEndTab+1) ) { ++nEndTab; @@ -666,7 +666,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord for (SCTAB i=nTab+1; i<=nEndTab; i++) { pUndoDoc->SetScenario( i, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; aDocument.GetScenarioData( i, aComment, aColor, nScenFlags ); @@ -718,9 +718,9 @@ void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String& const Color& rColor, sal_uInt16 nFlags ) { // Undo - rtl::OUString aOldName; + OUString aOldName; aDocument.GetName( nTab, aOldName ); - rtl::OUString aOldComment; + OUString aOldComment; Color aOldColor; sal_uInt16 nOldFlags; aDocument.GetScenarioData( nTab, aOldComment, aOldColor, nOldFlags ); @@ -832,7 +832,7 @@ sal_uLong ScDocShell::TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos, if(nErrVal>0 && pSrcDoc->IsScenario( nSrcPos )) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; @@ -872,7 +872,7 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s if (bRecord) aDocument.BeginDrawUndo(); // drawing layer must do its own undo actions - rtl::OUString sSrcCodeName; + OUString sSrcCodeName; aDocument.GetCodeName( nSrcTab, sSrcCodeName ); if (!aDocument.CopyTab( nSrcTab, nDestTab )) { @@ -913,8 +913,8 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s SCTAB nTabToUse = nDestTab; if ( nDestTab == SC_TAB_APPEND ) nTabToUse = aDocument.GetMaxTableNumber() - 1; - rtl::OUString sCodeName; - rtl::OUString sSource; + OUString sCodeName; + OUString sSource; try { Reference< XNameContainer > xLib; diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 6cd076c56b83..6c158ca0bcb3 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -52,7 +52,6 @@ using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::rtl::OUString; namespace { @@ -364,7 +363,7 @@ void ScDocShell::ReconnectDdeLink(SfxObjectShell& rServer) void ScDocShell::UpdateLinks() { - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType; + typedef boost::unordered_set<OUString, OUStringHash> StrSetType; sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); StrSetType aNames; @@ -397,9 +396,9 @@ void ScDocShell::UpdateLinks() if (!aDocument.IsLinked(i)) continue; - rtl::OUString aDocName = aDocument.GetLinkDoc(i); - rtl::OUString aFltName = aDocument.GetLinkFlt(i); - rtl::OUString aOptions = aDocument.GetLinkOpt(i); + OUString aDocName = aDocument.GetLinkDoc(i); + OUString aFltName = aDocument.GetLinkFlt(i); + OUString aOptions = aDocument.GetLinkOpt(i); sal_uLong nRefresh = aDocument.GetLinkRefreshDelay(i); bool bThere = false; for (SCTAB j = 0; j < i && !bThere; ++j) // im Dokument mehrfach? diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index cd9871d0b328..58ac3640122b 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -119,7 +119,7 @@ namespace // get connection - String aConnUrl = rtl::OUString("sdbc:dbase:"); + String aConnUrl = OUString("sdbc:dbase:"); aConnUrl += aPath; svxform::ODataAccessCharsetHelper aHelper; @@ -131,19 +131,19 @@ namespace OSL_FAIL( "DBaseImport: dbtools::OCharsetMap doesn't know text encoding" ); return SCERR_IMPORT_CONNECT; } // if ( aIter == aMap.end() ) - rtl::OUString aCharSetStr; + OUString aCharSetStr; if ( RTL_TEXTENCODING_DONTKNOW != *aIter ) { // it's not the virtual "system charset" const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( *aIter ); OSL_ENSURE( pIanaName, "invalid mime name!" ); if ( pIanaName ) - aCharSetStr = ::rtl::OUString::createFromAscii( pIanaName ); + aCharSetStr = OUString::createFromAscii( pIanaName ); } uno::Sequence<beans::PropertyValue> aProps(2); - aProps[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_EXTENSION)); - aProps[0].Value <<= rtl::OUString( aExtension ); - aProps[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_CHARSET)); + aProps[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_EXTENSION)); + aProps[0].Value <<= OUString( aExtension ); + aProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_CHARSET)); aProps[1].Value <<= aCharSetStr; _rConnection = _rDrvMgr->getConnectionWithInfo( aConnUrl, aProps ); @@ -176,7 +176,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); - rtl::OUString aTransferName = rtl::OUString( "transfer" ); + OUString aTransferName = OUString( "transfer" ); if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, uno::makeAny( @@ -209,7 +209,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL ) ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( rtl::OUString( "delete" ), + aCnt.executeCommand( OUString( "delete" ), comphelper::makeBoolAny( sal_True ) ); } catch( uno::Exception& ) @@ -325,7 +325,7 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), 0 ); uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), uno::UNO_QUERY); ::utl::DisposableComponent aRowSetHelper(xRowSet); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); @@ -337,19 +337,19 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet aAny <<= xConnection; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); aAny <<= nType; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); - aAny <<= rtl::OUString( aTabName ); + aAny <<= OUString( aTabName ); xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); aAny <<= false; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PROPCHANGE_NOTIFY)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PROPCHANGE_NOTIFY)), aAny ); xRowSet->execute(); @@ -493,7 +493,7 @@ inline bool IsAsciiAlpha( sal_Unicode c ) void lcl_GetColumnTypes( ScDocShell& rDocShell, const ScRange& rDataRange, bool bHasFieldNames, - rtl::OUString* pColNames, sal_Int32* pColTypes, sal_Int32* pColLengths, + OUString* pColNames, sal_Int32* pColTypes, sal_Int32* pColLengths, sal_Int32* pColScales, bool& bHasMemo, CharSet eCharSet ) { // updating of column titles didn't work in 5.2 and isn't always wanted @@ -510,7 +510,7 @@ void lcl_GetColumnTypes( SCCOL nLastCol = rDataRange.aEnd.Col(); SCROW nLastRow = rDataRange.aEnd.Row(); - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType; + typedef boost::unordered_set<OUString, OUStringHash> StrSetType; StrSetType aFieldNames; long nField = 0; @@ -784,7 +784,7 @@ inline void lcl_getLongVarCharString( #endif // !DISABLE_DBCONNECTIVITY -sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ) +sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ) { #ifdef DISABLE_DBCONNECTIVITY (void) rFullFileName; @@ -821,7 +821,7 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e } long nColCount = nLastCol - nFirstCol + 1; - uno::Sequence<rtl::OUString> aColNames( nColCount ); + uno::Sequence<OUString> aColNames( nColCount ); uno::Sequence<sal_Int32> aColTypes( nColCount ); uno::Sequence<sal_Int32> aColLengths( nColCount ); uno::Sequence<sal_Int32> aColScales( nColCount ); @@ -834,7 +834,7 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e // also needed for exception catch SCROW nDocRow = 0; ScFieldEditEngine aEditEngine(&aDocument, aDocument.GetEditPool()); - rtl::OUString aString; + OUString aString; String aTabName; try @@ -873,8 +873,8 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e OSL_ENSURE( xTableDesc.is(), "can't get table descriptor" ); if (!xTableDesc.is()) return SCERR_EXPORT_CONNECT; - aAny <<= rtl::OUString( aTabName ); - xTableDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); + aAny <<= OUString( aTabName ); + xTableDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); // create columns @@ -894,7 +894,7 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e OSL_ENSURE( xColumnsAppend.is(), "can't get columns XAppend" ); if (!xColumnsAppend.is()) return SCERR_EXPORT_CONNECT; - const rtl::OUString* pColNames = aColNames.getConstArray(); + const OUString* pColNames = aColNames.getConstArray(); const sal_Int32* pColTypes = aColTypes.getConstArray(); const sal_Int32* pColLengths = aColLengths.getConstArray(); const sal_Int32* pColScales = aColScales.getConstArray(); @@ -907,16 +907,16 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e if (!xColumnDesc.is()) return SCERR_EXPORT_CONNECT; aAny <<= pColNames[nCol]; - xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); + xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); aAny <<= pColTypes[nCol]; - xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_TYPE)), aAny ); + xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_TYPE)), aAny ); aAny <<= pColLengths[nCol]; - xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PRECISION)), aAny ); + xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PRECISION)), aAny ); aAny <<= pColScales[nCol]; - xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_SCALE)), aAny ); + xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_SCALE)), aAny ); xColumnsAppend->appendByDescriptor( xColumnDesc ); } @@ -926,7 +926,7 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e // get row set for writing uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), uno::UNO_QUERY); ::utl::DisposableComponent aRowSetHelper(xRowSet); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); @@ -935,15 +935,15 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e aAny <<= xConnection; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); aAny <<= (sal_Int32) sdb::CommandType::TABLE; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); - aAny <<= rtl::OUString( aTabName ); + aAny <<= OUString( aTabName ); xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); xRowSet->execute(); @@ -1116,8 +1116,8 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e sal_Int32 nLen; if (bIsOctetTextEncoding) { - rtl::OUString aOUString( aString); - rtl::OString aOString; + OUString aOUString( aString); + OString aOString; if (!aOUString.convertToString( &aOString, eCharSet, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 2134e119793d..b6f847b15237 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -59,7 +59,6 @@ using ::std::auto_ptr; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::std::vector; using ::std::find; using ::std::find_if; @@ -1216,7 +1215,7 @@ void ScExternalRefLink::Closed() if (!mbDoRefresh) return SUCCESS; - rtl::OUString aFile, aFilter; + OUString aFile, aFilter; mpDoc->GetLinkManager()->GetDisplayNames(this, NULL, &aFile, NULL, &aFilter); ScExternalRefManager* pMgr = mpDoc->GetExternalRefManager(); @@ -2200,7 +2199,7 @@ bool ScExternalRefManager::isFileLoadable(const OUString& rFile) const if (isOwnDocument(rFile)) return false; - rtl::OUString aPhysical; + OUString aPhysical; if (utl::LocalFileHelper::ConvertURLToPhysicalName(rFile, aPhysical) && !aPhysical.isEmpty()) { // #i114504# try IsFolder/Exists only for file URLs @@ -2301,7 +2300,7 @@ void ScExternalRefManager::convertToAbsName(OUString& rFile) const ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType, false)); while (pShell) { - if (rFile == rtl::OUString(pShell->GetName())) + if (rFile == OUString(pShell->GetName())) return; pShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pShell, &aType, false)); @@ -2634,8 +2633,8 @@ void ScExternalRefManager::transformUnsavedRefToSavedRef( SfxObjectShell* pShell if (&(itr->second.maShell) == pShell) { // found that the shell is marked as unsaved - rtl::OUString aFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI); - switchSrcFile(itr->first, aFileURL, rtl::OUString()); + OUString aFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI); + switchSrcFile(itr->first, aFileURL, OUString()); EndListening(*pShell); maUnsavedDocShells.erase(itr++); } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 20e981f5b1f9..7e734d3e3bf6 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -289,7 +289,7 @@ bool ScImportExport::ExportData( const String& rMimeType, } -bool ScImportExport::ImportString( const ::rtl::OUString& rText, sal_uLong nFmt ) +bool ScImportExport::ImportString( const OUString& rText, sal_uLong nFmt ) { switch ( nFmt ) { @@ -304,7 +304,7 @@ bool ScImportExport::ImportString( const ::rtl::OUString& rText, sal_uLong nFmt default: { rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); - ::rtl::OString aTmp( rText.getStr(), rText.getLength(), eEnc ); + OString aTmp( rText.getStr(), rText.getLength(), eEnc ); SvMemoryStream aStrm( (void*)aTmp.getStr(), aTmp.getLength() * sizeof(sal_Char), STREAM_READ ); aStrm.SetStreamCharSet( eEnc ); SetNoEndianSwap( aStrm ); //! no swapping in memory @@ -314,15 +314,15 @@ bool ScImportExport::ImportString( const ::rtl::OUString& rText, sal_uLong nFmt } -bool ScImportExport::ExportString( ::rtl::OUString& rText, sal_uLong nFmt ) +bool ScImportExport::ExportString( OUString& rText, sal_uLong nFmt ) { OSL_ENSURE( nFmt == FORMAT_STRING, "ScImportExport::ExportString: Unicode not supported for other formats than FORMAT_STRING" ); if ( nFmt != FORMAT_STRING ) { rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); - rtl::OString aTmp; + OString aTmp; bool bOk = ExportByteString( aTmp, eEnc, nFmt ); - rText = rtl::OStringToOUString( aTmp, eEnc ); + rText = OStringToOUString( aTmp, eEnc ); return bOk; } // nSizeLimit not needed for OUString @@ -336,17 +336,17 @@ bool ScImportExport::ExportString( ::rtl::OUString& rText, sal_uLong nFmt ) aStrm << (sal_Unicode) 0; aStrm.Seek( STREAM_SEEK_TO_END ); - rText = rtl::OUString( (const sal_Unicode*) aStrm.GetData() ); + rText = OUString( (const sal_Unicode*) aStrm.GetData() ); return true; } - rText = rtl::OUString(); + rText = OUString(); return false; // ExportStream must handle RTL_TEXTENCODING_UNICODE } -bool ScImportExport::ExportByteString( rtl::OString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt ) +bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt ) { OSL_ENSURE( eEnc != RTL_TEXTENCODING_UNICODE, "ScImportExport::ExportByteString: Unicode not supported" ); if ( eEnc == RTL_TEXTENCODING_UNICODE ) @@ -370,7 +370,7 @@ bool ScImportExport::ExportByteString( rtl::OString& rText, rtl_TextEncoding eEn return true; } } - rText = rtl::OString(); + rText = OString(); return false; } @@ -463,7 +463,7 @@ bool ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, sal_ // extra bits are used to tell the client to prefer external // reference link. - ::rtl::OUString aExtraBits("calc:extref"); + OUString aExtraBits("calc:extref"); WriteUnicodeOrByteString( rStrm, aAppName, true ); WriteUnicodeOrByteString( rStrm, aDocName, true ); @@ -512,7 +512,7 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rS } else { - rtl::OString aByteStr(rtl::OUStringToOString(rString, eEnc)); + OString aByteStr(OUStringToOString(rString, eEnc)); rStrm << aByteStr.getStr(); if ( bZero ) rStrm << sal_Char(0); @@ -723,11 +723,11 @@ static void lcl_UnescapeSylk( String & rString, SylkVersion eVersion ) // Older versions quoted the string and doubled embedded quotes, but not // the semicolons, which was plain wrong. if (eVersion >= SYLK_OOO32) - rString.SearchAndReplaceAll( rtl::OUString(DOUBLE_SEMICOLON), rtl::OUString(';') ); + rString.SearchAndReplaceAll( OUString(DOUBLE_SEMICOLON), OUString(';') ); else - rString.SearchAndReplaceAll( rtl::OUString(DOUBLE_DOUBLEQUOTE), rtl::OUString('"') ); + rString.SearchAndReplaceAll( OUString(DOUBLE_DOUBLEQUOTE), OUString('"') ); - rString.SearchAndReplaceAll( rtl::OUString(SYLK_LF), rtl::OUString(_LF) ); + rString.SearchAndReplaceAll( OUString(SYLK_LF), OUString(_LF) ); } static const sal_Unicode* lcl_ScanSylkString( const sal_Unicode* p, @@ -888,7 +888,7 @@ bool ScImportExport::Text2Doc( SvStream& rStrm ) while( bOk ) { - rtl::OUString aLine; + OUString aLine; String aCell; SCROW nRow = nStartRow; rStrm.Seek( nOldPos ); @@ -1155,7 +1155,7 @@ static bool lcl_PutString( if (nFound > 6) { sal_Unicode cDec = '.'; - rtl::OUString aT( &cDec, 1); + OUString aT( &cDec, 1); aT += rStr.Copy( nStart[6], nEnd[6]+1-nStart[6]); rtl_math_ConversionStatus eStatus; double fV = rtl::math::stringToDouble( aT, cDec, 0, &eStatus, 0); @@ -1216,7 +1216,7 @@ static bool lcl_PutString( } -static String lcl_GetFixed( const rtl::OUString& rLine, sal_Int32 nStart, sal_Int32 nNext, +static String lcl_GetFixed( const OUString& rLine, sal_Int32 nStart, sal_Int32 nNext, bool& rbIsQuoted, bool& rbOverflowCell ) { sal_Int32 nLen = rLine.getLength(); @@ -1307,7 +1307,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) LanguageTag( LANGUAGE_ENGLISH_US ).getLocale() ); } - rtl::OUString aLine; + OUString aLine; String aCell; sal_uInt16 i; SCROW nRow = nStartRow; @@ -1677,7 +1677,7 @@ bool ScImportExport::Doc2Text( SvStream& rStrm ) } } if( nCol < nEndCol ) - lcl_WriteSimpleString( rStrm, rtl::OUString(cSep) ); + lcl_WriteSimpleString( rStrm, OUString(cSep) ); } WriteUnicodeOrByteEndl( rStrm ); if( rStrm.GetError() != SVSTREAM_OK ) @@ -1716,7 +1716,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { String aLine; String aText; - rtl::OString aByteLine; + OString aByteLine; SCCOL nCol = nStartCol; SCROW nRow = nStartRow; SCCOL nRefCol = 1; @@ -1726,7 +1726,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { //! allow unicode rStrm.ReadLine( aByteLine ); - aLine = rtl::OStringToOUString(aByteLine, rStrm.GetStreamCharSet()); + aLine = OStringToOUString(aByteLine, rStrm.GetStreamCharSet()); if( rStrm.IsEof() ) break; const sal_Unicode* p = aLine.GetBuffer(); @@ -1742,16 +1742,16 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) switch( ch ) { case 'X': - nCol = static_cast<SCCOL>(rtl::OUString(p).toInt32()) + nStartCol - 1; + nCol = static_cast<SCCOL>(OUString(p).toInt32()) + nStartCol - 1; break; case 'Y': - nRow = rtl::OUString(p).toInt32() + nStartRow - 1; + nRow = OUString(p).toInt32() + nStartRow - 1; break; case 'C': - nRefCol = static_cast<SCCOL>(rtl::OUString(p).toInt32()) + nStartCol - 1; + nRefCol = static_cast<SCCOL>(OUString(p).toInt32()) + nStartCol - 1; break; case 'R': - nRefRow = rtl::OUString(p).toInt32() + nStartRow - 1; + nRefRow = OUString(p).toInt32() + nStartRow - 1; break; case 'K': { @@ -1862,10 +1862,10 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) switch( ch ) { case 'X': - nCol = static_cast<SCCOL>(rtl::OUString(p).toInt32()) + nStartCol - 1; + nCol = static_cast<SCCOL>(OUString(p).toInt32()) + nStartCol - 1; break; case 'Y': - nRow = rtl::OUString(p).toInt32() + nStartRow - 1; + nRow = OUString(p).toInt32() + nStartRow - 1; break; case 'P' : if ( bData ) @@ -1876,7 +1876,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) const sal_Unicode* p0 = p; while( *p && *p != ';' ) p++; - rtl::OUString aNumber(p0, p - p0); + OUString aNumber(p0, p - p0); nFormat = aNumber.toInt32(); } break; @@ -1904,11 +1904,11 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { if ( bData && *p == ';' && *(p+1) == 'P' ) { - rtl::OUString aCode( p+2 ); + OUString aCode( p+2 ); // unescape doubled semicolons aCode = aCode.replaceAll(";;", ";"); // get rid of Xcl escape characters - aCode = aCode.replaceAll(rtl::OUString(static_cast<sal_Unicode>(0x1b)), rtl::OUString()); + aCode = aCode.replaceAll(OUString(static_cast<sal_Unicode>(0x1b)), OUString()); sal_Int32 nCheckPos; short nType; sal_uInt32 nKey; @@ -2003,7 +2003,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) case CELLTYPE_EDIT: hasstring: aCellStr = pDoc->GetString(nCol, nRow, aRange.aStart.Tab()); - aCellStr.SearchAndReplaceAll( rtl::OUString(_LF), rtl::OUString(SYLK_LF) ); + aCellStr.SearchAndReplaceAll( OUString(_LF), OUString(SYLK_LF) ); aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" )); aBufStr += OUString::number( c ); @@ -2023,7 +2023,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) aCellStr.Erase(); break; default: - rtl::OUString aOUCellStr; + OUString aOUCellStr; pFCell->GetFormula( aOUCellStr,formula::FormulaGrammar::GRAM_PODF_A1); aCellStr = aOUCellStr; /* FIXME: do we want GRAM_ODFF_A1 instead? At @@ -2086,7 +2086,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) } } } - lcl_WriteSimpleString( rStrm, rtl::OUString( 'E' ) ); + lcl_WriteSimpleString( rStrm, OUString( 'E' ) ); WriteUnicodeOrByteEndl( rStrm ); return rStrm.GetError() == SVSTREAM_OK; } @@ -2271,7 +2271,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() bLoaded = aModule.load(sFilterLib); if (bLoaded) { - oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString( "ScFilterCreate" ) ); + oslGenericFunction fn = aModule.getFunctionSymbol( OUString( "ScFilterCreate" ) ); if (fn != NULL) plugin = reinterpret_cast<FilterFn>(fn)(); } @@ -2298,10 +2298,10 @@ static inline const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* pStr, return 0; } -rtl::OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, +OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, const String& rFieldSeparators, sal_Unicode cFieldQuote ) { - rtl::OUString aStr; + OUString aStr; rStream.ReadUniOrByteStringLine(aStr, rStream.GetStreamCharSet(), nArbitraryLineLengthLimit); if (bEmbeddedLineBreak) @@ -2399,9 +2399,9 @@ rtl::OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, else { nLastOffset = aStr.getLength(); - rtl::OUString aNext; + OUString aNext; rStream.ReadUniOrByteStringLine(aNext, rStream.GetStreamCharSet(), nArbitraryLineLengthLimit); - aStr += rtl::OUString( sal_Unicode(_LF)); + aStr += OUString( sal_Unicode(_LF)); aStr += aNext; } } diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 6eaa7d871fde..8c64ee7308a5 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; -using ::rtl::OUStringHash; using ::boost::unordered_map; using ::std::list; using ::std::for_each; @@ -120,9 +118,9 @@ public: virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException){} virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException) { - rtl::OUString sModuleName; + OUString sModuleName; Event.Accessor >>= sModuleName; - OSL_TRACE("VBAProjectListener::elementReplaced(%s)", rtl::OUStringToOString( sModuleName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("VBAProjectListener::elementReplaced(%s)", OUStringToOString( sModuleName, RTL_TEXTENCODING_UTF8 ).getStr() ); mpMacroMgr->InitUserFuncData(); mpMacroMgr->BroadcastModuleUpdate(sModuleName); } diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 39ade2a78f14..e0eb9db0897b 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -173,7 +173,7 @@ sal_Bool ScServerObject::GetData( if( aDdeTextFmt.EqualsAscii( "SYLK" ) || aDdeTextFmt.EqualsAscii( "FSYLK" ) ) { - rtl::OString aByteData; + OString aByteData; if( aObj.ExportByteString( aByteData, osl_getThreadTextEncoding(), SOT_FORMATSTR_ID_SYLK ) ) { rData <<= ::com::sun::star::uno::Sequence< sal_Int8 >( diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 8077cd34795a..14ab87801c8c 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -128,7 +128,7 @@ void ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl ) sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); if (pLinkManager!=NULL) { - rtl::OUString aFile, aFilter; + OUString aFile, aFilter; pLinkManager->GetDisplayNames(this, 0, &aFile, NULL, &aFilter); // the file dialog returns the filter name with the application prefix @@ -173,7 +173,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, if (!rNewFile.Len() || !rNewFilter.Len()) return false; - rtl::OUString aNewUrl = ScGlobal::GetAbsDocName(rNewFile, pImpl->m_pDocSh); + OUString aNewUrl = ScGlobal::GetAbsDocName(rNewFile, pImpl->m_pDocSh); bool bNewUrlName = !aFileName.equals(aNewUrl); const SfxFilter* pFilter = pImpl->m_pDocSh->GetFactory().GetFilterContainer()->GetFilter4FilterName(rNewFilter); @@ -187,7 +187,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen if (!aFilterName.equals(rNewFilter)) - aOptions = rtl::OUString(); + aOptions = OUString(); if ( pNewOptions ) // Optionen hart angegeben? aOptions = *pNewOptions; @@ -259,7 +259,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, if ( bNewUrlName && nMode == SC_LINK_VALUE ) { - rtl::OUString aName; + OUString aName; pDoc->GetName( nTab, aName ); if ( ScGlobal::GetpTransliteration()->isEqual( ScGlobal::GetDocTabName( aFileName, aTabName ), aName ) ) @@ -433,7 +433,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink ) // === ScDocumentLoader ================================================== -rtl::OUString ScDocumentLoader::GetOptions( SfxMedium& rMedium ) +OUString ScDocumentLoader::GetOptions( SfxMedium& rMedium ) { SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; @@ -510,9 +510,9 @@ bool ScDocumentLoader::GetFilterName( return bRet; } -void ScDocumentLoader::RemoveAppPrefix( rtl::OUString& rFilterName ) +void ScDocumentLoader::RemoveAppPrefix( OUString& rFilterName ) { - rtl::OUStringBuffer aAppPrefix; + OUStringBuffer aAppPrefix; aAppPrefix.appendAscii(STRING_SCAPP); aAppPrefix.appendAscii(": "); sal_Int32 nPreLen = aAppPrefix.getLength(); @@ -520,8 +520,8 @@ void ScDocumentLoader::RemoveAppPrefix( rtl::OUString& rFilterName ) rFilterName = rFilterName.copy(nPreLen); } -ScDocumentLoader::ScDocumentLoader( const rtl::OUString& rFileName, - rtl::OUString& rFilterName, rtl::OUString& rOptions, +ScDocumentLoader::ScDocumentLoader( const OUString& rFileName, + OUString& rFilterName, OUString& rOptions, sal_uInt32 nRekCnt, bool bWithInteraction ) : pDocShell(0), pMedium(0) @@ -560,7 +560,7 @@ ScDocumentLoader::ScDocumentLoader( const rtl::OUString& rFileName, pDocShell->DoLoad( pMedium ); - rtl::OUString aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt + OUString aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt if (!aNew.isEmpty() && aNew != rOptions) rOptions = aNew; } @@ -599,7 +599,7 @@ bool ScDocumentLoader::IsError() const return true; } -rtl::OUString ScDocumentLoader::GetTitle() const +OUString ScDocumentLoader::GetTitle() const { if ( pDocShell ) return pDocShell->GetTitle(); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index b748f81898ac..3e8605c70827 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -197,7 +197,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) case SID_DRAW_HLINK_DELETE: if ( pSingleSelectedObj ) - SetHlinkForObject( pSingleSelectedObj, rtl::OUString() ); + SetHlinkForObject( pSingleSelectedObj, OUString() ); break; case SID_OPEN_HYPERLINK: @@ -296,8 +296,8 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) if ( !pInfo->GetMacro().isEmpty() ) { SvxMacroTableDtor aTab; - rtl::OUString sMacro = pInfo->GetMacro(); - aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, SvxMacro(sMacro, rtl::OUString())); + OUString sMacro = pInfo->GetMacro(); + aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, SvxMacro(sMacro, OUString())); aItem.SetMacroTable( aTab ); } @@ -321,7 +321,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) const SfxPoolItem* pItem; if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, false, &pItem )) { - rtl::OUString sMacro; + OUString sMacro; const SvxMacro* pMacro = ((SvxMacroItem*)pItem)->GetMacroTable().Get( SFX_EVENT_MOUSECLICK_OBJECT ); if ( pMacro ) sMacro = pMacro->GetMacName(); @@ -444,7 +444,7 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 /* nTabPage * delete( pDlg ); } -void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk ) +void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ) { if ( pObj ) { diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 10edc8317745..b161aeafa9d4 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -63,7 +63,7 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId( HID_SCSHELL_DRAWSH ); - SetName(rtl::OUString("Drawing")); + SetName(OUString("Drawing")); } ScDrawShell::~ScDrawShell() diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 5d4029de27c6..1bbc09f25f64 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -92,10 +92,10 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType( "ButtonType" ); - rtl::OUString sPropTargetURL( "TargetURL" ); - rtl::OUString sPropTargetFrame( "TargetFrame" ); - rtl::OUString sPropLabel( "Label" ); + OUString sPropButtonType( "ButtonType" ); + OUString sPropTargetURL( "TargetURL" ); + OUString sPropTargetFrame( "TargetFrame" ); + OUString sPropLabel( "Label" ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -103,7 +103,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink form::FormButtonType eTmp; if ( (aAny >>= eTmp) && eTmp == form::FormButtonType_URL ) { - rtl::OUString sTmp; + OUString sTmp; // Label if(xInfo->hasPropertyByName( sPropLabel )) { @@ -179,31 +179,31 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropTargetURL( "TargetURL" ); + OUString sPropTargetURL( "TargetURL" ); // Darf man eine URL an dem Objekt setzen? if (xInfo->hasPropertyByName( sPropTargetURL )) { // Ja! - rtl::OUString sPropButtonType( "ButtonType"); - rtl::OUString sPropTargetFrame( "TargetFrame" ); - rtl::OUString sPropLabel( "Label" ); + OUString sPropButtonType( "ButtonType"); + OUString sPropTargetFrame( "TargetFrame" ); + OUString sPropLabel( "Label" ); uno::Any aAny; if ( xInfo->hasPropertyByName( sPropLabel ) ) { - aAny <<= rtl::OUString(rName); + aAny <<= OUString(rName); xPropSet->setPropertyValue( sPropLabel, aAny ); } - ::rtl::OUString aTmp = INetURLObject::GetAbsURL( pViewData->GetDocShell()->GetMedium()->GetBaseURL(), rURL ); + OUString aTmp = INetURLObject::GetAbsURL( pViewData->GetDocShell()->GetMedium()->GetBaseURL(), rURL ); aAny <<= aTmp; xPropSet->setPropertyValue( sPropTargetURL, aAny ); if( rTarget.Len() && xInfo->hasPropertyByName( sPropTargetFrame ) ) { - aAny <<= rtl::OUString(rTarget); + aAny <<= OUString(rTarget); xPropSet->setPropertyValue( sPropTargetFrame, aAny ); } @@ -486,7 +486,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) if(SC_LAYER_INTERN != pSelected->GetLayer()) { - rtl::OUString aName = pSelected->GetName(); + OUString aName = pSelected->GetName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 08542bead9d4..6355ef5e8d9d 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -53,7 +53,7 @@ ScDrawFormShell::ScDrawFormShell(ScViewData* pData) : ScDrawShell(pData) { SetHelpId(HID_SCSHELL_DRAWFORMSH); - SetName(rtl::OUString("DrawForm")); + SetName(OUString("DrawForm")); } ScDrawFormShell::~ScDrawFormShell() diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 944f853862c8..ed3b2c1295e7 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -120,7 +120,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) : } SetHelpId( HID_SCSHELL_DRTXTOB ); - SetName(rtl::OUString("DrawText")); + SetName(OUString("DrawText")); } ScDrawTextObjectBar::~ScDrawTextObjectBar() diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index fa4988c452ee..ef7df53356fc 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -214,7 +214,7 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj ) if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { sal_uInt16 i; diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index a0cb995bbc8c..b30af3caf23e 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -151,7 +151,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic, //------------------------------------------------------------------------ -static void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, +static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, const Size& rPrefSize, bool const bLink ) { @@ -176,7 +176,7 @@ static void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, if( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) ) aInsertPos.X() -= aSize.Width(); - ::rtl::OUString realURL; + OUString realURL; if (bLink) { realURL = rMediaURL; @@ -314,7 +314,7 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { - ::rtl::OUString aURL; + OUString aURL; const SfxItemSet* pReqArgs = rReq.GetArgs(); bool bAPI = false; diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index c9cd38ea34b0..5b47107a1f94 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -86,12 +86,12 @@ extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht namespace { void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScViewData* pViewData, - const rtl::OUString& rRangeParam ) + const OUString& rRangeParam ) { ScDocShell* pDocShell = pViewData->GetDocShell(); ScDocument* pScDoc = pDocShell->GetDocument(); - rtl::OUString aRangeString( rRangeParam ); + OUString aRangeString( rRangeParam ); if ( aRangeString.isEmpty() ) { SCCOL nCol1 = 0; @@ -176,16 +176,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString("CellRangeRepresentation"), -1, + OUString("CellRangeRepresentation"), -1, uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString("HasCategories"), -1, + OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString("FirstCellAsLabel"), -1, + OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString("DataRowSource"), -1, + OUString("DataRowSource"), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); @@ -208,10 +208,10 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); sal_Bool bIsFromFile = false; - ::rtl::OUString aName; + OUString aName; sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - ::rtl::OUString aIconMediaType; + OUString aIconMediaType; uno::Reference< io::XInputStream > xIconMetaFile; @@ -280,7 +280,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie if ( aURL.SetURL( aPluginFileDialog.GetPath() ) ) { // create a plugin object - ::rtl::OUString aObjName; + OUString aObjName; SvGlobalName aClassId( SO3_PLUGIN_CLASSID ); comphelper::EmbeddedObjectContainer aCnt( xStorage ); xObj = aCnt.CreateEmbeddedObject( aClassId.GetByteSequence(), aObjName ); @@ -290,8 +290,8 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString("PluginURL"), - uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + xSet->setPropertyValue( OUString("PluginURL"), + uno::makeAny( OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } } @@ -359,7 +359,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie // Chart initialisieren ? if ( SvtModuleOptions().IsChart() && SotExchange::IsChart( SvGlobalName( xObj->getClassID() ) ) ) - lcl_ChartInit( xObj, pViewSh->GetViewData(), rtl::OUString() ); + lcl_ChartInit( xObj, pViewSh->GetViewData(), OUString() ); ScViewData* pData = pViewSh->GetViewData(); @@ -451,13 +451,13 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* // BM/IHA -- // get range - ::rtl::OUString aRangeString; + OUString aRangeString; ScRange aPositionRange; // cell range for chart positioning if( pReqArgs ) { const SfxPoolItem* pItem; if( pReqArgs->HasItem( FN_PARAM_5, &pItem ) ) - aRangeString = ::rtl::OUString( ((const SfxStringItem*)pItem)->GetValue()); + aRangeString = OUString( ((const SfxStringItem*)pItem)->GetValue()); aPositionRange = pViewSh->GetViewData()->GetCurPos(); } @@ -499,7 +499,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* // adapted old code pView->UnmarkAll(); - ::rtl::OUString aName; + OUString aName; const sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; uno::Reference < embed::XEmbeddedObject > xObj = @@ -582,7 +582,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* if ( nToTable == pScDoc->GetTableCount() ) { // dann los... - rtl::OUString aTabName; + OUString aTabName; SCTAB nNewTab = pScDoc->GetTableCount(); pScDoc->CreateValidTabName( aTabName ); @@ -667,7 +667,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString("com.sun.star.comp.chart2.WizardDialog") + OUString("com.sun.star.comp.chart2.WizardDialog") , xContext), uno::UNO_QUERY); uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY ); if( xChartModel.is() && xInit.is() ) @@ -677,10 +677,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* uno::Sequence<uno::Any> aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; - aParam1.Name = rtl::OUString("ParentWindow"); + aParam1.Name = OUString("ParentWindow"); aParam1.Value <<= uno::makeAny(xDialogParentWindow); beans::PropertyValue aParam2; - aParam2.Name = rtl::OUString("ChartModel"); + aParam2.Name = OUString("ChartModel"); aParam2.Value <<= uno::makeAny(xChartModel); pArray[0] <<= uno::makeAny(aParam1); pArray[1] <<= uno::makeAny(aParam2); @@ -694,7 +694,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //get dialog size: awt::Size aDialogAWTSize; - if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") ) + if( xDialogProps->getPropertyValue( OUString("Size") ) >>= aDialogAWTSize ) { Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height ); @@ -702,12 +702,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //calculate and set new position Point aDialogPos = pViewShell->GetChartDialogPos( aDialogSize, aRect ); - xDialogProps->setPropertyValue( ::rtl::OUString("Position"), + xDialogProps->setPropertyValue( OUString("Position"), uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) ); } } //tell the dialog to unlock controller - xDialogProps->setPropertyValue( ::rtl::OUString("UnlockControllersOnExecute"), + xDialogProps->setPropertyValue( OUString("UnlockControllersOnExecute"), uno::makeAny( sal_True ) ); } diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index d07cefa60b47..ece660700fa3 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -211,7 +211,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { try { - aCaller = xProps->getPropertyValue( rtl::OUString("Name") ); + aCaller = xProps->getPropertyValue( OUString("Name") ); } catch( uno::Exception& ) {} } @@ -398,7 +398,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) ScDocument* pDocument = ( pViewData ? pViewData->GetDocument() : NULL ); SdrPageView* pPageView = ( pView ? pView->GetSdrPageView() : NULL ); SdrPage* pPage = ( pPageView ? pPageView->GetPage() : NULL ); - ::std::vector< ::rtl::OUString > aExcludedChartNames; + ::std::vector< OUString > aExcludedChartNames; ScRangeListVector aProtectedChartRangesVector; if ( rMEvt.IsLeft() ) diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 5364d5cd1cfe..45666e6f6999 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -78,7 +78,7 @@ ScGraphicShell::ScGraphicShell(ScViewData* pData) : ScDrawShell(pData) { SetHelpId(HID_SCSHELL_GRAPHIC); - SetName(rtl::OUString("GraphicObject")); + SetName(OUString("GraphicObject")); } ScGraphicShell::~ScGraphicShell() diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index fdf06d9ea9bb..6cb1db567ce5 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -53,7 +53,7 @@ ScOleObjectShell::ScOleObjectShell(ScViewData* pData) : ScDrawShell(pData) { SetHelpId(HID_SCSHELL_OLEOBEJCTSH); - SetName(rtl::OUString("OleObject")); + SetName(OUString("OleObject")); } ScOleObjectShell::~ScOleObjectShell() diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 423b78d45397..58ac2464246d 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -138,7 +138,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, StartListening( *pBindingsP, sal_True ); Point aTopLeft=aCatBox.GetPosPixel(); - rtl::OUString aString("ww"); + OUString aString("ww"); Size aTxtSize( aFiFuncDesc.GetTextWidth(aString), aFiFuncDesc.GetTextHeight() ); nMinWidth=aTxtSize.Width()+aTopLeft.X() +2*aFuncList.GetPosPixel().X(); @@ -325,7 +325,7 @@ void ScFunctionDockWin::SetLeftRightSize() aDiffSize.Width()-=aNewSize.Width(); aDiffSize.Height()-=aNewSize.Height(); - rtl::OUString aString("ww"); + OUString aString("ww"); Size aTxtSize( aFuncList.GetTextWidth(aString), aFuncList.GetTextHeight() ); Range aYRange(3*aTxtSize.Height()+aFuncList.GetPosPixel().Y(), @@ -560,7 +560,7 @@ void ScFunctionDockWin::SetDescription() { pDesc->initArgumentInfo(); // full argument info is needed - ::rtl::OUStringBuffer aBuf(pAllFuncList->GetSelectEntry()); + OUStringBuffer aBuf(pAllFuncList->GetSelectEntry()); if(nDockMode==0) { aBuf.appendAscii(":\n\n"); @@ -658,7 +658,7 @@ sal_Bool ScFunctionDockWin::Close() SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */, SfxChildAlignment aChildAlign) { - String aString = rtl::OUString("ww"); + String aString = OUString("ww"); Size aTxtSize( aFiFuncDesc.GetTextWidth(aString), aFiFuncDesc.GetTextHeight() ); if(!bInit) { @@ -868,7 +868,7 @@ void ScFunctionDockWin::DoEnter(sal_Bool /* bOk */) //@@ ??? aArgStr = aFirstArgStr; if ( nArgs != VAR_ARGS && nArgs != PAIRED_VAR_ARGS ) { // no VarArgs or Fix plus VarArgs, but not VarArgs only - rtl::OUString aArgSep("; "); + OUString aArgSep("; "); sal_uInt16 nFix; if (nArgs >= PAIRED_VAR_ARGS) nFix = nArgs - PAIRED_VAR_ARGS + 2; @@ -1057,7 +1057,7 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo) if ( pInfo->aExtraString.Len() ) { xub_StrLen nPos = pInfo->aExtraString.Search( - rtl::OUString("ScFuncList:")); + OUString("ScFuncList:")); // Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn // er nicht vorhanden ist, liegt eine "altere Version vor diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 4f359f625dd0..55897bfbfd77 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -100,7 +100,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pDoc = pViewData->GetDocument(); m_xParser.set(ScServiceProvider::MakeInstance(SC_SERVICE_FORMULAPARS,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); uno::Reference< beans::XPropertySet> xSet(m_xParser,uno::UNO_QUERY); - xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COMPILEFAP)),uno::makeAny(sal_True)); + xSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COMPILEFAP)),uno::makeAny(sal_True)); m_xOpCodeMapper.set(ScServiceProvider::MakeInstance(SC_SERVICE_OPCODEMAPPER,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); @@ -168,7 +168,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, if ( !bEdit ) { - rtl::OUString aNewFormula('='); + OUString aNewFormula('='); if ( aFormula.Len() > 0 && aFormula.GetChar(0) == '=' ) aNewFormula = aFormula; @@ -329,7 +329,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult ) if ( pCell->GetCode()->GetCodeLen() <= 1 ) { // ==1: einzelner ist als Parameter immer Bereich // ==0: es waere vielleicht einer, wenn.. - rtl::OUStringBuffer aBraced; + OUStringBuffer aBraced; aBraced.append('('); aBraced.append(rStrExp); aBraced.append(')'); @@ -447,7 +447,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc ) aArray.AddDoubleReference(aRefData); ScCompiler aComp(pDoc, aCursorPos, aArray); aComp.SetGrammar(pDoc->GetGrammar()); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aComp.CreateStringFromTokenArray(aBuf); aRefStr = aBuf.makeStringAndClear(); } diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index d5d5eb07de09..5fd9025ea321 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -120,13 +120,13 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index c55a4fa4bc75..a303c9c64cc5 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -76,12 +76,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -108,7 +108,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 824c05700d26..b90d1c47819d 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -166,12 +166,12 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -228,20 +228,20 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService(const ::rtl::OUString& sServiceName) + supportsService(const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); @@ -260,12 +260,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -299,9 +299,9 @@ protected: throw (::com::sun::star::lang::DisposedException); /// Use this method to set initial Name without notification - void SetName(const rtl::OUString& rName) { msName = rName; } + void SetName(const OUString& rName) { msName = rName; } /// Use this method to set initial Description without notification - void SetDescription(const rtl::OUString& rDesc) { msDescription = rDesc; } + void SetDescription(const OUString& rDesc) { msDescription = rDesc; } /// Reference to the parent object. ::com::sun::star::uno::Reference< @@ -312,12 +312,12 @@ private: be set from the outside. Furthermore, it changes according the the draw page's display mode. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. It changes according the draw page's display mode. */ - ::rtl::OUString msName; + OUString msName; /// client id in the AccessibleEventNotifier queue sal_uInt32 mnClientId; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 3d603223eabd..bf2926eb4946 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -143,7 +143,7 @@ protected: ::com::sun::star::beans::PropertyValue > PropertyValueSeq; private: - ::rtl::OUStringBuffer maBuffer; /// Contains the text representation of the ruler. + OUStringBuffer maBuffer; /// Contains the text representation of the ruler. public: explicit ScAccessibleCsvRuler( ScCsvRuler& rRuler ); @@ -189,7 +189,7 @@ public: throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the attributes of the specified character. */ - virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) + virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the screen coordinates of the specified character. */ @@ -204,7 +204,7 @@ public: throw( ::com::sun::star::uno::RuntimeException ); /** Returns the selected text (ruler returns empty string). */ - virtual ::rtl::OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the start index of the selection (ruler returns -1). */ virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException ); @@ -217,10 +217,10 @@ public: throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the entire text. */ - virtual ::rtl::OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the specified range [Start,End) of the text. */ - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the specified text portion. */ @@ -244,7 +244,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider ---------------------------------------------------------- @@ -265,10 +265,10 @@ public: // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Throws an exception, if the specified character position is invalid (outside 0..len-1). */ @@ -361,11 +361,11 @@ public: throw( ::com::sun::star::uno::RuntimeException ); /** Returns the description of the specified row in the table. */ - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the description text of the specified column in the table. */ - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the number of rows occupied at a specified row and column. @@ -472,7 +472,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider ---------------------------------------------------------- @@ -499,10 +499,10 @@ public: // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Throws an exception, if nIndex is not a valid child index. */ @@ -615,7 +615,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // helpers ---------------------------------------------------------------- @@ -627,10 +627,10 @@ protected: private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the VCL grid control. Assumes a living object. */ diff --git a/sc/source/ui/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxx index 9302fc4ad41b..9e4db70b2cc1 100644 --- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx +++ b/sc/source/ui/inc/AccessibleDataPilotControl.hxx @@ -92,7 +92,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); @@ -106,12 +106,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index da9833e20663..b0fba0aafaf4 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -163,13 +163,13 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); @@ -261,12 +261,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -306,8 +306,8 @@ private: void AddChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, sal_Bool bFireEvent); void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, sal_Bool bFireEvent); - rtl::OUString GetCurrentCellName() const; - rtl::OUString GetCurrentCellDescription() const; + OUString GetCurrentCellName() const; + OUString GetCurrentCellDescription() const; Rectangle GetVisibleArea_Impl() const; }; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index e68e340d24e1..1de55098655e 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -85,13 +85,13 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); @@ -107,12 +107,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 4071d09fc5a0..4053bb8a8a66 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -48,8 +48,8 @@ public: ScAccessibleEditObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const rtl::OUString& rName, - const rtl::OUString& rDescription, EditObjectType eObjectType); + EditView* pEditView, Window* pWin, const OUString& rName, + const OUString& rDescription, EditObjectType eObjectType); protected: virtual ~ScAccessibleEditObject(); @@ -105,12 +105,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -137,7 +137,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index b74770e6b0bd..1bf13a547dec 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -69,17 +69,17 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() 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); //===== internal ======================================================== void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index dc8a639784bc..6031c7d973c2 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -87,14 +87,14 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); @@ -107,8 +107,8 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index cdb7507bab57..b5f0394fa76a 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -73,9 +73,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() 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/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 098e08c37839..5ba5d7cd6a50 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -99,9 +99,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() 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 =================================================== @@ -117,8 +117,8 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 2a0fff825242..795badc2a9bb 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -67,10 +67,10 @@ public: virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) @@ -134,9 +134,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() 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 =================================================== @@ -152,8 +152,8 @@ public: void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 38b0addb1fa3..132f7e0eb090 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -204,13 +204,13 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 87e88c39a133..cb4fc71860ad 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -78,13 +78,13 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Returns the description of the specified row in the table. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); /// Returns the description text of the specified column in the table. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); @@ -196,12 +196,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -258,7 +258,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index c2242c7f397e..80eb17fe94c0 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -55,12 +55,12 @@ protected: virtual void SAL_CALL disposing(); // ____ 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 ) + 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/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 03d26b34c3b6..fd84d86969f0 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -109,23 +109,23 @@ private: SvxRedlinTable* pTheView; // #i48648 now SvHeaderTabListBox ScRangeList aRangeList; ScChangeViewSettings aChangeViewSet; - rtl::OUString aStrInsertCols; - rtl::OUString aStrInsertRows; - rtl::OUString aStrInsertTabs; - rtl::OUString aStrDeleteCols; - rtl::OUString aStrDeleteRows; - rtl::OUString aStrDeleteTabs; - rtl::OUString aStrMove; - rtl::OUString aStrContent; - rtl::OUString aStrReject; - rtl::OUString aStrAllAccepted; - rtl::OUString aStrAllRejected; - rtl::OUString aStrNoEntry; - rtl::OUString aStrContentWithChild; - rtl::OUString aStrChildContent; - rtl::OUString aStrChildOrgContent; - rtl::OUString aStrEmpty; - rtl::OUString aUnknown; + OUString aStrInsertCols; + OUString aStrInsertRows; + OUString aStrInsertTabs; + OUString aStrDeleteCols; + OUString aStrDeleteRows; + OUString aStrDeleteTabs; + OUString aStrMove; + OUString aStrContent; + OUString aStrReject; + OUString aStrAllAccepted; + OUString aStrAllRejected; + OUString aStrNoEntry; + OUString aStrContentWithChild; + OUString aStrChildContent; + OUString aStrChildOrgContent; + OUString aStrEmpty; + OUString aUnknown; sal_uLong nAcceptCount; sal_uLong nRejectCount; bool bAcceptEnableFlag:1; @@ -165,7 +165,7 @@ protected: bool IsValidAction(const ScChangeAction* pScChangeAction); - rtl::OUString* MakeTypeString(ScChangeActionType eType); + OUString* MakeTypeString(ScChangeActionType eType); SvTreeListEntry* InsertChangeAction( const ScChangeAction* pScChangeAction,ScChangeActionState eState, diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index 588093def54f..8d7ff13ca818 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -31,10 +31,10 @@ class ScAreaLink; class ScAreaLinkSaver { private: - ::rtl::OUString aFileName; - ::rtl::OUString aFilterName; - ::rtl::OUString aOptions; - ::rtl::OUString aSourceArea; + OUString aFileName; + OUString aFilterName; + OUString aOptions; + OUString aSourceArea; ScRange aDestArea; sal_uLong nRefresh; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 52066c3c0262..b13ef5ccd5c7 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -75,10 +75,10 @@ public: virtual void Paint(const Rectangle& rRect); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - void addMenuItem(const ::rtl::OUString& rText, bool bEnabled, Action* pAction); + void addMenuItem(const OUString& rText, bool bEnabled, Action* pAction); void addSeparator(); - ScMenuFloatingWindow* addSubMenuItem(const ::rtl::OUString& rText, bool bEnabled); + ScMenuFloatingWindow* addSubMenuItem(const OUString& rText, bool bEnabled); void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, bool bEnsureSubMenu); void selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer); void clearSelectedMenuItem(); @@ -86,8 +86,8 @@ public: bool isMenuItemSelected(size_t nPos) const; size_t getSelectedMenuItem() const; - void setName(const ::rtl::OUString& rName); - const ::rtl::OUString& getName() const; + void setName(const OUString& rName); + const OUString& getName() const; void executeMenuItem(size_t nPos); void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const; @@ -161,7 +161,7 @@ private: struct MenuItemData { - ::rtl::OUString maText; + OUString maText; bool mbEnabled:1; bool mbSeparator:1; @@ -195,7 +195,7 @@ private: // Name of this menu window, taken from the menu item of the parent window // that launches it (if this is a sub menu). If this is a top-level menu // window, then this name can be anything. - ::rtl::OUString maName; + OUString maName; size_t mnSelectedMenu; size_t mnClickedMenu; @@ -212,7 +212,7 @@ private: class ScCheckListMenuWindow : public ScMenuFloatingWindow { public: - typedef boost::unordered_map<rtl::OUString, bool, rtl::OUStringHash> ResultType; + typedef boost::unordered_map<OUString, bool, OUStringHash> ResultType; /** * Extended data that the client code may need to store. Create a @@ -244,7 +244,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); void setMemberSize(size_t n); - void addMember(const ::rtl::OUString& rName, bool bVisible); + void addMember(const OUString& rName, bool bVisible); void initMembers(); void setConfig(const Config& rConfig); @@ -274,7 +274,7 @@ protected: private: struct Member { - ::rtl::OUString maName; + OUString maName; bool mbVisible; Member(); diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 13bb74bcf978..8b067f5e25bf 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -63,7 +63,7 @@ private: Edit maEdMin; Edit maEdMax; - rtl::OUString maStrWarnSameValue; + OUString maStrWarnSameValue; SvNumberFormatter* mpNumberFormatter; ScDocument* mpDoc; diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index bd8b0e6d64db..7727d28be926 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -44,7 +44,7 @@ private: FixedText maFtCondition; sal_Int32 mnIndex; - rtl::OUString maStrCondition; + OUString maStrCondition; protected: ListBox maLbType; @@ -56,7 +56,7 @@ protected: void Select(); void Deselect(); - virtual rtl::OUString GetExpressionString() = 0; + virtual OUString GetExpressionString() = 0; public: ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); @@ -88,7 +88,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createConditionEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( StyleSelectHdl, void* ); DECL_LINK( ConditionTypeSelectHdl, void* ); @@ -111,7 +111,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry formula::RefEdit maEdFormula; ScFormatEntry* createFormulaEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( StyleSelectHdl, void* ); @@ -143,7 +143,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); @@ -176,7 +176,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); @@ -205,7 +205,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createDatabarEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( OptionBtnHdl, void* ); @@ -229,7 +229,7 @@ public: virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::DATE; } protected: - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); private: void Init(); @@ -253,7 +253,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry typedef boost::ptr_vector<ScIconSetFrmtDataEntry> ScIconSetFrmtDataEntriesType; ScIconSetFrmtDataEntriesType maEntries; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); diff --git a/sc/source/ui/inc/condformathelper.hxx b/sc/source/ui/inc/condformathelper.hxx index 02d24e653dd8..b64e45825386 100644 --- a/sc/source/ui/inc/condformathelper.hxx +++ b/sc/source/ui/inc/condformathelper.hxx @@ -26,10 +26,10 @@ enum ScCondFormatEntryType class ScCondFormatHelper { public: - static SC_DLLPUBLIC rtl::OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); + static SC_DLLPUBLIC OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); - static SC_DLLPUBLIC rtl::OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, - rtl::OUString aStr1 = rtl::OUString(), rtl::OUString aStr2 = rtl::OUString() ); + static SC_DLLPUBLIC OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, + OUString aStr1 = OUString(), OUString aStr2 = OUString() ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 52bad85fb1d9..717fd429bb48 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -268,10 +268,10 @@ private: public: /** Fills all cells of a line with the passed text (separators mode). */ void ImplSetTextLineSep( - sal_Int32 nLine, const rtl::OUString& rTextLine, + sal_Int32 nLine, const OUString& rTextLine, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ); /** Fills all cells of a line with the passed text (fixed width mode). */ - void ImplSetTextLineFix( sal_Int32 nLine, const rtl::OUString& rTextLine ); + void ImplSetTextLineFix( sal_Int32 nLine, const OUString& rTextLine ); /** Returns the text of the specified cell. */ const String& GetCellText( sal_uInt32 nColIndex, sal_Int32 nLine ) const; diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 4faff8809d79..3caa4bf73b94 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -99,7 +99,7 @@ private: public: /** Fills all cells of all lines with the passed texts (Unicode strings). */ void SetUniStrings( - const rtl::OUString* pTextLines, const String& rSepChars, + const OUString* pTextLines, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ); // column settings -------------------------------------------------------- diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 835a0cd31077..c74ae8a6ef2d 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -49,8 +49,8 @@ public: bool IsDatabase() const; bool IsExternal() const; bool IsNamedRange() const; - rtl::OUString GetSelectedNamedRange() const; - void AppendNamedRange(const rtl::OUString& rNames); + OUString GetSelectedNamedRange() const; + void AppendNamedRange(const OUString& rNames); private: DECL_LINK( RadioClickHdl, RadioButton * ); @@ -77,7 +77,7 @@ private: public: ScDataPilotServiceDlg( Window* pParent, - const com::sun::star::uno::Sequence<rtl::OUString>& rServices ); + const com::sun::star::uno::Sequence<OUString>& rServices ); ~ScDataPilotServiceDlg(); String GetServiceName() const; diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index ebd97473c75f..10a38dfb0e15 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -82,12 +82,12 @@ public: const ScSortParam* pForceNewSort, sal_Bool bRecord, sal_Bool bApi ); - bool AddDBRange( const ::rtl::OUString& rName, const ScRange& rRange, sal_Bool bApi ); - bool DeleteDBRange( const ::rtl::OUString& rName ); + bool AddDBRange( const OUString& rName, const ScRange& rRange, sal_Bool bApi ); + bool DeleteDBRange( const OUString& rName ); bool RenameDBRange( const String& rOld, const String& rNew ); bool ModifyDBData( const ScDBData& rNewData ); // Name unveraendert - bool RepeatDB( const ::rtl::OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed=false, SCTAB aTab = 0); + bool RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed=false, SCTAB aTab = 0); bool DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj, bool bRecord, bool bApi, bool bAllowMove = false ); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 2e673e3085f8..0720ce5bd835 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -66,7 +66,7 @@ public: sal_Bool ImportData( const ScImportParam& rParam, sal_Bool bRecord = sal_True ); - void GotoDBArea( const ::rtl::OUString& rDBName ); + void GotoDBArea( const OUString& rDBName ); // DB range from Cursor ScDBData* GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP); @@ -88,13 +88,13 @@ public: void DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nParts ); void NumGroupDataPilot( const ScDPNumGroupInfo& rInfo ); void UngroupDataPilot(); - void DataPilotInput( const ScAddress& rPos, const rtl::OUString& rString ); + void DataPilotInput( const ScAddress& rPos, const OUString& rString ); bool DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId = NULL ); sal_Bool DataPilotMove( const ScRange& rSource, const ScAddress& rDest ); bool HasSelectionForDrillDown( sal_uInt16& rOrientation ); - void SetDataPilotDetails(bool bShow, const rtl::OUString* pNewDimensionName = NULL); + void SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName = NULL); void ShowDataPilotSourceData( ScDPObject& rDPObj, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters ); diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index e0dd46f74021..1a03612440c2 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -192,7 +192,7 @@ public: * passed as arguments (it creates copies); the caller is responsible for * destroying them. */ - virtual void ModifyAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap ); + virtual void ModifyAllRangeNames( const boost::ptr_map<OUString, ScRangeName>& rRangeMap ); virtual sal_Bool CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi, SCTAB nTab = -1 ); // -1 for global range names virtual sal_Bool InsertNameList( const ScAddress& rStartPos, sal_Bool bApi ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index a18f127ef0dd..a26a234f3a83 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -144,7 +144,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener SC_DLLPRIVATE sal_uLong DBaseImport( const String& rFullFileName, CharSet eCharSet, ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc ); SC_DLLPRIVATE sal_uLong DBaseExport( - const rtl::OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ); + const OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ); SC_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); SC_DLLPRIVATE static bool KillFile( const INetURLObject& rURL ); @@ -201,7 +201,7 @@ public: virtual sal_Bool Load( SfxMedium& rMedium ); virtual sal_Bool LoadFrom( SfxMedium& rMedium ); virtual sal_Bool ConvertFrom( SfxMedium &rMedium ); - virtual bool LoadExternal(SfxMedium& rMedium, const rtl::OUString& rProvider); + virtual bool LoadExternal(SfxMedium& rMedium, const OUString& rProvider); virtual sal_Bool Save(); virtual sal_Bool SaveAs( SfxMedium& rMedium ); virtual sal_Bool ConvertTo( SfxMedium &rMedium ); @@ -278,7 +278,7 @@ public: void LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellStyles, bool bPageStyles ); - void PageStyleModified( const rtl::OUString& rStyleName, sal_Bool bApi ); + void PageStyleModified( const OUString& rStyleName, sal_Bool bApi ); void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const String& rStyle ); diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx index e571adb31e06..970626a93fcd 100644 --- a/sc/source/ui/inc/dpcontrol.hxx +++ b/sc/source/ui/inc/dpcontrol.hxx @@ -44,7 +44,7 @@ public: ScDocument* pDoc = NULL); ~ScDPFieldButton(); - void setText(const ::rtl::OUString& rText); + void setText(const OUString& rText); void setBoundingBox(const Point& rPos, const Size& rSize, bool bLayoutRTL); void setDrawBaseButton(bool b); void setDrawPopupButton(bool b); @@ -61,7 +61,7 @@ private: private: Point maPos; Size maSize; - ::rtl::OUString maText; + OUString maText; Fraction maZoomX; Fraction maZoomY; ScDocument* mpDoc; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 5ca2fdeb6912..307bcac4abbb 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -36,7 +36,7 @@ class ScDrawShell : public SfxShell DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); - void SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk ); + void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); protected: ScViewData* GetViewData() { return pViewData; } diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index d613c849cc36..f52af12dc471 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -55,13 +55,13 @@ class ScDPFieldControlBase : public Control protected: struct FieldName { - rtl::OUString maText; + OUString maText; bool mbFits; sal_uInt8 mnDupCount; - FieldName(const rtl::OUString& rText, bool bFits, sal_uInt8 nDupCount = 0); + FieldName(const OUString& rText, bool bFits, sal_uInt8 nDupCount = 0); FieldName(const FieldName& r); - rtl::OUString getDisplayedText() const; + OUString getDisplayedText() const; }; typedef ::std::vector<FieldName> FieldNames; @@ -113,20 +113,20 @@ public: virtual void HandleWheelScroll(long nNotch) = 0; /** @return The name of the control without shortcut. */ - ::rtl::OUString GetName() const; - void SetName(const ::rtl::OUString& rName); + OUString GetName() const; + void SetName(const OUString& rName); /** @return TRUE, if the field with the given index exists. */ bool IsExistingIndex( size_t nIndex ) const; - void AppendField( const rtl::OUString& rText, const ScPivotFuncData& rFunc ); + void AppendField( const OUString& rText, const ScPivotFuncData& rFunc ); /** * Inserts a field using the specified pixel position. * * @param rPos The coordinates to insert the field. */ - size_t AddField(const rtl::OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc); + size_t AddField(const OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc); bool MoveField(size_t nCurPos, const Point& rPos, size_t& rnIndex); @@ -141,9 +141,9 @@ public: /** Removes all fields. */ void ClearFields(); /** Changes the text on an existing field. */ - void SetFieldText(const rtl::OUString& rText, size_t nIndex, sal_uInt8 nDupCount); + void SetFieldText(const OUString& rText, size_t nIndex, sal_uInt8 nDupCount); /** Returns the text of an existing field. */ - rtl::OUString GetFieldText( size_t nIndex ) const; + OUString GetFieldText( size_t nIndex ) const; /** Calculates a field index at a specific pixel position. Returns in every case the index of an existing field. @@ -233,7 +233,7 @@ private: /** Selects a field at a new position relative to the current. */ void MoveSelection( SCsCOL nDX, SCsROW nDY ); - sal_uInt8 GetNextDupCount(const rtl::OUString& rFieldText) const; + sal_uInt8 GetNextDupCount(const OUString& rFieldText) const; private: typedef ::std::vector<Window*> Paintables; @@ -243,7 +243,7 @@ private: FieldNames maFieldNames; /// String array of the field names and flags, if text fits into button. ScPivotLayoutDlg* mpDlg; FixedText* mpCaption; /// FixedText containing the name of the control. - ::rtl::OUString maName; + OUString maName; size_t mnFieldSelected; /// Currently selected field. diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 53f1939c1561..9329c7e35780 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -41,7 +41,7 @@ public: FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - const rtl::OUString& aStartStr, + const OUString& aStartStr, double fStep, double fMax, sal_uInt16 nPossDir ); @@ -54,14 +54,14 @@ public: double GetStep() const { return fIncrement; } double GetMax() const { return fEndVal; } - rtl::OUString GetStartStr() const { return aEdStartVal.GetText(); } + OUString GetStartStr() const { return aEdStartVal.GetText(); } void SetEdStartValEnabled(bool bFlag = false); private: FixedText aFtStartVal; Edit aEdStartVal; - const rtl::OUString aStartStrVal; + const OUString aStartStrVal; FixedText aFtEndVal; Edit aEdEndVal; @@ -92,7 +92,7 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - const rtl::OUString aErrMsgInvalidVal; + const OUString aErrMsgInvalidVal; //---------------------------------------------------------- diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index e02db7066da7..698d5176a5ca 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -116,13 +116,13 @@ private: CheckBox aBtnDestPers; FixedText aFtDbAreaLabel; FixedInfo aFtDbArea; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNone; + const OUString aStrUndefined; + const OUString aStrNone; - const rtl::OUString aStrEmpty; - const rtl::OUString aStrNotEmpty; - const rtl::OUString aStrRow; - const rtl::OUString aStrColumn; + const OUString aStrEmpty; + const OUString aStrNotEmpty; + const OUString aStrRow; + const OUString aStrColumn; ScFilterOptionsMgr* pOptionsMgr; @@ -204,8 +204,8 @@ private: CheckBox aBtnDestPers; FixedText aFtDbAreaLabel; FixedInfo aFtDbArea; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNoName; + const OUString aStrUndefined; + const OUString aStrNoName; OKButton aBtnOk; CancelButton aBtnCancel; diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 57c22a7ba4ef..1a06c4f64801 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -24,7 +24,7 @@ class FuConstCustomShape : public FuConstruct { - rtl::OUString aCustomShape; + OUString aCustomShape; void SetAttributes( SdrObject* pObj ); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 8c7e36b26dbe..2691b118bbf7 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -129,9 +129,9 @@ public: void SetStreamPath( const String& rPath ) { aStreamPath = rPath; } const String& GetStreamPath() const { return aStreamPath; } - bool ImportString( const ::rtl::OUString&, sal_uLong=FORMAT_STRING ); - bool ExportString( ::rtl::OUString&, sal_uLong=FORMAT_STRING ); - bool ExportByteString( ::rtl::OString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING ); + bool ImportString( const OUString&, sal_uLong=FORMAT_STRING ); + bool ExportString( OUString&, sal_uLong=FORMAT_STRING ); + bool ExportByteString( OString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING ); bool ImportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING ); bool ExportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING ); @@ -179,7 +179,7 @@ inline void ScImportExport::SetNoEndianSwap( SvStream& rStrm ) class ScImportStringStream : public SvMemoryStream { public: - ScImportStringStream( const ::rtl::OUString rStr ) + ScImportStringStream( const OUString rStr ) : SvMemoryStream( (void*)rStr.getStr(), rStr.getLength() * sizeof(sal_Unicode), STREAM_READ) { @@ -233,7 +233,7 @@ public: may start under false preconditions. */ -SC_DLLPUBLIC rtl::OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, +SC_DLLPUBLIC OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, const String& rFieldSeparators, sal_Unicode cFieldQuote ); #endif diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index e0db50c19f57..0f0ac6e101da 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -72,12 +72,12 @@ private: sal_uLong nTipVisible; Window* pTipVisibleSecParent; sal_uLong nTipVisibleSec; - rtl::OUString aManualTip; - rtl::OUString aAutoSearch; + OUString aManualTip; + OUString aAutoSearch; - rtl::OUString aCurrentText; + OUString aCurrentText; - rtl::OUString aFormText; // for autopilot function + OUString aFormText; // for autopilot function xub_StrLen nFormSelStart; // Selection for autopilot function xub_StrLen nFormSelEnd; @@ -169,8 +169,8 @@ public: eMode != SC_INPUT_TYPE); } bool IsTopMode() const { return (eMode == SC_INPUT_TOP); } - const rtl::OUString& GetEditString(); - const rtl::OUString& GetFormString() const { return aFormText; } + const OUString& GetEditString(); + const OUString& GetFormString() const { return aFormText; } const ScAddress& GetCursorPos() const { return aCursorPos; } @@ -232,7 +232,7 @@ public: // Communication with the autopilot function void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); - void InputReplaceSelection ( const rtl::OUString& rStr ); + void InputReplaceSelection ( const OUString& rStr ); bool IsFormulaMode() const { return bFormulaMode; } ScInputWindow* GetInputWindow() { return pInputWin; } diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index e3169ba96764..2f035fbb387b 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -67,7 +67,7 @@ private: void UpdateSourceRanges(); void UpdateEnable(); - void LoadDocument( const rtl::OUString& rFile, const String& rFilter, + void LoadDocument( const OUString& rFile, const String& rFilter, const String& rOptions ); public: @@ -80,10 +80,10 @@ public: virtual short Execute(); // overwritten to set dialog parent - rtl::OUString GetURL(); - rtl::OUString GetFilter(); // may be empty - rtl::OUString GetOptions(); // filter options - rtl::OUString GetSource(); // separated by ";" + OUString GetURL(); + OUString GetFilter(); // may be empty + OUString GetOptions(); // filter options + OUString GetSource(); // separated by ";" sal_uLong GetRefresh(); // 0 if disabled }; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 8ca5db418187..42db6273b04d 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -33,14 +33,14 @@ class ScMoveTableDlg : public ModalDialog { public: - ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault); + ScMoveTableDlg(Window* pParent, const OUString& rDefault); ~ScMoveTableDlg(); sal_uInt16 GetSelectedDocument () const; SCTAB GetSelectedTable () const; bool GetCopyTable () const; bool GetRenameTable () const; - void GetTabNameString( rtl::OUString& rString ) const; + void GetTabNameString( OUString& rString ) const; void SetForceCopyTable (); void EnableCopyTable (sal_Bool bFlag=true); void EnableRenameTable (sal_Bool bFlag=true); @@ -68,11 +68,11 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - rtl::OUString maStrTabNameUsed; - rtl::OUString maStrTabNameEmpty; - rtl::OUString maStrTabNameInvalid; + OUString maStrTabNameUsed; + OUString maStrTabNameEmpty; + OUString maStrTabNameInvalid; - const rtl::OUString maDefaultName; + const OUString maDefaultName; sal_uInt16 mnCurrentDocPos; sal_uInt16 nDocument; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 52d34945f50a..13c32b75d412 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -72,7 +72,7 @@ private: OUString maName; OUString maScope; - std::map<rtl::OUString, ScRangeName*> maRangeMap; + std::map<OUString, ScRangeName*> maRangeMap; void CancelPushed(); void AddPushed(); @@ -90,7 +90,7 @@ protected: public: ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* pViewData, std::map<rtl::OUString, ScRangeName*> aRangeMap, + ScViewData* pViewData, std::map<OUString, ScRangeName*> aRangeMap, const ScAddress& aCursorPos, const bool bUndo); virtual ~ScNameDefDlg() {}; @@ -101,7 +101,7 @@ public: virtual void SetActive(); virtual sal_Bool Close(); - void GetNewData( rtl::OUString& rName, rtl::OUString& rScope ); + void GetNewData( OUString& rName, OUString& rScope ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 933af353dacb..79a254a4f914 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -72,11 +72,11 @@ private: SvxSimpleTableContainer maNameMgrCtrl; ScRangeManagerTable* mpRangeManagerTable; - const rtl::OUString maGlobalNameStr; - const rtl::OUString maErrInvalidNameStr; - const rtl::OUString maErrNameInUse; - const rtl::OUString maStrInfoDefault; - const rtl::OUString maStrMultiSelect; + const OUString maGlobalNameStr; + const OUString maErrInvalidNameStr; + const OUString maErrNameInUse; + const OUString maStrInfoDefault; + const OUString maStrMultiSelect; ScViewData* mpViewData; ScDocument* mpDoc; @@ -88,7 +88,7 @@ private: //ugly hack to call DefineNames from ManageNames bool mbCloseWithoutUndo; - typedef boost::ptr_map<rtl::OUString, ScRangeName> RangeNameContainer; + typedef boost::ptr_map<OUString, ScRangeName> RangeNameContainer; RangeNameContainer maRangeMap; @@ -102,7 +102,7 @@ private: bool IsFormulaValid(); void CheckForEmptyTable(); - ScRangeName* GetRangeName(const rtl::OUString& rScope); + ScRangeName* GetRangeName(const OUString& rScope); bool AddPushed(); void RemovePushed(); @@ -133,7 +133,7 @@ protected: public: ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData, - const ScAddress& aCursorPos, boost::ptr_map<rtl::OUString, ScRangeName>* pRangeMap = NULL ); + const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap = NULL ); virtual ~ScNameDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); @@ -142,8 +142,8 @@ public: virtual void SetActive(); virtual sal_Bool Close(); - void GetRangeNames(boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap); - void SetEntry(const rtl::OUString& rName, const rtl::OUString& rScope); + void GetRangeNames(boost::ptr_map<OUString, ScRangeName>& rRangeMap); + void SetEntry(const OUString& rName, const OUString& rScope); }; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index d82ce5cd0f1e..687cc0f17a0e 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -40,9 +40,9 @@ class ScRangeData; struct ScRangeNameLine { - rtl::OUString aName; - rtl::OUString aExpression; - rtl::OUString aScope; + OUString aName; + OUString aExpression; + OUString aScope; }; //Implements the table for the manage names dialog @@ -52,10 +52,10 @@ struct ScRangeNameLine class SC_DLLPUBLIC ScRangeManagerTable : public SvxSimpleTable { private: - rtl::OUString maGlobalString; + OUString maGlobalString; // should be const because we should not modify it here - const boost::ptr_map<rtl::OUString, ScRangeName>& mrRangeMap; + const boost::ptr_map<OUString, ScRangeName>& mrRangeMap; // for performance, save which entries already have the formula entry // otherwise opening the dialog with a lot of range names is extremelly slow because // we would calculate all formula strings during opening @@ -70,7 +70,7 @@ private: void setColWidths(); public: - ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<rtl::OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); + ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); virtual ~ScRangeManagerTable(); virtual void Resize(); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index ba4098c05824..da880cb563cd 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -43,14 +43,14 @@ private: ScRangeManagerTable* mpTable; - std::vector<rtl::OUString> maSelectedNames; - boost::ptr_map<rtl::OUString, ScRangeName> maRangeMap; + std::vector<OUString> maSelectedNames; + boost::ptr_map<OUString, ScRangeName> maRangeMap; public: ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool bInsList=true ); virtual ~ScNamePasteDlg(); - std::vector<rtl::OUString> GetSelectedNames() const; + std::vector<OUString> GetSelectedNames() const; bool IsAllSelected() const; }; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 41eba6064a0b..9eb57004c38c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -280,7 +280,7 @@ private: void SetCurrentCell( SCCOL nCol, SCROW Row ); void SetCurrentCellStr( const String rName ); void SetCurrentTable( SCTAB nTab ); - void SetCurrentTableStr( const rtl::OUString& rName ); + void SetCurrentTableStr( const OUString& rName ); void SetCurrentObject( const String rName ); void SetCurrentDoc( const String& rDocName ); diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 16b7d6bc93bf..14d5ed5eda87 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -183,8 +183,8 @@ private: std::vector<ScOptConditionRow> maConditions; long nScrollPos; - com::sun::star::uno::Sequence<rtl::OUString> maImplNames; - com::sun::star::uno::Sequence<rtl::OUString> maDescriptions; + com::sun::star::uno::Sequence<OUString> maImplNames; + com::sun::star::uno::Sequence<OUString> maDescriptions; String maEngine; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index aec2dcba9d45..ecc406e1438b 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -80,12 +80,12 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; MoreButton aBtnMore; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNone; - const rtl::OUString aStrEmpty; - const rtl::OUString aStrNotEmpty; - const rtl::OUString aStrRow; - const rtl::OUString aStrColumn; + const OUString aStrUndefined; + const OUString aStrNone; + const OUString aStrEmpty; + const OUString aStrNotEmpty; + const OUString aStrRow; + const OUString aStrColumn; const sal_uInt16 nWhichQuery; const ScQueryParam theQueryData; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 6aa56a57f54f..c02cb5c6a142 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -60,7 +60,7 @@ private: class ScDPFunctionDlg : public ModalDialog { - typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType; + typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; public: explicit ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); @@ -71,8 +71,8 @@ public: private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); - const ::rtl::OUString& GetBaseFieldName(const ::rtl::OUString& rLayoutName) const; - const ::rtl::OUString& GetBaseItemName(const ::rtl::OUString& rLayoutName) const; + const OUString& GetBaseFieldName(const OUString& rLayoutName) const; + const OUString& GetBaseItemName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ sal_uInt16 FindBaseItemPos( const String& rEntry, sal_uInt16 nStartPos ) const; @@ -162,7 +162,7 @@ private: void Init( const ScDPNameVec& rDataFields, bool bEnableLayout ); void InitHideListBox(); - const ::rtl::OUString& GetFieldName(const ::rtl::OUString& rLayoutName) const; + const OUString& GetFieldName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ sal_uInt16 FindListBoxEntry( const ListBox& rLBox, const String& rEntry, sal_uInt16 nStartPos ) const; @@ -203,7 +203,7 @@ private: ScDPObject& mrDPObj; /// The DataPilot object (for member names). ScDPLabelData maLabelData; /// Cache for members data. - typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType; + typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping. }; @@ -221,7 +221,7 @@ public: * be different from the name displayed in the dialog if the field * has a layout name. */ - ::rtl::OUString GetDimensionName() const; + OUString GetDimensionName() const; private: DECL_LINK( DblClickHdl, ListBox* ); diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 31bed6b4bfaf..89c36b0b0231 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -133,7 +133,7 @@ protected: private: /** Returns the localized function name for the specified (1-based) resource index. */ - inline const rtl::OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; } + inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; } /** Fills the field windows from the current pivot table settings. */ void InitFieldWindows(); @@ -145,9 +145,9 @@ private: void InitFieldWindow ( const ::std::vector<ScPivotField>& rFields, ScPivotFieldType eType ); void AdjustDlgSize(); ScDPLabelData* GetLabelData( SCCOL nCol ); - rtl::OUString GetLabelString(SCsCOL nCol); + OUString GetLabelString(SCsCOL nCol); bool IsOrientationAllowed( SCsCOL nCol, ScPivotFieldType eType ); - rtl::OUString GetFuncString( sal_uInt16& rFuncMask, bool bIsValue = true ); + OUString GetFuncString( sal_uInt16& rFuncMask, bool bIsValue = true ); void AddField ( size_t nFromIndex, ScPivotFieldType eToType, const Point& rAtPos ); @@ -231,8 +231,8 @@ private: PushButton maBtnRemove; PushButton maBtnOptions; MoreButton maBtnMore; - std::vector<rtl::OUString> maFuncNames; /// Localized function names from resource. - boost::ptr_vector<rtl::OUString> maRefStrs; /// Reference strings stored with the output list box. + std::vector<OUString> maFuncNames; /// Localized function names from resource. + boost::ptr_vector<OUString> maRefStrs; /// Reference strings stored with the output list box. ScDPObjectPtr mxDlgDPObject; /// Clone of the pivot table object this dialog is based on. ScPivotParam maPivotData; /// The pivot table field configuration. ScDPLabelDataVector maLabelData; /// Information about all dimensions. @@ -241,9 +241,9 @@ private: ScDocument* mpDoc; formula::RefEdit* mpRefInputEdit; - const rtl::OUString maStrUndefined; - const rtl::OUString maStrNewTable; - rtl::OUString maOutputRefStr; /// Used only for caching in UI. + const OUString maStrUndefined; + const OUString maStrNewTable; + OUString maOutputRefStr; /// Used only for caching in UI. ScPivotFieldType meDnDFromType; size_t mnDnDFromIndex; diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 76f016be60cf..dbf6f9729265 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -110,7 +110,7 @@ private: struct TableItem { - rtl::OUString maName; + OUString maName; TabProtectionPtr mpProtect; }; ::std::vector<TableItem> maTableItems; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 61f07f01e730..c1b1e2573d00 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -36,10 +36,10 @@ public: ScNewScenarioDlg( Window* pParent, const String& rName, sal_Bool bEdit = false, sal_Bool bSheetProtected = false ); ~ScNewScenarioDlg(); - void SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment, + void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ); - void GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, + void GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const; private: diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index b017a56fb151..57e537a02436 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -35,7 +35,7 @@ class ScImportAsciiDlg : public ModalDialog sal_uLong* mpRowPosArray; sal_uLong mnRowPosCount; - rtl::OUString maPreviewLine[ CSV_PREVIEW_LINES ]; + OUString maPreviewLine[ CSV_PREVIEW_LINES ]; FixedText* pFtCharSet; @@ -101,7 +101,7 @@ private: void SetupSeparatorCtrls(); - bool GetLine( sal_uLong nLine, rtl::OUString &rText ); + bool GetLine( sal_uLong nLine, OUString &rText ); void UpdateVertical(); inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 5af3416b04e7..9e9772968474 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -30,7 +30,7 @@ public: ~ScAutoFormatDlg(); sal_uInt16 GetIndex() const { return nIndex; } - rtl::OUString GetCurrFormatName(); + OUString GetCurrFormatName(); private: FixedLine aFlFormat; diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 6b54c98be0e2..205ed0151a42 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -45,7 +45,7 @@ public: /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription( const String& rTitle, const String& rFixedText, - const ::rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ); + const OString& nDlgHelpId, const OString& nLbHelpId ); /** Inserts a string into the ListBox. */ void Insert( const String& rString, sal_Bool bSelected ); diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 9e098fdcd339..d79cb2b21ad0 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -48,8 +48,8 @@ class ScSolverOptionsDialog : public ModalDialog CancelButton maBtnCancel; SvLBoxButtonData* mpCheckButtonData; - com::sun::star::uno::Sequence<rtl::OUString> maImplNames; - com::sun::star::uno::Sequence<rtl::OUString> maDescriptions; + com::sun::star::uno::Sequence<OUString> maImplNames; + com::sun::star::uno::Sequence<OUString> maDescriptions; String maEngine; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; @@ -64,8 +64,8 @@ class ScSolverOptionsDialog : public ModalDialog public: ScSolverOptionsDialog( Window* pParent, - const com::sun::star::uno::Sequence<rtl::OUString>& rImplNames, - const com::sun::star::uno::Sequence<rtl::OUString>& rDescriptions, + const com::sun::star::uno::Sequence<OUString>& rImplNames, + const com::sun::star::uno::Sequence<OUString>& rDescriptions, const String& rEngine, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); ~ScSolverOptionsDialog(); diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index ee1659a15d81..11252978c387 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -32,10 +32,10 @@ namespace com { namespace sun { namespace star { class ScSolverUtil { public: - static void GetImplementations( com::sun::star::uno::Sequence<rtl::OUString>& rImplNames, - com::sun::star::uno::Sequence<rtl::OUString>& rDescriptions ); - static com::sun::star::uno::Reference<com::sun::star::sheet::XSolver> GetSolver( const rtl::OUString& rImplName ); - static com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> GetDefaults( const rtl::OUString& rImplName ); + static void GetImplementations( com::sun::star::uno::Sequence<OUString>& rImplNames, + com::sun::star::uno::Sequence<OUString>& rDescriptions ); + static com::sun::star::uno::Reference<com::sun::star::sheet::XSolver> GetSolver( const OUString& rImplName ); + static com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> GetDefaults( const OUString& rImplName ); }; #endif diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index 05f25d010f53..1c302c95eae0 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -35,10 +35,10 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ); + const OString& sHelpId, const OString& sEditHelpId ); ~ScStringInputDlg(); - void GetInputString( rtl::OUString& rString ) const; + void GetInputString( OUString& rString ) const; private: FixedText aFtEditTitle; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index fdfcac5daf72..73f6127610ac 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -34,7 +34,7 @@ public: const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - const rtl::OString& nHelpId ); + const OString& nHelpId ); ~ScTabBgColorDlg(); void GetSelectedColor( Color& rColor ) const; @@ -57,7 +57,7 @@ private: HelpButton aBtnHelp; Color aTabBgColor; const String aTabBgColorNoColorText; - rtl::OString msHelpId; + OString msHelpId; void FillColorValueSets_Impl(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index eb3550ad9805..06cd9c8b967c 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -176,10 +176,10 @@ private: String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; // ugly hack for Add button in ScNameDlg - boost::ptr_map<rtl::OUString, ScRangeName> maRangeMap; + boost::ptr_map<OUString, ScRangeName> maRangeMap; bool mbInSwitch; - rtl::OUString maName; - rtl::OUString maScope; + OUString maName; + OUString maScope; private: void Construct( sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE ); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 8249cdf61dd8..962f62b28e34 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -64,7 +64,7 @@ private: Edit aEdSheetPrefix; // Stores old Sheet Prefix - ::rtl::OUString maOldPrefixValue; + OUString maOldPrefixValue; }; #endif diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index b895235c1c7b..0b613169a242 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -48,7 +48,7 @@ private: void UpdateCustomCalcRadioButtons(bool bDefault); void LaunchCustomCalcSettings(); - bool IsValidSeparator(const ::rtl::OUString& rSep) const; + bool IsValidSeparator(const OUString& rSep) const; bool IsValidSeparatorSet() const; DECL_LINK( ButtonHdl, Button* ); @@ -83,7 +83,7 @@ private: /** Stores old separator value of currently focused separator edit box. This value is used to revert undesired value change. */ - ::rtl::OUString maOldSepValue; + OUString maOldSepValue; ScCalcConfig maSavedConfig; ScCalcConfig maCurrentConfig; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 468f6fd5f7e2..08c5854b476a 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -56,8 +56,8 @@ protected: SvxCheckListBox aLbColumns; FixedText aFtFunctions; ListBox aLbFunctions; - const rtl::OUString aStrNone; - const rtl::OUString aStrColumn; + const OUString aStrNone; + const OUString aStrColumn; ScViewData* pViewData; ScDocument* pDoc; diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index f5c17cdf3044..470e7d3bdf4a 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -56,7 +56,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; virtual sal_Bool Merge( SfxUndoAction *pNextAction ); @@ -89,7 +89,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aEffRange; @@ -120,7 +120,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: sal_Bool bRows; @@ -152,7 +152,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -201,7 +201,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -235,7 +235,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aSrcRange; @@ -268,7 +268,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -302,7 +302,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -341,7 +341,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; ScEditDataArray* GetDataArray(); private: @@ -379,7 +379,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -415,7 +415,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aSource; @@ -447,7 +447,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScCellMergeOption maOption; @@ -474,7 +474,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; // deleted data @@ -500,7 +500,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aCursorPos; @@ -535,7 +535,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -565,7 +565,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -595,7 +595,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -625,7 +625,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -650,7 +650,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -676,7 +676,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; virtual sal_uInt16 GetId() const; private: @@ -702,7 +702,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -725,7 +725,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -753,7 +753,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -781,7 +781,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -815,7 +815,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aOldDoc; @@ -851,7 +851,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -873,7 +873,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -895,7 +895,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -917,7 +917,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -939,7 +939,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: void SetCurTab(); @@ -965,7 +965,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index c6e0ae0037c5..38651c863f1d 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -51,7 +51,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; /** once the objects are passed to this class, their life-cycle is managed by this class; the calling function must pass new'ed @@ -101,7 +101,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ValuesType maOldValues; @@ -131,7 +131,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aPos; @@ -182,7 +182,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOL nCol; @@ -207,7 +207,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -234,7 +234,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOL nCol; @@ -282,7 +282,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: void DoInsertNote( const ScNoteData& rNoteData ); @@ -310,7 +310,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress maPos; @@ -333,7 +333,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: sal_Bool bIsDelete; @@ -358,7 +358,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRangeName* pOldRanges; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 48622e3de325..e4d28396717b 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -57,7 +57,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOLROW nStart; @@ -87,7 +87,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -113,7 +113,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOLROW nStart; @@ -142,7 +142,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -168,7 +168,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -193,7 +193,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -219,7 +219,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -248,7 +248,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -275,7 +275,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SdrUndoAction* pDrawUndo; @@ -294,7 +294,7 @@ private: class ScUndoAutoFilter: public ScDBFuncUndo { private: - ::rtl::OUString aDBName; + OUString aDBName; bool bFilterSet; void DoChange( bool bUndo ); @@ -302,7 +302,7 @@ private: public: TYPEINFO(); ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange, - const ::rtl::OUString& rName, bool bSet ); + const OUString& rName, bool bSet ); virtual ~ScUndoAutoFilter(); virtual void Undo(); @@ -310,7 +310,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; @@ -327,7 +327,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDBCollection* pUndoColl; @@ -351,7 +351,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -384,7 +384,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -416,7 +416,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pOldUndoDoc; @@ -443,7 +443,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScArea aDestArea; @@ -473,7 +473,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aChartName; @@ -509,7 +509,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr<ScMarkData> mpMarkData; diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 7ae1c747c6a7..59bc7c8197d7 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -72,7 +72,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; class ScUndoApplyPageStyle: public ScSimpleUndo @@ -89,7 +89,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: struct ApplyStyleEntry diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 25e688821354..a1fa0f59d263 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -60,7 +60,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String sNewName; @@ -79,7 +79,7 @@ public: ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, - std::vector<rtl::OUString>& newNameList); + std::vector<OUString>& newNameList); virtual ~ScUndoInsertTables(); virtual void Undo(); @@ -87,12 +87,12 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SdrUndoAction* pDrawUndo; - std::vector<rtl::OUString> aNameList; + std::vector<OUString> aNameList; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; SCTAB nTab; @@ -117,7 +117,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: std::vector<SCTAB> theTabs; @@ -144,7 +144,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -163,8 +163,8 @@ public: ScDocShell* pNewDocShell, ::std::vector<SCTAB>* pOldTabs, ::std::vector<SCTAB>* pNewTabs, - ::std::vector< ::rtl::OUString>* pOldNames = NULL, - ::std::vector< ::rtl::OUString>* pNewNames = NULL ); + ::std::vector< OUString>* pOldNames = NULL, + ::std::vector< OUString>* pNewNames = NULL ); virtual ~ScUndoMoveTab(); @@ -173,13 +173,13 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs; ::boost::shared_ptr< ::std::vector<SCTAB> > mpNewTabs; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpOldNames; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpNewNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpOldNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames; void DoChange( sal_Bool bUndo ) const; }; @@ -193,7 +193,7 @@ public: ScDocShell* pNewDocShell, ::std::vector<SCTAB>* pOldTabs, ::std::vector<SCTAB>* pNewTabs, - ::std::vector< ::rtl::OUString>* pNewNames = NULL ); + ::std::vector< OUString>* pNewNames = NULL ); virtual ~ScUndoCopyTab(); @@ -202,12 +202,12 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs; ::boost::shared_ptr< ::std::vector<SCTAB> > mpNewTabs; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpNewNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames; SdrUndoAction* pDrawUndo; void DoChange() const; @@ -232,7 +232,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScUndoTabColorInfo::List aTabColorList; @@ -257,7 +257,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr<ScMarkData> mpMarkData; @@ -285,7 +285,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -311,7 +311,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -342,7 +342,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: std::vector<SCTAB> undoTabs; @@ -368,7 +368,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -396,7 +396,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB mnTab; @@ -421,7 +421,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -450,7 +450,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -480,7 +480,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aPersistName; // to find object (works only for OLE objects) @@ -503,7 +503,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 5229b992467c..c0e8f07e623d 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -129,7 +129,7 @@ public: sal_Bool bLink = false, sal_Bool bAllowDialogs = false ); sal_Bool PasteFile( const Point&, const String&, sal_Bool bLink=false ); - sal_Bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); + sal_Bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); sal_Bool PasteBitmap( const Point&, const Bitmap& ); sal_Bool PasteMetaFile( const Point&, const GDIMetaFile& ); sal_Bool PasteGraphic( const Point& rPos, const Graphic& rGraphic, @@ -248,7 +248,7 @@ public: void TabOp( const ScTabOpParam& rParam, sal_Bool bRecord = sal_True ); sal_Bool InsertTable( const String& rName, SCTAB nTabNr, sal_Bool bRecord = sal_True ); - sal_Bool InsertTables(std::vector<rtl::OUString>& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord = sal_True); + sal_Bool InsertTables(std::vector<OUString>& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord = sal_True); sal_Bool AppendTable( const String& rName, sal_Bool bRecord = sal_True ); @@ -258,7 +258,7 @@ public: bool DeleteTables(SCTAB nTab, SCTAB nSheets); sal_Bool RenameTable( const String& rName, SCTAB nTabNr ); - void MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const rtl::OUString* pNewTabName = NULL ); + void MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const OUString* pNewTabName = NULL ); void ImportTables( ScDocShell* pSrcShell, SCTAB nCount, const SCTAB* pSrcTabs, sal_Bool bLink,SCTAB nTab); @@ -317,7 +317,7 @@ public: void DetectiveMarkPred(); void DetectiveMarkSucc(); - void InsertCurrentTime(short nCellFmt, const ::rtl::OUString& rUndoStr); + void InsertCurrentTime(short nCellFmt, const OUString& rUndoStr); void ShowNote( bool bShow = true ); inline void HideNote() { ShowNote( false ); } diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 95f379e3c9ba..7c227d67260a 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -51,7 +51,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg Image maImgFileOpen; - rtl::OUString maSrcPath; + OUString maSrcPath; ScOrcusXMLTreeParam maXMLParam; std::set<const SvTreeListEntry*> maCellLinks; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 9345776aabe3..0912abb57298 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -211,8 +211,8 @@ void ScAcceptChgDlg::Init() pChanges->SetModifiedLink( LINK( this, ScAcceptChgDlg,ChgTrackModHdl)); aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); pTPFilter->ClearAuthors(); - const std::set<rtl::OUString>& rUserColl = pChanges->GetUserCollection(); - std::set<rtl::OUString>::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end(); + const std::set<OUString>& rUserColl = pChanges->GetUserCollection(); + std::set<OUString>::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end(); for (; it != itEnd; ++it) pTPFilter->InsertAuthor(*it); } @@ -271,9 +271,9 @@ void ScAcceptChgDlg::ClearView() pTheView->SetUpdateMode(true); } -rtl::OUString* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) +OUString* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) { - rtl::OUString* pStr; + OUString* pStr; switch(eType) { @@ -304,7 +304,7 @@ bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) DateTime aDateTime=pScChangeAction->GetDateTime(); ScChangeActionType eType=pScChangeAction->GetType(); - rtl::OUString aDesc; + OUString aDesc; String aComment = comphelper::string::remove(pScChangeAction->GetComment(), '\n'); @@ -359,10 +359,10 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeAction( String aUser=pScChangeAction->GetUser(); DateTime aDateTime=pScChangeAction->GetDateTime(); - rtl::OUString aRefStr; + OUString aRefStr; ScChangeActionType eType=pScChangeAction->GetType(); - rtl::OUStringBuffer aBuf; - rtl::OUString aDesc; + OUStringBuffer aBuf; + OUString aDesc; ScRedlinData* pNewData=new ScRedlinData; pNewData->pData=(void *)pScChangeAction; @@ -536,10 +536,10 @@ SvTreeListEntry* ScAcceptChgDlg::InsertFilteredAction( if(bFlag) { - rtl::OUString aRefStr; + OUString aRefStr; ScChangeActionType eType=pScChangeAction->GetType(); String aString; - rtl::OUString aDesc; + OUString aDesc; ScRedlinData* pNewData=new ScRedlinData; pNewData->pData=(void *)pScChangeAction; @@ -655,14 +655,14 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC bFlag=true; } - rtl::OUString aRefStr; + OUString aRefStr; String aString; String a2String; String aDesc; if(nSpecial==RD_SPECIAL_CONTENT) { - rtl::OUString aTmp; + OUString aTmp; pScChangeAction->GetOldString(aTmp); a2String = aTmp; if(a2String.Len()==0) a2String=aStrEmpty; @@ -676,7 +676,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC } else { - rtl::OUString aTmp; + OUString aTmp; pScChangeAction->GetNewString(aTmp); a2String = aTmp; if(a2String.Len()==0) @@ -1225,8 +1225,8 @@ bool ScAcceptChgDlg::InsertAcceptedORejected(SvTreeListEntry* pParent) bool bTheTestFlag = true; ScChangeActionState eState = SC_CAS_VIRGIN; - rtl::OUString aString = pTheView->GetEntryText(pParent); - rtl::OUString a2String = aString.copy(0, aStrAllAccepted.getLength()); + OUString aString = pTheView->GetEntryText(pParent); + OUString a2String = aString.copy(0, aStrAllAccepted.getLength()); if (a2String.equals(aStrAllAccepted)) eState=SC_CAS_ACCEPTED; else @@ -1793,7 +1793,7 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo) if ( pInfo->aExtraString.Len() ) { xub_StrLen nPos = pInfo->aExtraString.Search( - rtl::OUString("AcceptChgDat:")); + OUString("AcceptChgDat:")); // Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn // er nicht vorhanden ist, liegt eine "altere Version vor diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 6acaa05a4b47..57e996b843f7 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -426,7 +426,7 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume long nTabs[] = { 3, 10, 216, 266 }; maLbConflicts.SetTabs( nTabs ); - rtl::OUString aTab('\t'); + OUString aTab('\t'); String aHeader( maStrTitleConflict ); aHeader += aTab; aHeader += maStrTitleAuthor; @@ -464,7 +464,7 @@ ScConflictsDlg::~ScConflictsDlg() String ScConflictsDlg::GetConflictString( const ScConflictsListEntry& rConflictEntry ) { - rtl::OUString aString; + OUString aString; if ( mpOwnTrack ) { const ScChangeAction* pAction = mpOwnTrack->GetAction( rConflictEntry.maOwnActions[ 0 ] ); @@ -485,7 +485,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen OSL_ENSURE( pDoc, "ScConflictsDlg::GetActionString(): pDoc is null!" ); if ( pAction && pDoc ) { - rtl::OUString aDesc; + OUString aDesc; pAction->GetDescription(aDesc, pDoc, true, false); aString += String(aDesc); aString += '\t'; diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index cb54ef3dc29f..3e32d91db7ab 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -501,7 +501,7 @@ void ScColRowNameRangesDlg::UpdateNames() const ScAddress::Details aDetails(pDoc->GetAddressConvention()); String aString; - rtl::OUString strDelim(" --- "); + OUString strDelim(" --- "); aString = strDelim; aString += ScGlobal::GetRscString( STR_COLUMN ); aString += strDelim; diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index f9850c668c10..69e03e84014b 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -43,7 +43,6 @@ #define HDL(hdl) LINK( this, ScDataFormDlg, hdl ) -using ::rtl::OUStringBuffer; //zhangyun ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri) : diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 1a33388122ca..339cb03cf024 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -48,7 +48,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - const rtl::OUString& aStartStr, + const OUString& aStartStr, double fStep, double fMax, sal_uInt16 nPossDir ) @@ -219,7 +219,7 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) bool ScFillSeriesDlg::CheckStartVal() { bool bValOk = false; - rtl::OUString aStr = aEdStartVal.GetText(); + OUString aStr = aEdStartVal.GetText(); if ( aStr.isEmpty() || aBtnAutoFill.IsChecked()) { @@ -240,7 +240,7 @@ bool ScFillSeriesDlg::CheckStartVal() bool ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; - rtl::OUString aStr = aEdIncrement.GetText(); + OUString aStr = aEdIncrement.GetText(); return rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fIncrement ); } @@ -251,7 +251,7 @@ bool ScFillSeriesDlg::CheckIncrementVal() bool ScFillSeriesDlg::CheckEndVal() { bool bValOk = false; - rtl::OUString aStr = aEdEndVal.GetText(); + OUString aStr = aEdEndVal.GetText(); if (aStr.isEmpty()) { diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 58012cfc7862..dc40bef8a095 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -96,8 +96,8 @@ void ScHighlightChgDlg::Init() { aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); aFilterCtr.ClearAuthors(); - const std::set<rtl::OUString>& rUserColl = pChanges->GetUserCollection(); - std::set<rtl::OUString>::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end(); + const std::set<OUString>& rUserColl = pChanges->GetUserCollection(); + std::set<OUString>::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end(); for (; it != itEnd; ++it) aFilterCtr.InsertAuthor(*it); } diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index c229a2644a82..71eaca271b2e 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -98,7 +98,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) if(nTableCount==1) { - rtl::OUString aName; + OUString aName; rDoc.CreateValidTabName( aName ); m_pEdName->SetText( aName ); } @@ -194,7 +194,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) if ( pSrcDoc ) { SCTAB nCount = pSrcDoc->GetTableCount(); - rtl::OUString aName; + OUString aName; for ( SCTAB i=0; i<nCount; i++ ) { @@ -260,7 +260,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) nTableCount = static_cast<SCTAB>(m_pNfCount->GetValue()); if ( nTableCount==1) { - rtl::OUString aName; + OUString aName; rDoc.CreateValidTabName( aName ); m_pEdName->SetText( aName ); m_pFtName->Enable(); @@ -296,7 +296,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) if ( pDocInserter ) delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( - rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); + OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); return 0; } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 949691b3ab3d..6e448ca072be 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -102,14 +102,14 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( - rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); + OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); return 0; } IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) { - rtl::OUString aEntered = aCbUrl.GetURL(); + OUString aEntered = aCbUrl.GetURL(); if (pSourceShell) { SfxMedium* pMed = pSourceShell->GetMedium(); @@ -120,8 +120,8 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) } } - rtl::OUString aFilter; - rtl::OUString aOptions; + OUString aFilter; + OUString aOptions; // get filter name by looking at the file content (bWithContent = true) // Break operation if any error occurred inside. if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, true, true )) @@ -129,7 +129,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) // #i53241# replace HTML filter with DataQuery filter if (aFilter.equalsAscii(FILTERNAME_HTML)) - aFilter = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILTERNAME_QUERY)); + aFilter = OUString(RTL_CONSTASCII_USTRINGPARAM(FILTERNAME_QUERY)); LoadDocument( aEntered, aFilter, aOptions ); @@ -138,7 +138,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) return 0; } -void ScLinkedAreaDlg::LoadDocument( const rtl::OUString& rFile, const String& rFilter, const String& rOptions ) +void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const String& rFilter, const String& rOptions ) { if ( pSourceShell ) { @@ -152,8 +152,8 @@ void ScLinkedAreaDlg::LoadDocument( const rtl::OUString& rFile, const String& rF { WaitObject aWait( this ); - rtl::OUString aNewFilter = rFilter; - rtl::OUString aNewOptions = rOptions; + OUString aNewFilter = rFilter; + OUString aNewOptions = rOptions; SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, rFile ); @@ -224,8 +224,8 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg WaitObject aWait( this ); // replace HTML filter with DataQuery filter - const rtl::OUString aHTMLFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_HTML ) ); - const rtl::OUString aWebQFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_QUERY ) ); + const OUString aHTMLFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_HTML ) ); + const OUString aWebQFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_QUERY ) ); const SfxFilter* pFilter = pMed->GetFilter(); if (pFilter && aHTMLFilterName.equals(pFilter->GetFilterName())) @@ -283,7 +283,7 @@ void ScLinkedAreaDlg::UpdateSourceRanges() { ScAreaNameIterator aIter( pSourceShell->GetDocument() ); ScRange aDummy; - rtl::OUString aName; + OUString aName; while ( aIter.Next( aName, aDummy ) ) aLbRanges.InsertEntry( aName ); } @@ -304,7 +304,7 @@ void ScLinkedAreaDlg::UpdateEnable() aFtSeconds.Enable( bReload ); } -rtl::OUString ScLinkedAreaDlg::GetURL() +OUString ScLinkedAreaDlg::GetURL() { if (pSourceShell) { @@ -314,29 +314,29 @@ rtl::OUString ScLinkedAreaDlg::GetURL() return EMPTY_STRING; } -rtl::OUString ScLinkedAreaDlg::GetFilter() +OUString ScLinkedAreaDlg::GetFilter() { if (pSourceShell) { SfxMedium* pMed = pSourceShell->GetMedium(); return pMed->GetFilter()->GetFilterName(); } - return rtl::OUString(); + return OUString(); } -rtl::OUString ScLinkedAreaDlg::GetOptions() +OUString ScLinkedAreaDlg::GetOptions() { if (pSourceShell) { SfxMedium* pMed = pSourceShell->GetMedium(); return ScDocumentLoader::GetOptions( *pMed ); } - return rtl::OUString(); + return OUString(); } -rtl::OUString ScLinkedAreaDlg::GetSource() +OUString ScLinkedAreaDlg::GetSource() { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_uInt16 nCount = aLbRanges.GetSelectEntryCount(); for (sal_uInt16 i=0; i<nCount; i++) { diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 12a01a29bc08..0829670029b6 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -119,7 +119,7 @@ void ScMetricInputDlg::CalcPositions() aFtSize.Width() = aFtEditTitle.GetTextWidth(aFtEditTitle.GetText()); // add mnemonic char width to fixed text width - aFtSize.Width() += aFtEditTitle.GetTextWidth(rtl::OUString("(W)")); + aFtSize.Width() += aFtEditTitle.GetTextWidth(OUString("(W)")); aFtEditTitle.SetSizePixel( aFtSize ); aNewPos.Y() = aEdValue.GetPosPixel().Y(); diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 03dfee751115..65a1c9107742 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -36,7 +36,7 @@ //================================================================== -ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault) +ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) : ModalDialog ( pParent, ScResId( RID_SCDLG_MOVETAB ) ), // @@ -88,7 +88,7 @@ bool ScMoveTableDlg::GetCopyTable () const { return bCopyTable; } bool ScMoveTableDlg::GetRenameTable () const { return bRenameTable; } -void ScMoveTableDlg::GetTabNameString( rtl::OUString& rString ) const +void ScMoveTableDlg::GetTabNameString( OUString& rString ) const { rString = aEdTabName.GetText(); } @@ -140,7 +140,7 @@ void ScMoveTableDlg::ResetRenameInput() ScDocument* pDoc = GetSelectedDoc(); if (pDoc) { - rtl::OUString aStr = maDefaultName; + OUString aStr = maDefaultName; pDoc->CreateValidTabName(aStr); aEdTabName.SetText(aStr); } @@ -156,7 +156,7 @@ void ScMoveTableDlg::ResetRenameInput() void ScMoveTableDlg::CheckNewTabName() { - const rtl::OUString aNewName = aEdTabName.GetText(); + const OUString aNewName = aEdTabName.GetText(); if (aNewName.isEmpty()) { // New sheet name is empty. This is not good. @@ -296,19 +296,19 @@ IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) { // Return an empty string when the new name is the same as the // automatic name assigned by the document. - rtl::OUString aCopyName = maDefaultName; + OUString aCopyName = maDefaultName; ScDocument* pDoc = GetSelectedDoc(); if (pDoc) pDoc->CreateValidTabName(aCopyName); - if (aCopyName == rtl::OUString(aEdTabName.GetText())) - aEdTabName.SetText( rtl::OUString() ); + if (aCopyName == OUString(aEdTabName.GetText())) + aEdTabName.SetText( OUString() ); } else { // Return an empty string, when the new name is the same as the // original name. if (maDefaultName.equals(aEdTabName.GetText())) - aEdTabName.SetText(rtl::OUString()); + aEdTabName.SetText(OUString()); } EndDialog( RET_OK ); @@ -321,7 +321,7 @@ IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb ) if ( pLb == &aLbDoc ) { ScDocument* pDoc = GetSelectedDoc(); - rtl::OUString aName; + OUString aName; aLbTable.Clear(); aLbTable.SetUpdateMode( false ); diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 386f6a5cf09a..84788a52e656 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -284,8 +284,8 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) // Get the "Delete Rows" commandimagelist images from sfx instead of // adding a second copy to sc (see ScTbxInsertCtrl::StateChanged) - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) ); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( SID_DEL_ROWS ) ); uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame(); Image aDelNm = ::GetImage( xFrame, aSlotURL, false ); @@ -373,7 +373,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) else { maRbMax.Check(); - rtl::OUString aCursorStr; + OUString aCursorStr; if ( !mpDoc->GetRangeAtBlock( ScRange(rCursorPos), &aCursorStr ) ) rCursorPos.Format( aCursorStr, SCA_ABS, NULL, mpDoc->GetAddressConvention() ); maEdObjectiveCell.SetRefString( aCursorStr ); @@ -487,7 +487,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( bSingle ) aNewRef.aEnd = aAdr; - rtl::OUString aName; + OUString aName; if ( pDocP->GetRangeAtBlock( aNewRef, &aName ) ) // named range: show name aStr = aName; else // format cell/range reference @@ -1038,7 +1038,7 @@ bool ScOptSolverDlg::CallSolver() // return true -> close dialog after cal } else { - rtl::OUString aError; + OUString aError; uno::Reference<sheet::XSolverDescription> xDesc( xSolver, uno::UNO_QUERY ); if ( xDesc.is() ) aError = xDesc->getStatusDescription(); // error description from component diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 8cb6c7bd0754..9864bb3dbb51 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -98,7 +98,7 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction) pChangeAction=pAction; if(pChangeAction!=NULL && pDocShell !=NULL) { - rtl::OUString aTitle; + OUString aTitle; pChangeAction->GetDescription( aTitle, pDocShell->GetDocument()); pDlg->SetText(aTitle); aComment=pChangeAction->GetComment(); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index e15b9b887c3c..4ddc2f6d3818 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -235,7 +235,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) if ( !bFmtInserted && pSelFmtData ) { String aStrStandard( SfxResId(STR_STANDARD) ); - rtl::OUString aFormatName; + OUString aFormatName; ScStringInputDlg* pDlg; bool bOk = false; @@ -348,7 +348,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) while( !bOk ) { - rtl::OUString aFormatName = aLbFormat.GetSelectEntry(); + OUString aFormatName = aLbFormat.GetSelectEntry(); String aEntry; ScStringInputDlg* pDlg = new ScStringInputDlg( this, @@ -453,10 +453,10 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) //------------------------------------------------------------------------ -rtl::OUString ScAutoFormatDlg::GetCurrFormatName() +OUString ScAutoFormatDlg::GetCurrFormatName() { const ScAutoFormatData* p = pFormat->findByIndex(nIndex); - return p ? p->GetName() : rtl::OUString(); + return p ? p->GetName() : OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index efb2abbcaa11..12a72e0ee82d 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -112,8 +112,8 @@ void ScShareDocumentDlg::UpdateView() try { ::svt::ShareControlFile aControlFile( mpDocShell->GetSharedFileURL() ); - uno::Sequence< uno::Sequence< ::rtl::OUString > > aUsersData = aControlFile.GetUsersData(); - const uno::Sequence< ::rtl::OUString >* pUsersData = aUsersData.getConstArray(); + uno::Sequence< uno::Sequence< OUString > > aUsersData = aControlFile.GetUsersData(); + const uno::Sequence< OUString >* pUsersData = aUsersData.getConstArray(); sal_Int32 nLength = aUsersData.getLength(); if ( nLength > 0 ) @@ -139,10 +139,10 @@ void ScShareDocumentDlg::UpdateView() } // parse the edit time string of the format "DD.MM.YYYY hh:mm" - ::rtl::OUString aDateTimeStr = pUsersData[i][SHARED_EDITTIME_ID]; + OUString aDateTimeStr = pUsersData[i][SHARED_EDITTIME_ID]; sal_Int32 nIndex = 0; - ::rtl::OUString aDateStr = aDateTimeStr.getToken( 0, ' ', nIndex ); - ::rtl::OUString aTimeStr = aDateTimeStr.getToken( 0, ' ', nIndex ); + OUString aDateStr = aDateTimeStr.getToken( 0, ' ', nIndex ); + OUString aTimeStr = aDateTimeStr.getToken( 0, ' ', nIndex ); nIndex = 0; sal_uInt16 nDay = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); sal_uInt16 nMonth = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); @@ -189,7 +189,7 @@ void ScShareDocumentDlg::UpdateView() if ( aUser.Len() == 0 ) { // get sys user name - ::rtl::OUString aUserName; + OUString aUserName; ::osl::Security aSecurity; aSecurity.getUserName( aUserName ); aUser = aUserName; diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 51d3cc36e710..ae3f4877697f 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -52,7 +52,7 @@ ScShowTabDlg::ScShowTabDlg( Window* pParent ) : void ScShowTabDlg::SetDescription( const String& rTitle, const String& rFixedText, - const rtl::OString& rDlgHelpId, const rtl::OString& sLbHelpId ) + const OString& rDlgHelpId, const OString& sLbHelpId ) { SetText( rTitle ); aFtLbTitle.SetText( rFixedText ); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 2d660778915a..c7c45cbeaa24 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star; struct ScSolverOptionsEntry { sal_Int32 nPosition; - rtl::OUString aDescription; + OUString aDescription; ScSolverOptionsEntry() : nPosition(0) {} @@ -93,13 +93,13 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); - rtl::OUString sTxt( ' ' ); + OUString sTxt( ' ' ); if ( mbIsDouble ) sTxt += rtl::math::doubleToUString( mfDoubleValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true ); else - sTxt += rtl::OUString::valueOf(mnIntValue); + sTxt += OUString::valueOf(mnIntValue); rDev.SetFont( aFont ); rDev.DrawText( aNewPos, sTxt ); @@ -109,8 +109,8 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const //------------------------------------------------------------------ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, - const uno::Sequence<rtl::OUString>& rImplNames, - const uno::Sequence<rtl::OUString>& rDescriptions, + const uno::Sequence<OUString>& rImplNames, + const uno::Sequence<OUString>& rDescriptions, const String& rEngine, const uno::Sequence<beans::PropertyValue>& rProperties ) : ModalDialog( pParent, ScResId( RID_SCDLG_SOLVEROPTIONS ) ), @@ -231,8 +231,8 @@ void ScSolverOptionsDialog::FillListBox() std::vector<ScSolverOptionsEntry> aDescriptions( nCount ); for (sal_Int32 nPos=0; nPos<nCount; nPos++) { - rtl::OUString aPropName( maProperties[nPos].Name ); - rtl::OUString aVisName; + OUString aPropName( maProperties[nPos].Name ); + OUString aVisName; if ( xDesc.is() ) aVisName = xDesc->getPropertyDescription( aPropName ); if ( aVisName.isEmpty() ) @@ -264,7 +264,7 @@ void ScSolverOptionsDialog::FillListBox() for (sal_Int32 nPos=0; nPos<nCount; nPos++) { - rtl::OUString aVisName = aDescriptions[nPos].aDescription; + OUString aVisName = aDescriptions[nPos].aDescription; uno::Any aValue = maProperties[nPos].Value; uno::TypeClass eClass = aValue.getValueTypeClass(); diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 10235a30890b..3adfd8edef1f 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -70,8 +70,8 @@ static uno::Reference<sheet::XSolver> lcl_CreateSolver( const uno::Reference<uno return xSolver; } -void ScSolverUtil::GetImplementations( uno::Sequence<rtl::OUString>& rImplNames, - uno::Sequence<rtl::OUString>& rDescriptions ) +void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames, + uno::Sequence<OUString>& rDescriptions ) { rImplNames.realloc(0); // clear rDescriptions.realloc(0); @@ -85,7 +85,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence<rtl::OUString>& rImplNames, if ( xEnAc.is() ) { uno::Reference<container::XEnumeration> xEnum = - xEnAc->createContentEnumeration( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); + xEnAc->createContentEnumeration( OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); if ( xEnum.is() ) { sal_Int32 nCount = 0; @@ -99,8 +99,8 @@ void ScSolverUtil::GetImplementations( uno::Sequence<rtl::OUString>& rImplNames, uno::Reference<lang::XServiceInfo> xInfo( xIntFac, uno::UNO_QUERY ); if ( xInfo.is() ) { - rtl::OUString sName = xInfo->getImplementationName(); - rtl::OUString sDescription; + OUString sName = xInfo->getImplementationName(); + OUString sDescription; uno::Reference<sheet::XSolver> xSolver = lcl_CreateSolver( xIntFac, xCtx ); uno::Reference<sheet::XSolverDescription> xDesc( xSolver, uno::UNO_QUERY ); @@ -122,7 +122,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence<rtl::OUString>& rImplNames, } } -uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const rtl::OUString& rImplName ) +uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const OUString& rImplName ) { uno::Reference<sheet::XSolver> xSolver; @@ -135,7 +135,7 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const rtl::OUString& rIm if ( xEnAc.is() ) { uno::Reference<container::XEnumeration> xEnum = - xEnAc->createContentEnumeration( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); + xEnAc->createContentEnumeration( OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() && !xSolver.is() ) @@ -148,7 +148,7 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const rtl::OUString& rIm uno::Reference<lang::XServiceInfo> xInfo( xIntFac, uno::UNO_QUERY ); if ( xInfo.is() ) { - rtl::OUString sName = xInfo->getImplementationName(); + OUString sName = xInfo->getImplementationName(); if ( sName == rImplName ) xSolver = lcl_CreateSolver( xIntFac, xCtx ); } @@ -161,7 +161,7 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const rtl::OUString& rIm return xSolver; } -uno::Sequence<beans::PropertyValue> ScSolverUtil::GetDefaults( const rtl::OUString& rImplName ) +uno::Sequence<beans::PropertyValue> ScSolverUtil::GetDefaults( const OUString& rImplName ) { uno::Sequence<beans::PropertyValue> aDefaults; diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index 8fcf399b27e2..82d613f5b704 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -34,7 +34,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ) : + const OString& sHelpId, const OString& sEditHelpId ) : ModalDialog ( pParent, ScResId( RID_SCDLG_STRINPUT ) ), // aFtEditTitle ( this, ScResId( FT_LABEL ) ), @@ -55,7 +55,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, //------------------------------------------------------------------------ -void ScStringInputDlg::GetInputString( rtl::OUString& rString ) const +void ScStringInputDlg::GetInputString( OUString& rString ) const { rString = aEdInput.GetText(); } diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index b79ecf8f799d..c2c8fa8db42f 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -45,7 +45,7 @@ ScTabBgColorDlg::ScTabBgColorDlg( Window* pParent, const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - const rtl::OString& sHelpId ) : + const OString& sHelpId ) : ModalDialog ( pParent, ScResId( RID_SCDLG_TAB_BG_COLOR ) ), aBorderWin ( this, ScResId( TAB_BG_COLOR_CT_BORDER ) ), aTabBgColorSet ( &aBorderWin, ScResId( TAB_BG_COLOR_SET_BGDCOLOR ), this ), diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 3270ad9e23e1..7ece754c88cf 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -50,7 +50,7 @@ #define ABS_DREF3D ABS_DREF | SCA_TAB_3D ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* pViewData, std::map<rtl::OUString, ScRangeName*> aRangeMap, + ScViewData* pViewData, std::map<OUString, ScRangeName*> aRangeMap, const ScAddress& aCursorPos, const bool bUndo ) : ScAnyRefDlg( pB, pCW, pParent, "DefineNameDialog", "modules/scalc/ui/definename.ui" ) , @@ -84,7 +84,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen SCTAB n = mpDoc->GetTableCount(); for (SCTAB i = 0; i < n; ++i) { - rtl::OUString aTabName; + OUString aTabName; mpDoc->GetName(i, aTabName); m_pLbScope->InsertEntry(aTabName); } @@ -141,13 +141,13 @@ bool ScNameDefDlg::IsFormulaValid() bool ScNameDefDlg::IsNameValid() { - rtl::OUString aScope = m_pLbScope->GetSelectEntry(); - rtl::OUString aName = m_pEdName->GetText(); + OUString aScope = m_pLbScope->GetSelectEntry(); + OUString aName = m_pEdName->GetText(); ScRangeName* pRangeName = NULL; if(aScope == maGlobalNameStr) { - pRangeName = maRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; } else { @@ -190,9 +190,9 @@ bool ScNameDefDlg::IsNameValid() void ScNameDefDlg::AddPushed() { - rtl::OUString aScope = m_pLbScope->GetSelectEntry(); - rtl::OUString aName = m_pEdName->GetText(); - rtl::OUString aExpression = m_pEdRange->GetText(); + OUString aScope = m_pLbScope->GetSelectEntry(); + OUString aName = m_pEdName->GetText(); + OUString aExpression = m_pEdRange->GetText(); if (aName.isEmpty()) { @@ -206,7 +206,7 @@ void ScNameDefDlg::AddPushed() ScRangeName* pRangeName = NULL; if(aScope == maGlobalNameStr) { - pRangeName = maRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; } else { @@ -283,7 +283,7 @@ void ScNameDefDlg::AddPushed() } } -void ScNameDefDlg::GetNewData(rtl::OUString& rName, rtl::OUString& rScope) +void ScNameDefDlg::GetNewData(OUString& rName, OUString& rScope) { rName = maName; rScope = maScope; diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 5ce90f0eda2a..cfe82ae0bf8c 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -50,7 +50,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData, - const ScAddress& aCursorPos, boost::ptr_map<rtl::OUString, ScRangeName>* pRangeMap ) + const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap ) : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_NAMES ), // @@ -94,12 +94,12 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, { if (!pRangeMap) { - std::map<rtl::OUString, ScRangeName*> aRangeMap; + std::map<OUString, ScRangeName*> aRangeMap; mpDoc->GetRangeNameMap(aRangeMap); - std::map<rtl::OUString, ScRangeName*>::iterator itr = aRangeMap.begin(), itrEnd = aRangeMap.end(); + std::map<OUString, ScRangeName*>::iterator itr = aRangeMap.begin(), itrEnd = aRangeMap.end(); for (; itr != itrEnd; ++itr) { - rtl::OUString aTemp(itr->first); + OUString aTemp(itr->first); maRangeMap.insert(aTemp, new ScRangeName(*itr->second)); } } @@ -154,7 +154,7 @@ void ScNameDlg::Init() SCTAB n = mpDoc->GetTableCount(); for (SCTAB i = 0; i < n; ++i) { - rtl::OUString aTabName; + OUString aTabName; mpDoc->GetName(i, aTabName); maLbScope.InsertEntry(aTabName); } @@ -271,8 +271,8 @@ void ScNameDlg::UpdateChecks(ScRangeData* pData) bool ScNameDlg::IsNameValid() { - rtl::OUString aScope = maLbScope.GetSelectEntry(); - rtl::OUString aName = maEdName.GetText(); + OUString aScope = maLbScope.GetSelectEntry(); + OUString aName = maEdName.GetText(); aName = aName.trim(); if (aName.isEmpty()) @@ -314,10 +314,10 @@ bool ScNameDlg::IsFormulaValid() } } -ScRangeName* ScNameDlg::GetRangeName(const rtl::OUString& rScope) +ScRangeName* ScNameDlg::GetRangeName(const OUString& rScope) { if (rScope == maGlobalNameStr) - return maRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + return maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; else return maRangeMap.find(rScope)->second; } @@ -341,7 +341,7 @@ bool ScNameDlg::AddPushed() return false; } -void ScNameDlg::SetEntry(const rtl::OUString& rName, const rtl::OUString& rScope) +void ScNameDlg::SetEntry(const OUString& rName, const OUString& rScope) { if (!rName.isEmpty()) { @@ -375,8 +375,8 @@ void ScNameDlg::NameModified() { ScRangeNameLine aLine; mpRangeManagerTable->GetCurrentLine(aLine); - rtl::OUString aOldName = aLine.aName; - rtl::OUString aNewName = maEdName.GetText(); + OUString aOldName = aLine.aName; + OUString aNewName = maEdName.GetText(); aNewName = aNewName.trim(); maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); if (aNewName != aOldName) @@ -395,12 +395,12 @@ void ScNameDlg::NameModified() return; } - rtl::OUString aOldScope = aLine.aScope; + OUString aOldScope = aLine.aScope; //empty table if (aOldScope.isEmpty()) return; - rtl::OUString aExpr = maEdAssign.GetText(); - rtl::OUString aNewScope = maLbScope.GetSelectEntry(); + OUString aExpr = maEdAssign.GetText(); + OUString aNewScope = maLbScope.GetSelectEntry(); ScRangeName* pOldRangeName = GetRangeName( aOldScope ); ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->uppercase(aOldName) ); @@ -521,7 +521,7 @@ void ScNameDlg::MorePushed() MoveWindow(maFlDiv, nPixel); } -void ScNameDlg::GetRangeNames(boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap) +void ScNameDlg::GetRangeNames(boost::ptr_map<OUString, ScRangeName>& rRangeMap) { maRangeMap.swap(rRangeMap); } diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 163cd8417997..13c486230a08 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -57,7 +57,7 @@ String createEntryString(const ScRangeNameLine& rLine) return aRet; } -ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap, const ScAddress& rPos ): +ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& rRangeMap, const ScAddress& rPos ): SvxSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE)), mrRangeMap( rRangeMap ), @@ -142,7 +142,7 @@ void ScRangeManagerTable::Init() { SetUpdateMode(false); Clear(); - for (boost::ptr_map<rtl::OUString, ScRangeName>::const_iterator itr = mrRangeMap.begin(); + for (boost::ptr_map<OUString, ScRangeName>::const_iterator itr = mrRangeMap.begin(); itr != mrRangeMap.end(); ++itr) { const ScRangeName* pLocalRangeName = itr->second; @@ -168,7 +168,7 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi { const ScRangeName* pRangeName; if (rLine.aScope == maGlobalString) - pRangeName = mrRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = mrRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; else pRangeName = mrRangeMap.find(rLine.aScope)->second; @@ -187,7 +187,7 @@ void ScRangeManagerTable::CheckForFormulaString() ScRangeNameLine aLine; GetLine( aLine, pEntry); const ScRangeData* pData = findRangeData( aLine ); - rtl::OUString aFormulaString; + OUString aFormulaString; pData->GetSymbol(aFormulaString, maPos); SetEntryText(aFormulaString, pEntry, 1); maCalculatedFormulaEntries.insert( std::pair<SvTreeListEntry*, bool>(pEntry, true) ); @@ -230,8 +230,8 @@ void ScRangeManagerTable::SetEntry(const ScRangeNameLine& rLine) { for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry)) { - if (rLine.aName == rtl::OUString(GetEntryText(pEntry, 0)) - && rLine.aScope == rtl::OUString(GetEntryText(pEntry, 2))) + if (rLine.aName == OUString(GetEntryText(pEntry, 0)) + && rLine.aScope == OUString(GetEntryText(pEntry, 2))) { SetCurEntry(pEntry); } diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index b2f0544a9085..64a296c90e0d 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -42,12 +42,12 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) get(m_pBtnClose, "close"); ScDocument* pDoc = pShell->GetDocument(); - std::map<rtl::OUString, ScRangeName*> aCopyMap; + std::map<OUString, ScRangeName*> aCopyMap; pDoc->GetRangeNameMap(aCopyMap); - std::map<rtl::OUString, ScRangeName*>::iterator itr = aCopyMap.begin(), itrEnd = aCopyMap.end(); + std::map<OUString, ScRangeName*>::iterator itr = aCopyMap.begin(), itrEnd = aCopyMap.end(); for (; itr != itrEnd; ++itr) { - rtl::OUString aTemp(itr->first); + OUString aTemp(itr->first); maRangeMap.insert(aTemp, new ScRangeName(*itr->second)); } @@ -103,7 +103,7 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) //------------------------------------------------------------------ -std::vector<rtl::OUString> ScNamePasteDlg::GetSelectedNames() const +std::vector<OUString> ScNamePasteDlg::GetSelectedNames() const { return maSelectedNames; } diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index e8c28fb88dda..2f3f2d44f73f 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -629,7 +629,7 @@ void ScContentTree::GetTableNames() if (!pDoc) return; - rtl::OUString aName; + OUString aName; SCTAB nCount = pDoc->GetTableCount(); for ( SCTAB i=0; i<nCount; i++ ) { @@ -640,12 +640,12 @@ void ScContentTree::GetTableNames() namespace { -rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName) +OUString createLocalRangeName(const OUString& rName, const OUString& rTableName) { - rtl::OUStringBuffer aString (rName); - aString.append(rtl::OUString(" (")); + OUStringBuffer aString (rName); + aString.append(OUString(" (")); aString.append(rTableName); - aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aString.append(OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); return aString.makeStringAndClear(); } } @@ -660,7 +660,7 @@ void ScContentTree::GetAreaNames() return; ScRange aDummy; - std::set<rtl::OUString> aSet; + std::set<OUString> aSet; ScRangeName* pRangeNames = pDoc->GetRangeName(); if (!pRangeNames->empty()) { @@ -676,7 +676,7 @@ void ScContentTree::GetAreaNames() ScRangeName* pLocalRangeName = pDoc->GetRangeName(i); if (pLocalRangeName && !pLocalRangeName->empty()) { - rtl::OUString aTableName; + OUString aTableName; pDoc->GetName(i, aTableName); for (ScRangeName::const_iterator itr = pLocalRangeName->begin(); itr != pLocalRangeName->end(); ++itr) { @@ -688,7 +688,7 @@ void ScContentTree::GetAreaNames() if (!aSet.empty()) { - for (std::set<rtl::OUString>::iterator itr = aSet.begin(); + for (std::set<OUString>::iterator itr = aSet.begin(); itr != aSet.end(); ++itr) { InsertContent(SC_CONTENT_RANGENAME, *itr); @@ -710,7 +710,7 @@ void ScContentTree::GetDbNames() ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = rDBs.end(); for (; itr != itrEnd; ++itr) { - const::rtl::OUString& aStrName = itr->GetName(); + const OUString& aStrName = itr->GetName(); InsertContent(SC_CONTENT_DBAREA, aStrName); } } @@ -1190,8 +1190,8 @@ void ScContentTree::DoDrag() ScDocShell* pSrcShell = NULL; if ( bHiddenDoc ) { - rtl::OUString aFilter, aOptions; - rtl::OUString aURL = aHiddenName; + OUString aFilter, aOptions; + OUString aURL = aHiddenName; pDocLoader = new ScDocumentLoader( aURL, aFilter, aOptions ); if (!pDocLoader->IsError()) pSrcShell = pDocLoader->GetDocShell(); @@ -1269,8 +1269,8 @@ sal_Bool ScContentTree::LoadFile( const String& rUrl ) aDocName.Erase(nPos); // nur der Name, ohne #... sal_Bool bReturn = false; - rtl::OUString aURL = aDocName; - rtl::OUString aFilter, aOptions; + OUString aURL = aDocName; + OUString aFilter, aOptions; ScDocumentLoader aLoader( aURL, aFilter, aOptions ); if ( !aLoader.IsError() ) { diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 43ab289aee08..d92222ceba6d 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -159,7 +159,7 @@ void ColumnEdit::Down() void ColumnEdit::First() { nCol = 1; - SetText(rtl::OUString('A')); + SetText(OUString('A')); } //------------------------------------------------------------------------ @@ -647,7 +647,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win // eListMode wird von aussen gesetzt, Root weiter unten aLbDocuments.SetDropDownLineCount(9); - rtl::OUString aOpen(" ("); + OUString aOpen(" ("); aStrActive = aOpen; aStrActive += String( ScResId( STR_ACTIVE ) ); aStrActive += ')'; // " (aktiv)" @@ -1007,13 +1007,13 @@ void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo ) } } -void ScNavigatorDlg::SetCurrentTableStr( const rtl::OUString& rName ) +void ScNavigatorDlg::SetCurrentTableStr( const OUString& rName ) { if (!GetViewData()) return; ScDocument* pDoc = pViewData->GetDocument(); SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString aTabName; + OUString aTabName; for ( SCTAB i=0; i<nCount; i++ ) { diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 250063cf2b5e..83b77e51f2a2 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -37,10 +37,10 @@ namespace { class OptionString : public SvLBoxString { - rtl::OUString maDesc; - rtl::OUString maValue; + OUString maDesc; + OUString maValue; public: - OptionString(const rtl::OUString& rDesc, const rtl::OUString& rValue) : + OptionString(const OUString& rDesc, const OUString& rValue) : maDesc(rDesc), maValue(rValue) {} virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); @@ -49,7 +49,7 @@ public: void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/) { Point aPos = rPos; - rtl::OUString aDesc = maDesc + rtl::OUString(": "); + OUString aDesc = maDesc + OUString(": "); rDev.DrawText(aPos, aDesc); aPos.X() += rDev.GetTextWidth(aDesc); @@ -141,7 +141,7 @@ void ScCalcOptionsDialog::FillOptionsList() { // Syntax for INDIRECT function. SvTreeListEntry* pEntry = new SvTreeListEntry; - pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString())); + pEntry->AddItem(new SvLBoxString(pEntry, 0, OUString())); pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); OptionString* pItem = new OptionString( maCaptionStringRefSyntax, toString(maConfig.meStringRefAddressSyntax)); @@ -152,7 +152,7 @@ void ScCalcOptionsDialog::FillOptionsList() { // Treat empty string as zero. SvTreeListEntry* pEntry = new SvTreeListEntry; - pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString())); + pEntry->AddItem(new SvLBoxString(pEntry, 0, OUString())); pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); OptionString* pItem = new OptionString( maCaptionEmptyStringAsZero, toString(maConfig.mbEmptyStringAsZero)); @@ -281,7 +281,7 @@ void ScCalcOptionsDialog::RadioValueChanged() } } -rtl::OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConvention eConv) const +OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConvention eConv) const { switch (eConv) { @@ -298,7 +298,7 @@ rtl::OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConv return maUseFormulaSyntax; } -rtl::OUString ScCalcOptionsDialog::toString(bool bVal) const +OUString ScCalcOptionsDialog::toString(bool bVal) const { return bVal ? maTrue : maFalse; } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index a1a722200df2..39ddd600b1f5 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -53,8 +53,8 @@ private: void ListOptionValueChanged(); void RadioValueChanged(); - rtl::OUString toString(formula::FormulaGrammar::AddressConvention eConv) const; - rtl::OUString toString(bool bVal) const; + OUString toString(formula::FormulaGrammar::AddressConvention eConv) const; + OUString toString(bool bVal) const; private: SvxCheckListBox maLbSettings; @@ -70,19 +70,19 @@ private: OKButton maBtnOK; CancelButton maBtnCancel; - rtl::OUString maTrue; - rtl::OUString maFalse; + OUString maTrue; + OUString maFalse; - rtl::OUString maCalcA1; - rtl::OUString maExcelA1; - rtl::OUString maExcelR1C1; + OUString maCalcA1; + OUString maExcelA1; + OUString maExcelR1C1; - rtl::OUString maCaptionStringRefSyntax; - rtl::OUString maDescStringRefSyntax; - rtl::OUString maUseFormulaSyntax; + OUString maCaptionStringRefSyntax; + OUString maDescStringRefSyntax; + OUString maUseFormulaSyntax; - rtl::OUString maCaptionEmptyStringAsZero; - rtl::OUString maDescEmptyStringAsZero; + OUString maCaptionEmptyStringAsZero; + OUString maDescEmptyStringAsZero; ScCalcConfig maConfig; }; diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 55963e2ffaff..7939ac2d71db 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -36,7 +36,6 @@ #include "defaultsoptions.hxx" #include "document.hxx" -using ::rtl::OUString; ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) : SfxTabPage(pParent, ScResId(RID_SCPAGE_DEFAULTS), rCoreSet), diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 37cd3d62d57b..4e30ebd7295d 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/LocaleDataItem.hpp> -using ::rtl::OUString; using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; @@ -92,7 +91,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreA maEdSepArrayRow.SetGetFocusHdl(aLink); // Get the decimal separator for current locale. - rtl::OUString aSep = ScGlobal::GetpLocaleData()->getNumDecimalSep(); + OUString aSep = ScGlobal::GetpLocaleData()->getNumDecimalSep(); mnDecSep = aSep.isEmpty() ? sal_Unicode('.') : aSep[0]; } @@ -102,7 +101,7 @@ ScTpFormulaOptions::~ScTpFormulaOptions() void ScTpFormulaOptions::ResetSeparators() { - rtl::OUString aFuncArg, aArrayCol, aArrayRow; + OUString aFuncArg, aArrayCol, aArrayRow; ScFormulaOptions::GetDefaultFormulaSeparators(aFuncArg, aArrayCol, aArrayRow); maEdSepFuncArg.SetText(aFuncArg); maEdSepArrayCol.SetText(aArrayCol); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 5b4f7630ea5c..35675b5ad0e9 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -317,7 +317,7 @@ void ScTpUserLists::MakeListStr( String& rListStr ) for(xub_StrLen i=0;i<nToken;i++) { - rtl::OUString aString = comphelper::string::strip(rListStr.GetToken(i, LF), ' '); + OUString aString = comphelper::string::strip(rListStr.GetToken(i, LF), ' '); aStr+=aString; aStr+=cDelimiter; } diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index d7506379aea1..471b54317099 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -56,7 +56,6 @@ const sal_uInt16 SC_AREASDLG_RR_OFFSET = 2; //============================================================================ -using ::rtl::OUString; #define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) #define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \ diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index ec432c568199..5a084d3a686c 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -624,7 +624,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) aSel.nEndPos = aPageEntry.Len(); aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); ++aSel.nEndPos; - String aPageOfEntry = rtl::OUStringBuffer().append(' '). + String aPageOfEntry = OUStringBuffer().append(' '). append(ScGlobal::GetRscString( STR_HF_OF )).append(' '). makeStringAndClear(); aWndCenter.GetEditEngine()->QuickInsertText(aPageOfEntry,ESelection(aSel.nEndPara,aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index be48bf0464e2..5fd9d40cc86f 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -333,7 +333,7 @@ void ScEditWindow::LoseFocus() break; } pAcc = new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), pEdView, this, - rtl::OUString(sName), rtl::OUString(sDescription), ScAccessibleEditObject::EditControl); + OUString(sName), OUString(sDescription), ScAccessibleEditObject::EditControl); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible = pAcc; xAcc = xAccessible; return pAcc; diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 2960ecfb558b..299d1a7c9ddc 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -539,11 +539,11 @@ void ScUndoWrapper::ForgetWrappedUndo() pWrappedUndo = NULL; // don't delete in dtor - pointer must be stored outside } -rtl::OUString ScUndoWrapper::GetComment() const +OUString ScUndoWrapper::GetComment() const { if (pWrappedUndo) return pWrappedUndo->GetComment(); - return rtl::OUString(); + return OUString(); } OUString ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index ebc0e0e98cdf..afe6f72286fe 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -110,7 +110,7 @@ ScUndoInsertCells::~ScUndoInsertCells() delete []pScenarios; } -rtl::OUString ScUndoInsertCells::GetComment() const +OUString ScUndoInsertCells::GetComment() const { return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS ); } @@ -349,7 +349,7 @@ ScUndoDeleteCells::~ScUndoDeleteCells() delete []pScenarios; } -rtl::OUString ScUndoDeleteCells::GetComment() const +OUString ScUndoDeleteCells::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // "Delete" } @@ -573,7 +573,7 @@ ScUndoDeleteMulti::~ScUndoDeleteMulti() delete [] pRanges; } -rtl::OUString ScUndoDeleteMulti::GetComment() const +OUString ScUndoDeleteMulti::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // like DeleteCells } @@ -752,7 +752,7 @@ ScUndoCut::~ScUndoCut() delete pUndoDoc; } -rtl::OUString ScUndoCut::GetComment() const +OUString ScUndoCut::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CUT ); // "cut" } @@ -867,7 +867,7 @@ ScUndoPaste::~ScUndoPaste() delete pRefRedoData; } -rtl::OUString ScUndoPaste::GetComment() const +OUString ScUndoPaste::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PASTE ); // "paste" } @@ -1138,7 +1138,7 @@ ScUndoDragDrop::~ScUndoDragDrop() { } -rtl::OUString ScUndoDragDrop::GetComment() const +OUString ScUndoDragDrop::GetComment() const { // "Move" : "Copy" return bCut ? ScGlobal::GetRscString( STR_UNDO_MOVE ) : @@ -1361,7 +1361,7 @@ ScUndoListNames::~ScUndoListNames() delete pRedoDoc; } -rtl::OUString ScUndoListNames::GetComment() const +OUString ScUndoListNames::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_LISTNAMES ); } @@ -1427,7 +1427,7 @@ ScUndoUseScenario::~ScUndoUseScenario() delete pUndoDoc; } -rtl::OUString ScUndoUseScenario::GetComment() const +OUString ScUndoUseScenario::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_USESCENARIO ); } @@ -1456,7 +1456,7 @@ void ScUndoUseScenario::Undo() for (SCTAB i = nTab+1; i<=nEndTab; i++) { // Flags always - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pUndoDoc->GetScenarioData( i, aComment, aColor, nScenFlags ); @@ -1543,7 +1543,7 @@ ScUndoSelectionStyle::~ScUndoSelectionStyle() delete pUndoDoc; } -rtl::OUString ScUndoSelectionStyle::GetComment() const +OUString ScUndoSelectionStyle::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE ); } @@ -1648,7 +1648,7 @@ ScUndoEnterMatrix::~ScUndoEnterMatrix() delete pUndoDoc; } -rtl::OUString ScUndoEnterMatrix::GetComment() const +OUString ScUndoEnterMatrix::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERMATRIX ); } @@ -1742,7 +1742,7 @@ ScUndoIndent::~ScUndoIndent() delete pUndoDoc; } -rtl::OUString ScUndoIndent::GetComment() const +OUString ScUndoIndent::GetComment() const { sal_uInt16 nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT; return ScGlobal::GetRscString( nId ); @@ -1799,7 +1799,7 @@ ScUndoTransliterate::~ScUndoTransliterate() delete pUndoDoc; } -rtl::OUString ScUndoTransliterate::GetComment() const +OUString ScUndoTransliterate::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_TRANSLITERATE ); } @@ -1864,7 +1864,7 @@ ScUndoClearItems::~ScUndoClearItems() delete pWhich; } -rtl::OUString ScUndoClearItems::GetComment() const +OUString ScUndoClearItems::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); } @@ -1919,7 +1919,7 @@ ScUndoRemoveBreaks::~ScUndoRemoveBreaks() delete pUndoDoc; } -rtl::OUString ScUndoRemoveBreaks::GetComment() const +OUString ScUndoRemoveBreaks::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMOVEBREAKS ); } @@ -1982,7 +1982,7 @@ ScUndoRemoveMerge::~ScUndoRemoveMerge() delete pUndoDoc; } -rtl::OUString ScUndoRemoveMerge::GetComment() const +OUString ScUndoRemoveMerge::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "remove merge" } @@ -2124,7 +2124,7 @@ ScUndoBorder::~ScUndoBorder() delete pInner; } -rtl::OUString ScUndoBorder::GetComment() const +OUString ScUndoBorder::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String? } diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index 9eb40e7c79c3..384c8bce7a53 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.cxx @@ -65,7 +65,7 @@ ScUndoWidthOrHeight::~ScUndoWidthOrHeight() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoWidthOrHeight::GetComment() const +OUString ScUndoWidthOrHeight::GetComment() const { // [ "optimal " ] "Column width" | "row height" return ( bWidth ? diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 317cab43df32..3c9b86a0eebb 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -99,7 +99,7 @@ ScUndoDeleteContents::~ScUndoDeleteContents() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoDeleteContents::GetComment() const +OUString ScUndoDeleteContents::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Delete" } @@ -187,7 +187,7 @@ void ScUndoDeleteContents::Undo() { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } @@ -203,7 +203,7 @@ void ScUndoDeleteContents::Redo() { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } @@ -243,7 +243,7 @@ ScUndoFillTable::~ScUndoFillTable() delete pUndoDoc; } -rtl::OUString ScUndoFillTable::GetComment() const +OUString ScUndoFillTable::GetComment() const { return ScGlobal::GetRscString( STR_FILL_TAB ); } @@ -383,7 +383,7 @@ ScUndoSelectionAttr::~ScUndoSelectionAttr() delete pUndoDoc; } -rtl::OUString ScUndoSelectionAttr::GetComment() const +OUString ScUndoSelectionAttr::GetComment() const { //"Attribute" "/Lines" return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR ); @@ -515,7 +515,7 @@ ScUndoAutoFill::~ScUndoAutoFill() delete pUndoDoc; } -rtl::OUString ScUndoAutoFill::GetComment() const +OUString ScUndoAutoFill::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_AUTOFILL ); //"Fill" } @@ -655,7 +655,7 @@ ScUndoMerge::~ScUndoMerge() DeleteSdrUndoAction( mpDrawUndo ); } -rtl::OUString ScUndoMerge::GetComment() const +OUString ScUndoMerge::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_MERGE ); } @@ -780,7 +780,7 @@ ScUndoAutoFormat::~ScUndoAutoFormat() delete pUndoDoc; } -rtl::OUString ScUndoAutoFormat::GetComment() const +OUString ScUndoAutoFormat::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format" } @@ -961,7 +961,7 @@ void ScUndoReplace::SetChangeTrack() nStartChangeAction = nEndChangeAction = 0; } -rtl::OUString ScUndoReplace::GetComment() const +OUString ScUndoReplace::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Replace" } @@ -1116,7 +1116,7 @@ ScUndoTabOp::~ScUndoTabOp() delete pUndoDoc; } -rtl::OUString ScUndoTabOp::GetComment() const +OUString ScUndoTabOp::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Multiple operation" } @@ -1209,9 +1209,9 @@ void ScUndoConversion::SetChangeTrack() nStartChangeAction = nEndChangeAction = 0; } -rtl::OUString ScUndoConversion::GetComment() const +OUString ScUndoConversion::GetComment() const { - rtl::OUString aText; + OUString aText; switch( maConvParam.GetType() ) { case SC_CONVERSION_SPELLCHECK: aText = ScGlobal::GetRscString( STR_UNDO_SPELLING ); break; @@ -1295,7 +1295,7 @@ ScUndoRefConversion::~ScUndoRefConversion() delete pRedoDoc; } -rtl::OUString ScUndoRefConversion::GetComment() const +OUString ScUndoRefConversion::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input" } @@ -1375,7 +1375,7 @@ ScUndoRefreshLink::~ScUndoRefreshLink() delete pRedoDoc; } -rtl::OUString ScUndoRefreshLink::GetComment() const +OUString ScUndoRefreshLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); } @@ -1506,7 +1506,7 @@ ScUndoInsertAreaLink::~ScUndoInsertAreaLink() { } -rtl::OUString ScUndoInsertAreaLink::GetComment() const +OUString ScUndoInsertAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_INSERTAREALINK ); } @@ -1568,7 +1568,7 @@ ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink() { } -rtl::OUString ScUndoRemoveAreaLink::GetComment() const +OUString ScUndoRemoveAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ?? } @@ -1644,7 +1644,7 @@ ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink() delete pRedoDoc; } -rtl::OUString ScUndoUpdateAreaLink::GetComment() const +OUString ScUndoUpdateAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! own text ?? } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 40ca1da9c02b..01873318e58a 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -83,7 +83,7 @@ ScUndoCursorAttr::~ScUndoCursorAttr() pPool->Remove(*pApplyPattern); } -rtl::OUString ScUndoCursorAttr::GetComment() const +OUString ScUndoCursorAttr::GetComment() const { //! own text for automatic attribution @@ -181,7 +181,7 @@ ScUndoEnterData::ScUndoEnterData( ScUndoEnterData::~ScUndoEnterData() {} -rtl::OUString ScUndoEnterData::GetComment() const +OUString ScUndoEnterData::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input" } @@ -267,7 +267,7 @@ void ScUndoEnterData::Undo() { aChangeRanges.Append( ScRange(maPos.Col(), maPos.Row(), maOldValues[i].mnTab)); } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } @@ -306,7 +306,7 @@ void ScUndoEnterData::Redo() { aChangeRanges.Append(ScRange(maPos.Col(), maPos.Row(), maOldValues[i].mnTab)); } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } @@ -340,7 +340,7 @@ ScUndoEnterValue::~ScUndoEnterValue() { } -rtl::OUString ScUndoEnterValue::GetComment() const +OUString ScUndoEnterValue::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input" } @@ -517,7 +517,7 @@ ScUndoPageBreak::~ScUndoPageBreak() { } -rtl::OUString ScUndoPageBreak::GetComment() const +OUString ScUndoPageBreak::GetComment() const { //"Column break" | "Row break" "insert" | "delete" return String ( bColumn ? @@ -596,7 +596,7 @@ ScUndoPrintZoom::~ScUndoPrintZoom() { } -rtl::OUString ScUndoPrintZoom::GetComment() const +OUString ScUndoPrintZoom::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PRINTSCALE ); } @@ -685,7 +685,7 @@ ScUndoThesaurus::~ScUndoThesaurus() delete pRedoTObject; } -rtl::OUString ScUndoThesaurus::GetComment() const +OUString ScUndoThesaurus::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus" } @@ -844,7 +844,7 @@ sal_Bool ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const return false; } -rtl::OUString ScUndoReplaceNote::GetComment() const +OUString ScUndoReplaceNote::GetComment() const { return ScGlobal::GetRscString( maNewData.mpCaption ? (maOldData.mpCaption ? STR_UNDO_EDITNOTE : STR_UNDO_INSERTNOTE) : STR_UNDO_DELETENOTE ); @@ -914,7 +914,7 @@ sal_Bool ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const return false; } -rtl::OUString ScUndoShowHideNote::GetComment() const +OUString ScUndoShowHideNote::GetComment() const { return ScGlobal::GetRscString( mbShown ? STR_UNDO_SHOWNOTE : STR_UNDO_HIDENOTE ); } @@ -941,7 +941,7 @@ ScUndoDetective::~ScUndoDetective() delete pOldList; } -rtl::OUString ScUndoDetective::GetComment() const +OUString ScUndoDetective::GetComment() const { sal_uInt16 nId = STR_UNDO_DETDELALL; if ( !bIsDelete ) @@ -1039,7 +1039,7 @@ ScUndoRangeNames::~ScUndoRangeNames() delete pNewRanges; } -rtl::OUString ScUndoRangeNames::GetComment() const +OUString ScUndoRangeNames::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_RANGENAMES ); } diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 81106e5c0550..2a631d5a8c44 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -87,7 +87,7 @@ ScUndoDoOutline::~ScUndoDoOutline() delete pUndoDoc; } -rtl::OUString ScUndoDoOutline::GetComment() const +OUString ScUndoDoOutline::GetComment() const { // Show outline" "Hide outline" return bShow ? ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) : @@ -176,7 +176,7 @@ ScUndoMakeOutline::~ScUndoMakeOutline() delete pUndoTable; } -rtl::OUString ScUndoMakeOutline::GetComment() const +OUString ScUndoMakeOutline::GetComment() const { // "Grouping" "Undo grouping" return bMake ? ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) : @@ -261,7 +261,7 @@ ScUndoOutlineLevel::~ScUndoOutlineLevel() delete pUndoTable; } -rtl::OUString ScUndoOutlineLevel::GetComment() const +OUString ScUndoOutlineLevel::GetComment() const { // "Select outline level" return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL ); } @@ -346,7 +346,7 @@ ScUndoOutlineBlock::~ScUndoOutlineBlock() delete pUndoTable; } -rtl::OUString ScUndoOutlineBlock::GetComment() const +OUString ScUndoOutlineBlock::GetComment() const { // "Show outline" "Hide outline" return bShow ? ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) : @@ -447,7 +447,7 @@ ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines() delete pUndoTable; } -rtl::OUString ScUndoRemoveAllOutlines::GetComment() const +OUString ScUndoRemoveAllOutlines::GetComment() const { // "Remove outlines" return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS ); } @@ -532,7 +532,7 @@ ScUndoAutoOutline::~ScUndoAutoOutline() delete pUndoTable; } -rtl::OUString ScUndoAutoOutline::GetComment() const +OUString ScUndoAutoOutline::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE ); } @@ -641,7 +641,7 @@ ScUndoSubTotals::~ScUndoSubTotals() delete pUndoDB; } -rtl::OUString ScUndoSubTotals::GetComment() const +OUString ScUndoSubTotals::GetComment() const { // "Subtotals" return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS ); } @@ -765,7 +765,7 @@ ScUndoSort::~ScUndoSort() delete pUndoDB; } -rtl::OUString ScUndoSort::GetComment() const +OUString ScUndoSort::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_SORT ); } @@ -891,7 +891,7 @@ ScUndoQuery::~ScUndoQuery() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoQuery::GetComment() const +OUString ScUndoQuery::GetComment() const { // "Filter"; return ScGlobal::GetRscString( STR_UNDO_QUERY ); } @@ -1029,7 +1029,7 @@ sal_Bool ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const // Show or hide AutoFilter buttons (doesn't include filter settings) ScUndoAutoFilter::ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange, - const ::rtl::OUString& rName, bool bSet ) : + const OUString& rName, bool bSet ) : ScDBFuncUndo( pNewDocShell, rRange ), aDBName( rName ), bFilterSet( bSet ) @@ -1040,7 +1040,7 @@ ScUndoAutoFilter::~ScUndoAutoFilter() { } -rtl::OUString ScUndoAutoFilter::GetComment() const +OUString ScUndoAutoFilter::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_QUERY ); // same as ScUndoQuery } @@ -1120,7 +1120,7 @@ ScUndoDBData::~ScUndoDBData() delete pRedoColl; } -rtl::OUString ScUndoDBData::GetComment() const +OUString ScUndoDBData::GetComment() const { // "Change database range"; return ScGlobal::GetRscString( STR_UNDO_DBDATA ); } @@ -1198,7 +1198,7 @@ ScUndoImportData::~ScUndoImportData() delete pRedoDBData; } -rtl::OUString ScUndoImportData::GetComment() const +OUString ScUndoImportData::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA ); } @@ -1417,7 +1417,7 @@ ScUndoRepeatDB::~ScUndoRepeatDB() delete pUndoDB; } -rtl::OUString ScUndoRepeatDB::GetComment() const +OUString ScUndoRepeatDB::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REPEATDB ); } @@ -1571,7 +1571,7 @@ ScUndoDataPilot::~ScUndoDataPilot() delete pNewUndoDoc; } -rtl::OUString ScUndoDataPilot::GetComment() const +OUString ScUndoDataPilot::GetComment() const { sal_uInt16 nIndex; if ( pOldUndoDoc && pNewUndoDoc ) @@ -1728,7 +1728,7 @@ ScUndoConsolidate::~ScUndoConsolidate() delete pUndoData; } -rtl::OUString ScUndoConsolidate::GetComment() const +OUString ScUndoConsolidate::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CONSOLIDATE ); } @@ -1885,7 +1885,7 @@ ScUndoChartData::~ScUndoChartData() { } -rtl::OUString ScUndoChartData::GetComment() const +OUString ScUndoChartData::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CHARTDATA ); } @@ -1958,7 +1958,7 @@ ScUndoDataForm::~ScUndoDataForm() delete pRefRedoData; } -rtl::OUString ScUndoDataForm::GetComment() const +OUString ScUndoDataForm::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PASTE ); } diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx index c91f4f7dd000..fc047c117afe 100644 --- a/sc/source/ui/undo/undodraw.cxx +++ b/sc/source/ui/undo/undodraw.cxx @@ -41,11 +41,11 @@ void ScUndoDraw::ForgetDrawUndo() pDrawUndo = NULL; // do not delete (DrawUndo has to be remembered from outside) } -rtl::OUString ScUndoDraw::GetComment() const +OUString ScUndoDraw::GetComment() const { if (pDrawUndo) return pDrawUndo->GetComment(); - return rtl::OUString(); + return OUString(); } OUString ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx index 9330c3680fcb..fbc447246815 100644 --- a/sc/source/ui/undo/undorangename.cxx +++ b/sc/source/ui/undo/undorangename.cxx @@ -41,11 +41,11 @@ using ::std::auto_ptr; ScUndoAllRangeNames::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) : ScSimpleUndo(pDocSh) { - std::map<rtl::OUString, ScRangeName*>::const_iterator itr, itrEnd; + std::map<OUString, ScRangeName*>::const_iterator itr, itrEnd; for (itr = rOldNames.begin(), itrEnd = rOldNames.end(); itr != itrEnd; ++itr) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -54,7 +54,7 @@ ScUndoAllRangeNames::ScUndoAllRangeNames( maOldNames.insert(itr->first, p); } - boost::ptr_map<rtl::OUString, ScRangeName>::const_iterator it, itEnd; + boost::ptr_map<OUString, ScRangeName>::const_iterator it, itEnd; for (it = rNewNames.begin(), itEnd = rNewNames.end(); it != itEnd; ++it) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -87,12 +87,12 @@ sal_Bool ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const return sal_False; } -rtl::OUString ScUndoAllRangeNames::GetComment() const +OUString ScUndoAllRangeNames::GetComment() const { return ScGlobal::GetRscString(STR_UNDO_RANGENAMES); } -void ScUndoAllRangeNames::DoChange(const boost::ptr_map<rtl::OUString, ScRangeName>& rNames) +void ScUndoAllRangeNames::DoChange(const boost::ptr_map<OUString, ScRangeName>& rNames) { ScDocument& rDoc = *pDocShell->GetDocument(); @@ -160,7 +160,7 @@ sal_Bool ScUndoAddRangeData::CanRepeat(SfxRepeatTarget& /*rTarget*/) const return sal_False; } -rtl::OUString ScUndoAddRangeData::GetComment() const +OUString ScUndoAddRangeData::GetComment() const { return ScGlobal::GetRscString(STR_UNDO_RANGENAMES); } diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 0f8aa68f5cdd..5125bbaf4a83 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -101,7 +101,7 @@ ScUndoModifyStyle::~ScUndoModifyStyle() { } -rtl::OUString ScUndoModifyStyle::GetComment() const +OUString ScUndoModifyStyle::GetComment() const { sal_uInt16 nId = (eFamily == SFX_STYLE_FAMILY_PARA) ? STR_UNDO_EDITCELLSTYLE : @@ -255,7 +255,7 @@ void ScUndoApplyPageStyle::AddSheetAction( SCTAB nTab, const String& rOldStyle ) maEntries.push_back( ApplyStyleEntry( nTab, rOldStyle ) ); } -rtl::OUString ScUndoApplyPageStyle::GetComment() const +OUString ScUndoApplyPageStyle::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_APPLYPAGESTYLE ); } diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index a45b6488007b..3c1ef777c401 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -53,7 +53,6 @@ extern sal_Bool bDrawIsInUndo; // somewhere as member! using namespace com::sun::star; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::std::auto_ptr; using ::std::vector; using ::boost::shared_ptr; @@ -93,7 +92,7 @@ ScUndoInsertTab::~ScUndoInsertTab() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoInsertTab::GetComment() const +OUString ScUndoInsertTab::GetComment() const { if (bAppend) return ScGlobal::GetRscString( STR_UNDO_APPEND_TAB ); @@ -170,7 +169,7 @@ sal_Bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, - std::vector<rtl::OUString>& newNameList) : + std::vector<OUString>& newNameList) : ScSimpleUndo( pNewDocShell ), pDrawUndo( NULL ), aNameList( newNameList ), @@ -186,7 +185,7 @@ ScUndoInsertTables::~ScUndoInsertTables() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoInsertTables::GetComment() const +OUString ScUndoInsertTables::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB ); } @@ -276,7 +275,7 @@ ScUndoDeleteTab::~ScUndoDeleteTab() theTabs.clear(); } -rtl::OUString ScUndoDeleteTab::GetComment() const +OUString ScUndoDeleteTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETE_TAB ); } @@ -317,7 +316,7 @@ void ScUndoDeleteTab::Undo() ScDocument* pDoc = pDocShell->GetDocument(); sal_Bool bLink = false; - rtl::OUString aName; + OUString aName; for(i=0; i<theTabs.size(); ++i) { @@ -331,7 +330,7 @@ void ScUndoDeleteTab::Undo() { pRefUndoDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,false, pDoc ); - rtl::OUString aOldName; + OUString aOldName; pRefUndoDoc->GetName( nTab, aOldName ); pDoc->RenameTab( nTab, aOldName, false ); if (pRefUndoDoc->IsLinked(nTab)) @@ -345,7 +344,7 @@ void ScUndoDeleteTab::Undo() if ( pRefUndoDoc->IsScenario(nTab) ) { pDoc->SetScenario( nTab, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pRefUndoDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags ); @@ -437,7 +436,7 @@ ScUndoRenameTab::~ScUndoRenameTab() { } -rtl::OUString ScUndoRenameTab::GetComment() const +OUString ScUndoRenameTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_RENAME_TAB ); } @@ -499,7 +498,7 @@ ScUndoMoveTab::~ScUndoMoveTab() { } -rtl::OUString ScUndoMoveTab::GetComment() const +OUString ScUndoMoveTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_MOVE_TAB ); } @@ -606,7 +605,7 @@ ScUndoCopyTab::~ScUndoCopyTab() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoCopyTab::GetComment() const +OUString ScUndoCopyTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_COPY_TAB ); } @@ -685,7 +684,7 @@ void ScUndoCopyTab::Redo() if ( pDoc->IsScenario(nAdjSource) ) { pDoc->SetScenario(nNewTab, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pDoc->GetScenarioData(nAdjSource, aComment, aColor, nScenFlags ); @@ -747,7 +746,7 @@ ScUndoTabColor::~ScUndoTabColor() { } -rtl::OUString ScUndoTabColor::GetComment() const +OUString ScUndoTabColor::GetComment() const { if (aTabColorList.size() > 1) return ScGlobal::GetRscString(STR_UNDO_SET_MULTI_TAB_BG_COLOR); @@ -816,7 +815,7 @@ ScUndoMakeScenario::~ScUndoMakeScenario() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoMakeScenario::GetComment() const +OUString ScUndoMakeScenario::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_MAKESCENARIO ); } @@ -897,7 +896,7 @@ ScUndoImportTab::~ScUndoImportTab() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoImportTab::GetComment() const +OUString ScUndoImportTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB ); } @@ -936,7 +935,7 @@ void ScUndoImportTab::Undo() pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); pRedoDoc->InitUndo( pDoc, nTab,nTab+nCount-1, sal_True,sal_True ); - rtl::OUString aOldName; + OUString aOldName; for (i=0; i<nCount; i++) { SCTAB nTabPos=nTab+i; @@ -949,7 +948,7 @@ void ScUndoImportTab::Undo() if ( pDoc->IsScenario(nTabPos) ) { pRedoDoc->SetScenario(nTabPos, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pDoc->GetScenarioData(nTabPos, aComment, aColor, nScenFlags ); @@ -985,7 +984,7 @@ void ScUndoImportTab::Redo() } ScDocument* pDoc = pDocShell->GetDocument(); - rtl::OUString aName; + OUString aName; SCTAB i; for (i=0; i<nCount; i++) // first insert all sheets (#63304#) { @@ -1004,7 +1003,7 @@ void ScUndoImportTab::Redo() if ( pRedoDoc->IsScenario(nTabPos) ) { pDoc->SetScenario(nTabPos, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pRedoDoc->GetScenarioData(nTabPos, aComment, aColor, nScenFlags ); @@ -1051,7 +1050,7 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) : { sal_uInt8 nMode = pDoc->GetLinkMode(i); if (nMode) - if (pDoc->GetLinkDoc(i) == rtl::OUString(aDocName)) + if (pDoc->GetLinkDoc(i) == OUString(aDocName)) { if (!nCount) { @@ -1061,8 +1060,8 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) : } else { - OSL_ENSURE(rtl::OUString(aFltName) == pDoc->GetLinkFlt(i) && - rtl::OUString(aOptions) == pDoc->GetLinkOpt(i), + OSL_ENSURE(OUString(aFltName) == pDoc->GetLinkFlt(i) && + OUString(aOptions) == pDoc->GetLinkOpt(i), "different Filter for a Document?"); } pTabs[nCount] = i; @@ -1080,7 +1079,7 @@ ScUndoRemoveLink::~ScUndoRemoveLink() delete[] pTabNames; } -rtl::OUString ScUndoRemoveLink::GetComment() const +OUString ScUndoRemoveLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); } @@ -1170,7 +1169,7 @@ sal_Bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } -rtl::OUString ScUndoShowHideTab::GetComment() const +OUString ScUndoShowHideTab::GetComment() const { sal_uInt16 nId; if (undoTabs.size() > 1) @@ -1250,7 +1249,7 @@ sal_Bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // makes no sense } -rtl::OUString ScUndoDocProtect::GetComment() const +OUString ScUndoDocProtect::GetComment() const { sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC; return ScGlobal::GetRscString( nId ); @@ -1322,7 +1321,7 @@ sal_Bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // makes no sense } -rtl::OUString ScUndoTabProtect::GetComment() const +OUString ScUndoTabProtect::GetComment() const { sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB; return ScGlobal::GetRscString( nId ); @@ -1384,7 +1383,7 @@ sal_Bool ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // makes no sense } -rtl::OUString ScUndoPrintRange::GetComment() const +OUString ScUndoPrintRange::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PRINTRANGES ); } @@ -1409,7 +1408,7 @@ ScUndoScenarioFlags::~ScUndoScenarioFlags() { } -rtl::OUString ScUndoScenarioFlags::GetComment() const +OUString ScUndoScenarioFlags::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_EDITSCENARIO ); } @@ -1472,7 +1471,7 @@ ScUndoRenameObject::~ScUndoRenameObject() { } -rtl::OUString ScUndoRenameObject::GetComment() const +OUString ScUndoRenameObject::GetComment() const { // string resource shared with title for dialog return String( ScResId(SCSTR_RENAMEOBJECT) ); @@ -1584,7 +1583,7 @@ sal_Bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } -rtl::OUString ScUndoLayoutRTL::GetComment() const +OUString ScUndoLayoutRTL::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_TAB_RTL ); } diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 06a1f1937775..e36813751ada 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -80,7 +80,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB bool bWasTemp = false; if ( pUndoData ) { - const ::rtl::OUString& aName = pUndoData->GetName(); + const OUString& aName = pUndoData->GetName(); if ( aName == STR_DB_LOCAL_NONAME ) bWasTemp = true; } @@ -89,7 +89,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB pRet = pDoc->GetAnonymousDBData(nTab); if (!pRet) { - pRet = new ScDBData( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), nTab, + pRet = new ScDBData( OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), nTab, nCol1,nRow1, nCol2,nRow2, sal_True, pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) ); pDoc->SetAnonymousDBData(nTab,pRet); diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx index 94724946dd18..d3a4939a03a6 100644 --- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx +++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; SC_SIMPLE_SERVICE_INFO( ScChartRangeSelectionListener, "ScChartRangeSelectionListener", SC_SERVICENAME_CHRANGEHILIGHT ) diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index c8b241118531..3b1890d9e0b1 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -102,11 +102,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp static SfxItemPropertyMapEntry aPropertyMap[] = { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellRangeAddress*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap )); @@ -117,11 +117,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp static SfxItemPropertyMapEntry aPropertyMap[] = { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellAddress*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap )); @@ -129,7 +129,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp } } -void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue ) +void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -174,7 +174,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr else if ( aNameStr.EqualsAscii( SC_UNONAME_UIREPR ) ) { // parse the UI representation string - rtl::OUString sRepresentation; + OUString sRepresentation; if (aValue >>= sRepresentation) { String aUIString = sRepresentation; @@ -187,7 +187,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr ::formula::FormulaGrammar::CONV_XL_A1 : ::formula::FormulaGrammar::CONV_OOO; // parse the file format string - rtl::OUString sRepresentation; + OUString sRepresentation; if (aValue >>= sRepresentation) { String aUIString(sRepresentation); @@ -199,7 +199,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr if ( bIsRange ) { // range: also strip a "." after the last colon - sal_Int32 nColon = rtl::OUString(aUIString).lastIndexOf( (sal_Unicode) ':' ); + sal_Int32 nColon = OUString(aUIString).lastIndexOf( (sal_Unicode) ':' ); if ( nColon >= 0 && nColon < aUIString.Len() - 1 && aUIString.GetChar((xub_StrLen)nColon+1) == (sal_Unicode) '.' ) aUIString.Erase( (xub_StrLen)nColon+1, 1 ); @@ -216,7 +216,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr throw lang::IllegalArgumentException(); } -uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -257,7 +257,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aRange.Format( aFormatStr, nFlags, pDoc ); else aRange.aStart.Format( aFormatStr, nFlags, pDoc ); - aRet <<= rtl::OUString( aFormatStr ); + aRet <<= OUString( aFormatStr ); } else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XLA1REPR ) ) { @@ -278,7 +278,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aRange.aEnd.Format( aSecond, nFlags, pDoc, eConv ); aFormatStr.Append( aSecond ); } - aRet <<= rtl::OUString( aFormatStr ); + aRet <<= OUString( aFormatStr ); } else throw beans::UnknownPropertyException(); @@ -290,12 +290,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAddressConversionObj" ); + return OUString("ScAddressConversionObj" ); } -sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -303,13 +303,13 @@ sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& : SC_SERVICENAME_CELLADDRESS ); } -uno::Sequence<rtl::OUString> SAL_CALL ScAddressConversionObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAddressConversionObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = bIsRange ? rtl::OUString(SC_SERVICENAME_RANGEADDRESS) - : rtl::OUString(SC_SERVICENAME_CELLADDRESS); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = bIsRange ? OUString(SC_SERVICENAME_RANGEADDRESS) + : OUString(SC_SERVICENAME_CELLADDRESS); return aRet; } diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 33a788dfcbb2..4240c223fbec 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -102,15 +102,15 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -153,13 +153,13 @@ SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_S //------------------------------------------------------------------------ -static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const rtl::OUString& rName, sal_uInt16& rOutIndex ) +static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex ) { ScAutoFormat::const_iterator itBeg = rFormats.begin(), itEnd = rFormats.end(); for (ScAutoFormat::const_iterator it = itBeg; it != itEnd; ++it) { const ScAutoFormatData* pEntry = it->second; - const rtl::OUString& aEntryName = pEntry->GetName(); + const OUString& aEntryName = pEntry->GetName(); if ( aEntryName.equals(rName) ) { size_t nPos = std::distance(itBeg, it); @@ -193,16 +193,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance( return xInst; } -rtl::OUString ScAutoFormatsObj::getImplementationName_Static() +OUString ScAutoFormatsObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScAutoFormatsObj" ); + return OUString( "stardiv.StarCalc.ScAutoFormatsObj" ); } -uno::Sequence<rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); return aRet; } @@ -216,7 +216,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) return NULL; // falscher Index } -ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const OUString& aName) { String aString(aName); sal_uInt16 nIndex; @@ -228,7 +228,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const rtl::OUString& aNa // container::XNameContainer -void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -282,7 +282,7 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -292,7 +292,7 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const insertByName( aName, aElement ); } -void SAL_CALL ScAutoFormatsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -319,7 +319,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess @@ -355,7 +355,7 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScAutoFormatsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -366,13 +366,13 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const rtl::OUString& aName ) return uno::makeAny(xFormat); } -uno::Sequence<rtl::OUString> SAL_CALL ScAutoFormatsObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); - uno::Sequence<rtl::OUString> aSeq(pFormats->size()); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(pFormats->size()); + OUString* pAry = aSeq.getArray(); ScAutoFormat::const_iterator it = pFormats->begin(), itEnd = pFormats->end(); for (size_t i = 0; it != itEnd; ++it, ++i) { @@ -381,7 +381,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAutoFormatsObj::getElementNames() return aSeq; } -sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -477,7 +477,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess @@ -519,17 +519,17 @@ sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException) // container::XNamed -rtl::OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); if (IsInserted() && nFormatIndex < pFormats->size()) return pFormats->findByIndex(nFormatIndex)->GetName(); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScAutoFormatObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -582,7 +582,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySet } void SAL_CALL ScAutoFormatObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -616,7 +616,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue( } } -uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -687,7 +687,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getProper } void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -791,7 +791,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( } } -uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 906a227a548d..41fc7ae9663b 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -44,74 +44,74 @@ using namespace com::sun::star; //------------------------------------------------------------------------ // Calc document -extern uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScDocument_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScDocument_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags ) throw( uno::Exception ); // Calc XML import -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); // Calc XML export -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); // Calc XML Oasis export -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); @@ -152,7 +152,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() {MAP_CHAR_LEN(SC_UNONAME_RANGEFIN), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SCALE), 0, &getCppuType((sal_Int16*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_STBFUNC), 0, &getCppuType((sal_Int16*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_ULISTS), 0, &getCppuType((uno::Sequence<rtl::OUString>*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_ULISTS), 0, &getCppuType((uno::Sequence<OUString>*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_PRMETRICS),0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_USETABCOL),0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_REPLWARN), 0, &getBooleanCppuType(), 0, 0}, @@ -182,7 +182,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( return NULL; uno::Reference<lang::XSingleServiceFactory> xFactory; - rtl::OUString aImpl(rtl::OUString::createFromAscii(pImplName)); + OUString aImpl(OUString::createFromAscii(pImplName)); if ( aImpl == ScSpreadsheetSettings::getImplementationName_Static() ) xFactory.set(cppu::createOneInstanceFactory( @@ -365,16 +365,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( return xInst; } -rtl::OUString ScSpreadsheetSettings::getImplementationName_Static() +OUString ScSpreadsheetSettings::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScSpreadsheetSettings" ); + return OUString( "stardiv.StarCalc.ScSpreadsheetSettings" ); } -uno::Sequence<rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); return aRet; } @@ -390,7 +390,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPrope } void SAL_CALL ScSpreadsheetSettings::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -499,7 +499,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( else if (aString.EqualsAscii( SC_UNONAME_ULISTS )) { ScUserList* pUserList = ScGlobal::GetUserList(); - uno::Sequence<rtl::OUString> aSeq; + uno::Sequence<OUString> aSeq; if ( pUserList && ( aValue >>= aSeq ) ) { // es wird direkt die "lebende" Liste veraendert, @@ -507,7 +507,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( pUserList->clear(); // alle Eintraege raus sal_uInt16 nCount = (sal_uInt16)aSeq.getLength(); - const rtl::OUString* pAry = aSeq.getConstArray(); + const OUString* pAry = aSeq.getConstArray(); for (sal_uInt16 i=0; i<nCount; i++) { String aEntry = pAry[i]; @@ -537,7 +537,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( pScMod->SetInputOptions( aInpOpt ); } -uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -586,8 +586,8 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& if (pUserList) { size_t nCount = pUserList->size(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (size_t i=0; i<nCount; ++i) { String aEntry((*pUserList)[i]->GetString()); @@ -627,16 +627,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( return xInst; } -rtl::OUString ScRecentFunctionsObj::getImplementationName_Static() +OUString ScRecentFunctionsObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScRecentFunctionsObj" ); + return OUString( "stardiv.StarCalc.ScRecentFunctionsObj" ); } -uno::Sequence<rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); return aRet; } @@ -708,16 +708,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( return xInst; } -rtl::OUString ScFunctionListObj::getImplementationName_Static() +OUString ScFunctionListObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScFunctionListObj" ); + return OUString( "stardiv.StarCalc.ScFunctionListObj" ); } -uno::Sequence<rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScFunctionListObj::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); return aRet; } @@ -730,21 +730,21 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co beans::PropertyValue* pArray = rSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); pArray[0].Value <<= (sal_Int32) rDesc.nFIndex; - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); pArray[1].Value <<= (sal_Int32) rDesc.nCategory; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); if (rDesc.pFuncName) - pArray[2].Value <<= rtl::OUString( *rDesc.pFuncName ); + pArray[2].Value <<= OUString( *rDesc.pFuncName ); - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); if (rDesc.pFuncDesc) - pArray[3].Value <<= rtl::OUString( *rDesc.pFuncDesc ); + pArray[3].Value <<= OUString( *rDesc.pFuncDesc ); - pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); + pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags ) { sal_uInt16 nCount = rDesc.nArgCount; @@ -811,12 +811,12 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int // XNameAccess -uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aNameStr(aName); + OUString aNameStr(aName); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -882,7 +882,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); } // XElementAccess @@ -899,15 +899,15 @@ sal_Bool SAL_CALL ScFunctionListObj::hasElements() throw(uno::RuntimeException) return ( getCount() > 0 ); } -uno::Sequence<rtl::OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { sal_uInt32 nCount = pFuncList->GetCount(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) { const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex); @@ -916,10 +916,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScFunctionListObj::getElementNames() throw } return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScFunctionListObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 0109379986c8..6578da838f05 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -79,7 +79,7 @@ namespace calc // register our property at the base class CellRangeAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString( "CellRange" ), + OUString( "CellRange" ), PROP_HANDLE_RANGE_ADDRESS, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -174,17 +174,17 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.sheet.OCellListSource" ); + return OUString( "com.sun.star.comp.sheet.OCellListSource" ); } //-------------------------------------------------------------------- - sal_Bool SAL_CALL OCellListSource::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupportedServices( getSupportedServiceNames() ); - const ::rtl::OUString* pLookup = aSupportedServices.getConstArray(); - const ::rtl::OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); + Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); + const OUString* pLookup = aSupportedServices.getConstArray(); + const OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); while ( pLookup != pLookupEnd ) if ( *pLookup++ == _rServiceName ) return sal_True; @@ -193,11 +193,11 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellRangeListSource" ); - aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ListEntrySource" ); + Sequence< OUString > aServices( 2 ); + aServices[ 0 ] = OUString( "com.sun.star.table.CellRangeListSource" ); + aServices[ 1 ] = OUString( "com.sun.star.form.binding.ListEntrySource" ); return aServices; } @@ -214,14 +214,14 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) + OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) { OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" ); Reference< XTextRange > xCellText; if ( m_xRange.is() ) xCellText.set(xCellText.query( m_xRange->getCellByPosition( _nRangeRelativeColumn, _nRangeRelativeRow ) )); - ::rtl::OUString sText; + OUString sText; if ( xCellText.is() ) sText = xCellText->getString(); return sText; @@ -240,7 +240,7 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException) + OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); DBG_CHKTHIS( OCellListSource, checkConsistency_static ); @@ -254,15 +254,15 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); DBG_CHKTHIS( OCellListSource, checkConsistency_static ); checkDisposed(); checkInitialized(); - Sequence< ::rtl::OUString > aAllEntries( getListEntryCount() ); - ::rtl::OUString* pAllEntries = aAllEntries.getArray(); + Sequence< OUString > aAllEntries( getListEntryCount() ); + OUString* pAllEntries = aAllEntries.getArray(); for ( sal_Int32 i = 0; i < aAllEntries.getLength(); ++i ) { *pAllEntries++ = getCellTextContent_noCheck( 0, i ); diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 07a46e2b37d2..469eb10f25e2 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -89,8 +89,8 @@ namespace calc // XListEntrySource virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); @@ -98,9 +98,9 @@ namespace calc virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -140,7 +140,7 @@ namespace calc @precond our m_xRange is not <NULL/> */ - ::rtl::OUString + OUString getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 1cb7552f6116..2d4a3bfa4ca1 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -155,13 +155,13 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() { static SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -173,15 +173,15 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -250,7 +250,7 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellsPropertySet( aCellsPropertyMap_Impl ); @@ -264,13 +264,13 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() { static SfxItemPropertyMapEntry aRangePropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -282,15 +282,15 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -374,13 +374,13 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() { static SfxItemPropertyMapEntry aCellPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -392,15 +392,15 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -432,7 +432,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, &getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -474,7 +474,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl ); @@ -488,13 +488,13 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() { static SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -506,15 +506,15 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -600,13 +600,13 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() { static SfxItemPropertyMapEntry aRowPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -618,15 +618,15 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -713,7 +713,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() { static SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BORDCOL), SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0), 0, 0 }, @@ -721,7 +721,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -733,15 +733,15 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -785,11 +785,11 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS @@ -825,7 +825,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const OUString * >(0)), 0, 0}, {MAP_CHAR_LEN(SC_UNO_NAMEDRANGES), SC_WID_UNO_NAMES, &getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0, 0 }, {0,0,0,0,0,0} }; @@ -905,7 +905,7 @@ static void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& sal_uLong nCount = aSeq.getLength(); for (sal_uLong i=0; i<nCount; i++) { - rtl::OUString aName(pAry[i].Name); + OUString aName(pAry[i].Name); rDest.setPropertyValue( aName, rSource.getPropertyValue( aName ) ); } } @@ -1230,7 +1230,7 @@ static sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, case uno::TypeClass_STRING: { - rtl::OUString aUStr; + OUString aUStr; rElement >>= aUStr; if ( !aUStr.isEmpty() ) { @@ -1289,7 +1289,7 @@ static sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, } static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, - const uno::Sequence< uno::Sequence<rtl::OUString> >& aData, + const uno::Sequence< uno::Sequence<OUString> >& aData, const formula::FormulaGrammar::Grammar eGrammar ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -1308,7 +1308,7 @@ static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRang long nCols = 0; long nRows = aData.getLength(); - const uno::Sequence<rtl::OUString>* pArray = aData.getConstArray(); + const uno::Sequence<OUString>* pArray = aData.getConstArray(); if ( nRows ) nCols = pArray[0].getLength(); @@ -1332,11 +1332,11 @@ static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRang SCROW nDocRow = nStartRow; for (long nRow=0; nRow<nRows; nRow++) { - const uno::Sequence<rtl::OUString>& rColSeq = pArray[nRow]; + const uno::Sequence<OUString>& rColSeq = pArray[nRow]; if ( rColSeq.getLength() == nCols ) { SCCOL nDocCol = nStartCol; - const rtl::OUString* pColArr = rColSeq.getConstArray(); + const OUString* pColArr = rColSeq.getConstArray(); for (long nCol=0; nCol<nCols; nCol++) { String aText(pColArr[nCol]); @@ -1988,7 +1988,7 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhic return eRet; } -beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2003,7 +2003,7 @@ beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const rtl::OUS } uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2022,7 +2022,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates return aRet; } -void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2067,7 +2067,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp } } -uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2113,7 +2113,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr ScUnoHelpFunctions::SetBoolInAny( aAny, false ); break; case SC_WID_UNO_CELLSTYL: - aAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + aAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA ) ); break; case SC_WID_UNO_TBLBORD: @@ -2295,7 +2295,7 @@ static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const } void SAL_CALL ScCellRangesBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -2397,7 +2397,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE break; case SC_WID_UNO_CELLSTYL: { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PARA )); @@ -2492,7 +2492,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE } } -uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2568,7 +2568,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE const ScStyleSheet* pStyle = pDocShell->GetDocument()->GetSelectionStyle(*GetMarkData()); if (pStyle) aStyleName = pStyle->GetName(); - rAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + rAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( aStyleName, SFX_STYLE_FAMILY_PARA ) ); } break; @@ -2648,13 +2648,13 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE { String sRet; aRanges.Format(sRet, SCR_ABS_3D, pDocShell->GetDocument()); - rAny <<= rtl::OUString(sRet); + rAny <<= OUString(sRet); } } } } -void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2666,7 +2666,7 @@ void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const rtl::OUString& OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2678,7 +2678,7 @@ void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUStrin OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const rtl::OUString&, +void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2686,7 +2686,7 @@ void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const rtl::OUString&, OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const rtl::OUString&, +void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2696,7 +2696,7 @@ void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const rtl::OUStrin // XMultiPropertySet -void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames, +void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, @@ -2713,7 +2713,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS if ( pDocShell && nCount ) { const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertySimpleEntry** pEntryArray = new const SfxItemPropertySimpleEntry*[nCount]; @@ -2791,7 +2791,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS } uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( - const uno::Sequence< rtl::OUString >& aPropertyNames ) + const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2808,7 +2808,7 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( return aRet; } -void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< rtl::OUString >& /* aPropertyNames */, +void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { @@ -2821,7 +2821,7 @@ void SAL_CALL ScCellRangesBase::removePropertiesChangeListener( const uno::Refer OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< rtl::OUString >& /* aPropertyNames */, +void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { @@ -2843,7 +2843,7 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint ) } // XTolerantMultiPropertySet -uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames, +uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -2860,7 +2860,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set beans::SetPropertyTolerantFailed* pReturns = aReturns.getArray(); const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertySimpleEntry** pMapArray = new const SfxItemPropertySimpleEntry*[nCount]; @@ -2967,7 +2967,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set return uno::Sequence < beans::SetPropertyTolerantFailed >(); } -uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2997,7 +2997,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get return aReturns; } -uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3227,7 +3227,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub throw uno::RuntimeException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() +uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3235,19 +3235,19 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() if ( pMemChart ) { sal_Int32 nRowCount = static_cast<sal_Int32>(pMemChart->GetRowCount()); - uno::Sequence<rtl::OUString> aSeq( nRowCount ); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq( nRowCount ); + OUString* pAry = aSeq.getArray(); for (sal_Int32 nRow = 0; nRow < nRowCount; nRow++) pAry[nRow] = pMemChart->GetRowText(static_cast<short>(nRow)); delete pMemChart; return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } void SAL_CALL ScCellRangesBase::setRowDescriptions( - const uno::Sequence<rtl::OUString>& aRowDescriptions ) + const uno::Sequence<OUString>& aRowDescriptions ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3266,7 +3266,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( { if ( pPosMap->GetRowCount() == static_cast<SCROW>(nRowCount) ) { - const rtl::OUString* pArray = aRowDescriptions.getConstArray(); + const OUString* pArray = aRowDescriptions.getConstArray(); for (long nRow=0; nRow<nRowCount; nRow++) { const ScAddress* pPos = pPosMap->GetRowHeaderPosition( @@ -3299,7 +3299,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( throw uno::RuntimeException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() +uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3307,19 +3307,19 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() if ( pMemChart ) { sal_Int32 nColCount = pMemChart->GetColCount(); - uno::Sequence<rtl::OUString> aSeq( nColCount ); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq( nColCount ); + OUString* pAry = aSeq.getArray(); for (sal_Int32 nCol = 0; nCol < nColCount; nCol++) pAry[nCol] = pMemChart->GetColText(static_cast<short>(nCol)); delete pMemChart; return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } void SAL_CALL ScCellRangesBase::setColumnDescriptions( - const uno::Sequence<rtl::OUString>& aColumnDescriptions ) + const uno::Sequence<OUString>& aColumnDescriptions ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3338,7 +3338,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( { if ( pPosMap->GetColCount() == static_cast<SCCOL>(nColCount) ) { - const rtl::OUString* pArray = aColumnDescriptions.getConstArray(); + const OUString* pArray = aColumnDescriptions.getConstArray(); for (long nCol=0; nCol<nColCount; nCol++) { const ScAddress* pPos = pPosMap->GetColHeaderPosition( @@ -3406,7 +3406,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe ScDocument* pDoc = pDocShell->GetDocument(); ScRangeListRef aRangesRef( new ScRangeList(aRanges) ); ScChartListenerCollection* pColl = pDoc->GetChartListenerCollection(); - rtl::OUString aName = pColl->getUniqueName(rtl::OUString("__Uno")); + OUString aName = pColl->getUniqueName(OUString("__Uno")); if (aName.isEmpty()) // failed to create unique name. return; @@ -3979,7 +3979,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( ScMarkData aMark(*GetMarkData()); - rtl::OUString aDummyUndo; + OUString aDummyUndo; ScRangeList aMatchedRanges; SCCOL nCol = 0; SCROW nRow = 0; @@ -4028,7 +4028,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl( ScDocument::GetSearchAndReplaceStart( *pSearchItem, nCol, nRow ); } - rtl::OUString aDummyUndo; + OUString aDummyUndo; ScRangeList aMatchedRanges; bool bFound = pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab, aMark, aMatchedRanges, aDummyUndo, NULL); @@ -4119,7 +4119,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea SCCOL nCol = 0; SCROW nRow = 0; - rtl::OUString aUndoStr; + OUString aUndoStr; ScDocument* pUndoDoc = NULL; if (bUndo) { @@ -4338,7 +4338,7 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells return NULL; } -rtl::OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() +OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4470,7 +4470,7 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const Str rNamedEntries.erase( rNamedEntries.begin() + n ); } -void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4599,7 +4599,7 @@ static sal_Bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, return false; // not found } -void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4664,7 +4664,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) // XNameReplace -void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4676,7 +4676,7 @@ void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const // XNameAccess -uno::Any SAL_CALL ScCellRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScCellRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4715,7 +4715,7 @@ static sal_Bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries, return false; } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4728,8 +4728,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() ScDocument* pDoc = pDocSh->GetDocument(); size_t nCount = rRanges.size(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (size_t i=0; i < nCount; i++) { // use given name if for exactly this range, otherwise just format @@ -4743,10 +4743,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() } return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScCellRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4764,7 +4764,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); } // XIndexAccess @@ -4803,12 +4803,12 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException) // XServiceInfo -rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellRangesObj" ); + return OUString( "ScCellRangesObj" ); } -sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellRangesObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -4818,15 +4818,15 @@ sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCPARAPROPERTIES_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(4); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + uno::Sequence<OUString> aRet(4); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); return aRet; } @@ -5017,13 +5017,13 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPositio } uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName( - const rtl::OUString& aName ) throw(uno::RuntimeException) + const OUString& aName ) throw(uno::RuntimeException) { return getCellRangeByName( aName, ScAddress::detailsOOOa1 ); } uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( - const rtl::OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) + const OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) { // name refers to the whole document (with the range's table as default), // valid only if the range is within this range @@ -5126,7 +5126,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() // XArrayFormulaRange -rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5160,8 +5160,8 @@ rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeExcep return aFormula; } -void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) +void ScCellRangeObj::SetArrayFormula_Impl( const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) { ScDocShell* pDocSh = GetDocShell(); if (pDocSh) @@ -5187,16 +5187,16 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, } } -void SAL_CALL ScCellRangeObj::setArrayFormula( const rtl::OUString& aFormula ) +void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; // GRAM_PODF_A1 for API compatibility. - SetArrayFormula_Impl( aFormula, ::rtl::OUString(), formula::FormulaGrammar::GRAM_PODF_A1); + SetArrayFormula_Impl( aFormula, OUString(), formula::FormulaGrammar::GRAM_PODF_A1); } -void ScCellRangeObj::SetArrayFormulaWithGrammar( const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) +void ScCellRangeObj::SetArrayFormulaWithGrammar( const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; SetArrayFormula_Impl( rFormula, rFormulaNmsp, eGrammar); @@ -5322,7 +5322,7 @@ void SAL_CALL ScCellRangeObj::setDataArray( // XCellRangeFormula -uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormulaArray() +uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArray() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5344,12 +5344,12 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul SCROW nRowCount = nEndRow + 1 - nStartRow; SCTAB nTab = aRange.aStart.Tab(); - uno::Sequence< uno::Sequence<rtl::OUString> > aRowSeq( nRowCount ); - uno::Sequence<rtl::OUString>* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence<OUString> > aRowSeq( nRowCount ); + uno::Sequence<OUString>* pRowAry = aRowSeq.getArray(); for (SCROW nRowIndex = 0; nRowIndex < nRowCount; nRowIndex++) { - uno::Sequence<rtl::OUString> aColSeq( nColCount ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence<OUString> aColSeq( nColCount ); + OUString* pColAry = aColSeq.getArray(); for (SCCOL nColIndex = 0; nColIndex < nColCount; nColIndex++) pColAry[nColIndex] = lcl_GetInputString( pDocSh->GetDocument(), ScAddress( nStartCol+nColIndex, nStartRow+nRowIndex, nTab ), sal_True ); @@ -5364,7 +5364,7 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul } void SAL_CALL ScCellRangeObj::setFormulaArray( - const uno::Sequence< uno::Sequence<rtl::OUString> >& aArray ) + const uno::Sequence< uno::Sequence<OUString> >& aArray ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5581,7 +5581,7 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, // XAutoFormattable -void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName ) +void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -6094,12 +6094,12 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellRangeObj" ); + return OUString( "ScCellRangeObj" ); } -sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -6110,16 +6110,16 @@ sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rService aServiceStr.EqualsAscii( SCPARAPROPERTIES_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(5); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + uno::Sequence<OUString> aRet(5); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); return aRet; } @@ -6327,7 +6327,7 @@ void ScCellObj::SetValue_Impl(double fValue) // only for XML import -void ScCellObj::InputEnglishString( const ::rtl::OUString& rText ) +void ScCellObj::InputEnglishString( const OUString& rText ) { // This is like a mixture of setFormula and property FormulaLocal: // The cell's number format is checked for "text", a new cell format may be set, @@ -6418,13 +6418,13 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( return xCursor; } -rtl::OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetOutputString_Impl(); } -void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aText); @@ -6436,7 +6436,7 @@ void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::Runt } void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { // special handling for ScCellTextCursor is no longer needed, @@ -6564,13 +6564,13 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException) // XCell -rtl::OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetInputString_Impl( true /* English */ ); } -void SAL_CALL ScCellObj::setFormula( const rtl::OUString& aFormula ) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setFormula( const OUString& aFormula ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aFormula); @@ -6589,7 +6589,7 @@ void SAL_CALL ScCellObj::setValue( double nValue ) throw(uno::RuntimeException) SetValue_Impl(nValue); } -void SAL_CALL ScCellObj::setFormulaString( const rtl::OUString& aFormula) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScDocShell *pDocSh = GetDocShell(); @@ -6784,7 +6784,7 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c { if ( pEntry->nWID == SC_WID_UNO_FORMLOC ) { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; String aString(aStrVal); SetString_Impl(aString, sal_True, false); // lokal interpretieren @@ -6808,7 +6808,7 @@ void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, if ( pEntry->nWID == SC_WID_UNO_FORMLOC ) { // sal_False = lokal - rAny <<= rtl::OUString( GetInputString_Impl(false) ); + rAny <<= OUString( GetInputString_Impl(false) ); } else if ( pEntry->nWID == SC_WID_UNO_FORMRT ) { @@ -6827,12 +6827,12 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellObj" ); + return OUString( "ScCellObj" ); } -sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { // CellRange/SheetCellRange are not in SheetCell service description, @@ -6849,18 +6849,18 @@ sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName aServiceStr.EqualsAscii( SCCELLRANGE_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(7); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + uno::Sequence<OUString> aRet(7); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); return aRet; } @@ -7120,7 +7120,7 @@ uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotation } uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByName( - const rtl::OUString& rRange ) throw(uno::RuntimeException) + const OUString& rRange ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName( rRange ); @@ -7288,17 +7288,17 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc // XNamed -rtl::OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aName; + OUString aName; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) pDocSh->GetDocument()->GetName( GetTab_Impl(), aName ); return aName; } -void SAL_CALL ScTableSheetObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7709,14 +7709,14 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) //! Filter und Options aus altem Link suchen - rtl::OUString aUrl(getLinkUrl()); - rtl::OUString aSheet(getLinkSheetName()); + OUString aUrl(getLinkUrl()); + OUString aSheet(getLinkSheetName()); - rtl::OUString aEmpty; + OUString aEmpty; link( aUrl, aSheet, aEmpty, aEmpty, nLinkMode ); } -rtl::OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aFile; @@ -7726,7 +7726,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException return aFile; } -void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) +void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7734,13 +7734,13 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) //! Filter und Options aus altem Link suchen sheet::SheetLinkMode eMode = getLinkMode(); - rtl::OUString aSheet(getLinkSheetName()); + OUString aSheet(getLinkSheetName()); - rtl::OUString aEmpty; + OUString aEmpty; link( aLinkUrl, aSheet, aEmpty, aEmpty, eMode ); } -rtl::OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aSheet; @@ -7750,7 +7750,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeExc return aSheet; } -void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheetName ) +void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7758,14 +7758,14 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheet //! Filter und Options aus altem Link suchen sheet::SheetLinkMode eMode = getLinkMode(); - rtl::OUString aUrl(getLinkUrl()); + OUString aUrl(getLinkUrl()); - rtl::OUString aEmpty; + OUString aEmpty; link( aUrl, aLinkSheetName, aEmpty, aEmpty, eMode ); } -void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUString& aSheetName, - const rtl::OUString& aFilterName, const rtl::OUString& aFilterOptions, +void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aSheetName, + const OUString& aFilterName, const OUString& aFilterOptions, sheet::SheetLinkMode nMode ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7775,10 +7775,10 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aFileString = aUrl; - rtl::OUString aFilterString = aFilterName; - rtl::OUString aOptString = aFilterOptions; - rtl::OUString aSheetString = aSheetName; + OUString aFileString = aUrl; + OUString aFilterString = aFilterName; + OUString aOptString = aFilterOptions; + OUString aSheetString = aSheetName; aFileString = ScGlobal::GetAbsDocName( aFileString, pDocSh ); if (aFilterString.isEmpty()) @@ -8027,7 +8027,7 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat // XProtectable -void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword ) +void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8040,7 +8040,7 @@ void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword ) } } -void SAL_CALL ScTableSheetObj::unprotect( const rtl::OUString& aPassword ) +void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8077,22 +8077,22 @@ sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException) return false; } -rtl::OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDocSh->GetDocument()->GetScenarioData( GetTab_Impl(), aComment, aColor, nFlags ); return aComment; } - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenarioComment ) +void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComment ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8102,8 +8102,8 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenari ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8161,7 +8161,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException) { ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aName; + OUString aName; pDoc->GetName( nTab, aName ); // Name dieses Szenarios SCTAB nDestTab = nTab; @@ -8210,7 +8210,7 @@ uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) // XExternalSheetName -void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl::OUString& aSheetName ) +void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSheetName ) throw (container::ElementExistException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8225,7 +8225,7 @@ void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl: const String aDocTabName( ScGlobal::GetDocTabName( aAbsDocName, aSheetName ) ); if ( !pDoc->RenameTab( nTab, aDocTabName, false /*bUpdateRef*/, sal_True /*bExternalDocument*/ ) ) { - throw container::ElementExistException( ::rtl::OUString(), *this ); + throw container::ElementExistException( OUString(), *this ); } } } @@ -8277,9 +8277,9 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn if ( pEntry->nWID == SC_WID_UNO_PAGESTL ) { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; - rtl::OUString aNewStr(ScStyleNameConversion::ProgrammaticToDisplayName( + OUString aNewStr(ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PAGE )); //! Undo? (auch bei SID_STYLE_APPLY an der View) @@ -8321,8 +8321,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn sal_Int32 nNewColor = 0; if (aValue >>= nNewColor) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8338,8 +8338,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8371,8 +8371,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8404,8 +8404,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8437,8 +8437,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8470,8 +8470,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8503,8 +8503,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8566,7 +8566,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_CODENAME ) { - rtl::OUString aCodeName; + OUString aCodeName; if ( pDocSh && ( aValue >>= aCodeName ) ) { pDocSh->GetDocument()->SetCodeName( GetTab_Impl(), aCodeName ); @@ -8595,7 +8595,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_PAGESTL ) { - rAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + rAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( pDoc->GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE ) ); } else if ( pEntry->nWID == SC_WID_UNO_CELLVIS ) @@ -8622,7 +8622,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8634,7 +8634,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8646,7 +8646,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8658,7 +8658,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8670,7 +8670,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8682,7 +8682,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8694,7 +8694,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8720,10 +8720,10 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_CODENAME ) { - rtl::OUString aCodeName; + OUString aCodeName; if ( pDocSh ) pDocSh->GetDocument()->GetCodeName( GetTab_Impl(), aCodeName ); - rAny <<= rtl::OUString( aCodeName ); + rAny <<= OUString( aCodeName ); } else ScCellRangeObj::GetOnePropertyValue(pEntry, rAny); @@ -8737,12 +8737,12 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScTableSheetObj" ); + return OUString( "ScTableSheetObj" ); } -sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScTableSheetObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -8755,18 +8755,18 @@ sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCLINKTARGET_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(7); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + uno::Sequence<OUString> aRet(7); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); return aRet; } @@ -8864,7 +8864,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() throw(u // XNamed -rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8875,7 +8875,7 @@ rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) return ScColToAlpha( nCol ); // from global.hxx } -void SAL_CALL ScTableColumnObj::setName( const rtl::OUString& /* aNewName */ ) +void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 09ef26331a80..bfa5bd806598 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -85,7 +85,7 @@ namespace calc // register our property at the base class CellAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString( "BoundCell" ), + OUString( "BoundCell" ), PROP_HANDLE_BOUND_CELL, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -185,7 +185,7 @@ namespace calc if ( m_xCellText.is() ) { // an XTextRange can be used to set/get "string" values - aTypes[1] = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + aTypes[1] = ::getCppuType( static_cast< OUString* >( NULL ) ); // and additionally, we use it to handle booleans aTypes[2] = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); } @@ -232,7 +232,7 @@ namespace calc if ( m_xCellText.is() ) aReturn <<= m_xCellText->getString(); else - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); break; case TypeClass_BOOLEAN: @@ -254,7 +254,7 @@ namespace calc if ( xProp.is() ) { CellContentType eResultType; - if ( (xProp->getPropertyValue(::rtl::OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) + if ( (xProp->getPropertyValue(OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) bHasValue = sal_True; } } @@ -318,7 +318,7 @@ namespace calc { OSL_ENSURE( m_xCellText.is(), "OCellValueBinding::setValue: don't have a text!" ); - ::rtl::OUString sText; + OUString sText; aValue >>= sText; if ( m_xCellText.is() ) m_xCellText->setString( sText ); @@ -392,7 +392,7 @@ namespace calc { // set boolean number format if not already set - ::rtl::OUString sPropName( "NumberFormat" ); + OUString sPropName( "NumberFormat" ); Reference<XPropertySet> xCellProp( m_xCell, UNO_QUERY ); Reference<XNumberFormatsSupplier> xSupplier( m_xDocument, UNO_QUERY ); if ( xSupplier.is() && xCellProp.is() ) @@ -417,10 +417,10 @@ namespace calc if ( xOldFormat.is() ) { // use the locale of the existing format - xOldFormat->getPropertyValue( ::rtl::OUString( "Locale" ) ) >>= aLocale; + xOldFormat->getPropertyValue( OUString( "Locale" ) ) >>= aLocale; sal_Int16 nOldType = ::comphelper::getINT16( - xOldFormat->getPropertyValue( ::rtl::OUString( "Type" ) ) ); + xOldFormat->getPropertyValue( OUString( "Type" ) ) ); if ( nOldType & NumberFormat::LOGICAL ) bWasBoolean = sal_True; } @@ -456,9 +456,9 @@ namespace calc OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); if ( !pNonConstThis->supportsType( _rType ) ) { - ::rtl::OUString sMessage( "The given type (" ); + OUString sMessage( "The given type (" ); sMessage += _rType.getTypeName(); - sMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); + sMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); // TODO: localize this error message throw IncompatibleTypesException( sMessage, *pNonConstThis ); @@ -467,21 +467,21 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - return ::rtl::OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); + return OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); } //-------------------------------------------------------------------- - sal_Bool SAL_CALL OCellValueBinding::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Sequence< ::rtl::OUString > aSupportedServices( getSupportedServiceNames() ); - const ::rtl::OUString* pLookup = aSupportedServices.getConstArray(); - const ::rtl::OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); + Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); + const OUString* pLookup = aSupportedServices.getConstArray(); + const OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); while ( pLookup != pLookupEnd ) if ( *pLookup++ == _rServiceName ) return sal_True; @@ -490,15 +490,15 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Sequence< ::rtl::OUString > aServices( m_bListPos ? 3 : 2 ); - aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellValueBinding" ); - aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ValueBinding" ); + Sequence< OUString > aServices( m_bListPos ? 3 : 2 ); + aServices[ 0 ] = OUString( "com.sun.star.table.CellValueBinding" ); + aServices[ 1 ] = OUString( "com.sun.star.form.binding.ValueBinding" ); if ( m_bListPos ) - aServices[ 2 ] = ::rtl::OUString( "com.sun.star.table.ListPositionCellBinding" ); + aServices[ 2 ] = OUString( "com.sun.star.table.ListPositionCellBinding" ); return aServices; } diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 3ad5744918e5..10d12ca96f15 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -103,9 +103,9 @@ namespace calc virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index a3e6797452c2..38036b7982b1 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -63,8 +63,6 @@ SC_SIMPLE_SERVICE_INFO( ScChart2DataSequence, "ScChart2DataSequence", using namespace ::com::sun::star; using namespace ::formula; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::std::auto_ptr; @@ -110,7 +108,7 @@ template< typename T > struct lcl_appendTableNumber : public ::std::unary_function< SCTAB, void > { - lcl_appendTableNumber( ::rtl::OUStringBuffer & rBuffer ) : + lcl_appendTableNumber( OUStringBuffer & rBuffer ) : m_rBuffer( rBuffer ) {} void operator() ( SCTAB nTab ) @@ -120,12 +118,12 @@ struct lcl_appendTableNumber : public ::std::unary_function< SCTAB, void > m_rBuffer.append( sal_Unicode( ' ' )); } private: - ::rtl::OUStringBuffer & m_rBuffer; + OUStringBuffer & m_rBuffer; }; -::rtl::OUString lcl_createTableNumberList( const ::std::list< SCTAB > & rTableList ) +OUString lcl_createTableNumberList( const ::std::list< SCTAB > & rTableList ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::std::for_each( rTableList.begin(), rTableList.end(), lcl_appendTableNumber( aBuffer )); // remove last trailing ' ' if( aBuffer.getLength() > 0 ) @@ -1043,7 +1041,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint if( ! m_pDocument ) return false; - rtl::OUString aRangeRepresentation; + OUString aRangeRepresentation; for(sal_Int32 i = 0; i < aArguments.getLength(); ++i) { if ( aArguments[i].Name == "CellRangeRepresentation" ) @@ -1448,7 +1446,7 @@ ScChart2DataProvider::createDataSource( bool bLabel = true; bool bCategories = false; bool bOrientCol = true; - ::rtl::OUString aRangeRepresentation; + OUString aRangeRepresentation; uno::Sequence< sal_Int32 > aSequenceMapping; for(sal_Int32 i = 0; i < aArguments.getLength(); ++i) { @@ -1770,7 +1768,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum bool bRowSourceDetected = false; bool bFirstCellAsLabel = false; bool bHasCategories = false; - ::rtl::OUString sRangeRep; + OUString sRangeRep; bool bHasCategoriesLabels = false; vector<ScTokenRef> aAllCategoriesValuesTokens; @@ -1803,8 +1801,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if(!bHasCategories) { Reference< beans::XPropertySet > xSeqProp( xLS->getValues(), uno::UNO_QUERY ); - ::rtl::OUString aRole; - if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString("Role")) >>= aRole) && + OUString aRole; + if( xSeqProp.is() && (xSeqProp->getPropertyValue(OUString("Role")) >>= aRole) && aRole.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")) ) bThisIsCategories = bHasCategories = true; } @@ -1906,7 +1904,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); func.getList(aTableNumList); aResult.push_back( - beans::PropertyValue( ::rtl::OUString("TableNumberList"), -1, + beans::PropertyValue( OUString("TableNumberList"), -1, uno::makeAny( lcl_createTableNumberList( aTableNumList ) ), beans::PropertyState_DIRECT_VALUE )); } @@ -1915,7 +1913,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("DataRowSource"), -1, + beans::PropertyValue( OUString("DataRowSource"), -1, uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE )); } @@ -1923,7 +1921,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("HasCategories"), -1, + beans::PropertyValue( OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE )); } @@ -1931,7 +1929,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("FirstCellAsLabel"), -1, + beans::PropertyValue( OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE )); } @@ -1957,7 +1955,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // add cell range property aResult.push_back( - beans::PropertyValue( ::rtl::OUString("CellRangeRepresentation"), -1, + beans::PropertyValue( OUString("CellRangeRepresentation"), -1, uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE )); //Sequence Mapping @@ -1986,11 +1984,11 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aNewSequences( xDataSource->getDataSequences()); - rtl::OUString aOldLabel; - rtl::OUString aNewLabel; - rtl::OUString aOldValues; - rtl::OUString aNewValues; - rtl::OUString aEmpty; + OUString aOldLabel; + OUString aNewLabel; + OUString aOldValues; + OUString aNewValues; + OUString aEmpty; for( sal_Int32 nNewIndex = 0; nNewIndex < aNewSequences.getLength(); nNewIndex++ ) { @@ -2027,7 +2025,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bDifferentIndexes && !aSequenceMappingVector.empty() ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("SequenceMapping"), -1, + beans::PropertyValue( OUString("SequenceMapping"), -1, uno::makeAny( lcl_VectorToSequence(aSequenceMappingVector) ) , beans::PropertyState_DIRECT_VALUE )); } @@ -2036,7 +2034,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum return lcl_VectorToSequence( aResult ); } -::sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const ::rtl::OUString& aRangeRepresentation ) +::sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2052,7 +2050,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum uno::Reference< chart2::data::XDataSequence > SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentation( - const ::rtl::OUString& aRangeRepresentation ) + const OUString& aRangeRepresentation ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -2223,7 +2221,7 @@ ScChart2DataProvider::createDataSequenceByFormulaTokens( // XRangeXMLConversion --------------------------------------------------- -rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUString& sRangeRepresentation ) +OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRangeRepresentation ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { OUString aRet; @@ -2248,7 +2246,7 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUStr return aRet; } -rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUString& sXMLRange ) +OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXMLRange ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { const sal_Unicode cSep = ' '; @@ -2259,11 +2257,11 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS // #i74062# When loading flat XML, this is called before the referenced sheets are in the document, // so the conversion has to take place directly with the strings, without looking up the sheets. - rtl::OUStringBuffer sRet; + OUStringBuffer sRet; sal_Int32 nOffset = 0; while( nOffset >= 0 ) { - rtl::OUString sToken; + OUString sToken; ScRangeStringConverter::GetTokenByOffset( sToken, sXMLRange, nOffset, cSep, cQuote ); if( nOffset >= 0 ) { @@ -2306,7 +2304,7 @@ ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException) void SAL_CALL ScChart2DataProvider::setPropertyValue( - const ::rtl::OUString& rPropertyName, const uno::Any& rValue) + const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -2323,7 +2321,7 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue( uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2342,7 +2340,7 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2352,7 +2350,7 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2362,7 +2360,7 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2372,7 +2370,7 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2486,11 +2484,11 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // BM: don't use names of named ranges but the UI range strings // String aStr; // rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); -// m_aIdentifier = ::rtl::OUString( aStr ); +// m_aIdentifier = OUString( aStr ); -// m_aIdentifier = ::rtl::OUString( "ID_"); +// m_aIdentifier = OUString( "ID_"); // static sal_Int32 nID = 0; -// m_aIdentifier += ::rtl::OUString::valueOf( ++nID); +// m_aIdentifier += OUString::valueOf( ++nID); } ScChart2DataSequence::~ScChart2DataSequence() @@ -3059,10 +3057,10 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() // XTextualDataSequence -------------------------------------------------- -uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence<rtl::OUString> aSeq; + uno::Sequence<OUString> aSeq; if ( !m_pDocument ) throw uno::RuntimeException(); @@ -3071,8 +3069,8 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) sal_Int32 nCount = m_aDataArray.size(); if ( nCount > 0 ) { - aSeq = uno::Sequence<rtl::OUString>(nCount); - rtl::OUString* pArr = aSeq.getArray(); + aSeq = uno::Sequence<OUString>(nCount); + OUString* pArr = aSeq.getArray(); ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end(); for(; itr != itrEnd; ++itr, ++pArr) *pArr = itr->maString; @@ -3081,7 +3079,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) { if( m_pTokens->front()->GetType() == svString ) { - aSeq = uno::Sequence<rtl::OUString>(1); + aSeq = uno::Sequence<OUString>(1); aSeq[0] = m_pTokens->front()->GetString(); } } @@ -3089,7 +3087,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) return aSeq; } -::rtl::OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() +OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() throw ( uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3207,7 +3205,7 @@ private: } -uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) +uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3478,7 +3476,7 @@ ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException) void SAL_CALL ScChart2DataSequence::setPropertyValue( - const ::rtl::OUString& rPropertyName, const uno::Any& rValue) + const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -3504,7 +3502,7 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue( uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3528,7 +3526,7 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3539,7 +3537,7 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3550,7 +3548,7 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3561,7 +3559,7 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index d0f688f424c7..6529ffd50b13 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -155,7 +155,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const return NULL; } -ScChartObj* ScChartsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScChartObj* ScChartsObj::GetObjectByName_Impl(const OUString& aName) const { String aNameString(aName); if ( lcl_FindChartObj( pDocShell, nTab, aNameString ) ) @@ -165,7 +165,7 @@ ScChartObj* ScChartsObj::GetObjectByName_Impl(const rtl::OUString& aName) const // XTableCharts -void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, +void SAL_CALL ScChartsObj::addNewByName( const OUString& aName, const awt::Rectangle& aRect, const uno::Sequence<table::CellRangeAddress>& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) @@ -208,7 +208,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, ScRangeListRef xNewRanges( pList ); uno::Reference < embed::XEmbeddedObject > xObj; - ::rtl::OUString aTmp( aNameString ); + OUString aTmp( aNameString ); if ( SvtModuleOptions().IsChart() ) xObj = pDocShell->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aTmp ); if ( xObj.is() ) @@ -251,7 +251,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, if( sRangeStr.Len() ) xReceiver->attachDataProvider( xDataProvider ); else - sRangeStr = rtl::OUString("all"); + sRangeStr = OUString("all"); uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pDocShell->GetModel(), uno::UNO_QUERY ); xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier ); @@ -259,16 +259,16 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, // set arguments uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString("CellRangeRepresentation"), -1, - uno::makeAny( ::rtl::OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); + OUString("CellRangeRepresentation"), -1, + uno::makeAny( OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString("HasCategories"), -1, + OUString("HasCategories"), -1, uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString("FirstCellAsLabel"), -1, + OUString("FirstCellAsLabel"), -1, uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString("DataRowSource"), -1, + OUString("DataRowSource"), -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } @@ -289,7 +289,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, } } -void SAL_CALL ScChartsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -314,7 +314,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration( throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableChartsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableChartsEnumeration")); } // XIndexAccess @@ -371,7 +371,7 @@ sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException) return getCount() != 0; } -uno::Any SAL_CALL ScChartsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -383,7 +383,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) @@ -391,8 +391,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno:: ScDocument* pDoc = pDocShell->GetDocument(); long nCount = getCount(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); long nPos = 0; ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); @@ -424,10 +424,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno:: return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScChartsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -447,7 +447,7 @@ ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN) pDocShell->GetDocument()->AddUnoObject(*this); uno::Sequence< table::CellRangeAddress > aInitialPropValue; - registerPropertyNoMember( ::rtl::OUString( "RelatedCellRanges" ), + registerPropertyNoMember( OUString( "RelatedCellRanges" ), PROP_HANDLE_RELATED_CELLRANGES, beans::PropertyAttribute::MAYBEVOID, ::getCppuType( &aInitialPropValue ), &aInitialPropValue ); } @@ -485,7 +485,7 @@ void ScChartObj::GetData_Impl( ScRangeListRef& rRanges, bool& rColHeaders, bool& { uno::Sequence< beans::PropertyValue > aArgs( xProvider->detectArguments( xReceiver->getUsedData() ) ); - rtl::OUString aRanges; + OUString aRanges; chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS; bool bHasCategories=false; bool bFirstCellAsLabel=false; @@ -766,13 +766,13 @@ uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw( // XNamed -rtl::OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aChartName; } -void SAL_CALL ScChartObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) +void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; throw uno::RuntimeException(); // name cannot be changed diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 4c42538adf7c..d72a9c313165 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -63,7 +63,7 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() {MAP_CHAR_LEN(SC_UNO_RASTERSUBY), 0, &getCppuType((sal_Int32*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_RASTERSYNC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_AUTOCALC), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_PRINTERNAME), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_PRINTERNAME), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_PRINTERSETUP), 0, &getCppuType((uno::Sequence<sal_Int8>*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_APPLYDOCINF), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_FORBIDDEN), 0, &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY, 0}, @@ -120,7 +120,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPro } void SAL_CALL ScDocumentConfiguration::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -171,7 +171,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( pDoc->SetAutoCalc( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERNAME ) == 0 ) { - rtl::OUString sPrinterName; + OUString sPrinterName; if ( aValue >>= sPrinterName ) { // #i75610# if the name is empty, do nothing (don't create any printer) @@ -272,13 +272,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( uno::Sequence< beans::PropertyValue > aInfo; if ( !( aValue >>= aInfo ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( "Value of type Sequence<PropertyValue> expected!" ), + OUString( "Value of type Sequence<PropertyValue> expected!" ), uno::Reference< uno::XInterface >(), 2 ); if ( !pDocShell->SetModifyPasswordInfo( aInfo ) ) throw beans::PropertyVetoException( - ::rtl::OUString( "The hash is not allowed to be changed now!" ), + OUString( "The hash is not allowed to be changed now!" ), uno::Reference< uno::XInterface >() ); } else if ( aPropertyName.compareToAscii( SC_UNO_EMBED_FONTS ) == 0 ) @@ -330,7 +330,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( throw uno::RuntimeException(); } -uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -379,9 +379,9 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString // (as in SwXDocumentSettings) SfxPrinter* pPrinter = pDoc->GetPrinter( false ); if (pPrinter) - aRet <<= rtl::OUString ( pPrinter->GetName()); + aRet <<= OUString ( pPrinter->GetName()); else - aRet <<= rtl::OUString(); + aRet <<= OUString(); } else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERSETUP ) == 0 ) { @@ -465,12 +465,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration ) // XServiceInfo -rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScDocumentConfiguration" ); + return OUString( "ScDocumentConfiguration" ); } -sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -478,13 +478,13 @@ sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& aServiceStr.EqualsAscii( SCDOCUMENTSETTINGS_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index a71a324bf5c8..d2c2f35e38ca 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -448,7 +448,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByPositi } uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( - const rtl::OUString& rRange ) throw(uno::RuntimeException) + const OUString& rRange ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName(rRange); @@ -456,12 +456,12 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( // XServiceInfo -rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellCursorObj" ); + return OUString( "ScCellCursorObj" ); } -sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellCursorObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -470,19 +470,19 @@ sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServic ScCellRangeObj::supportsService(rServiceName); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() throw(uno::RuntimeException) { // get all service names from cell range - uno::Sequence<rtl::OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames()); + uno::Sequence<OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames()); sal_Int32 nParentLen = aParentSeq.getLength(); - const rtl::OUString* pParentArr = aParentSeq.getConstArray(); + const OUString* pParentArr = aParentSeq.getConstArray(); // SheetCellCursor should be first (?) - uno::Sequence<rtl::OUString> aTotalSeq( nParentLen + 2 ); - rtl::OUString* pTotalArr = aTotalSeq.getArray(); - pTotalArr[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); - pTotalArr[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); + uno::Sequence<OUString> aTotalSeq( nParentLen + 2 ); + OUString* pTotalArr = aTotalSeq.getArray(); + pTotalArr[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); + pTotalArr[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); // append cell range services for (long i=0; i<nParentLen; i++) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index bb7830dbd726..bb6969e0b063 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -57,7 +57,6 @@ using namespace com::sun::star; using namespace com::sun::star::sheet; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; @@ -98,14 +97,14 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() { {MAP_CHAR_LEN(SC_UNO_DP_COLGRAND), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_DRILLDOWN), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_DP_GRANDTOTAL_NAME),0,&getCppuType((rtl::OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0 }, + {MAP_CHAR_LEN(SC_UNO_DP_GRANDTOTAL_NAME),0,&getCppuType((OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_IGNORE_EMPTYROWS), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_IMPORTDESC), 0, &getCppuType((uno::Sequence<beans::PropertyValue>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_REPEATEMPTY), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_SERVICEARG), 0, &getCppuType((uno::Sequence<beans::PropertyValue>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_SHOWFILTER), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_DP_SOURCESERVICE), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_DP_SOURCESERVICE), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; return aDataPilotDescriptorBaseMap_Impl; @@ -809,7 +808,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp } else if ( aNameString.EqualsAscii( SC_UNO_DP_GRANDTOTAL_NAME ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aNewData.SetGrandTotalName(aStrVal); } @@ -847,7 +846,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp } else if ( aNameString.EqualsAscii( SC_UNO_DP_SOURCESERVICE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) { String aEmpty; @@ -874,7 +873,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp if (pOldDesc) aServiceDesc = *pOldDesc; - rtl::OUString aStrVal; + OUString aStrVal; sal_Int32 nArgs = aArgSeq.getLength(); for (sal_Int32 nArgPos=0; nArgPos<nArgs; ++nArgPos) { @@ -958,7 +957,7 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope } else if ( aNameString.EqualsAscii( SC_UNO_DP_GRANDTOTAL_NAME ) ) { - const rtl::OUString* pGrandTotalName = aNewData.GetGrandTotalName(); + const OUString* pGrandTotalName = aNewData.GetGrandTotalName(); if (pGrandTotalName) aRet <<= *pGrandTotalName; // same behavior as in ScDPSource } @@ -989,7 +988,7 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope } else if ( aNameString.EqualsAscii( SC_UNO_DP_SOURCESERVICE ) ) { - rtl::OUString aServiceName; + OUString aServiceName; const ScDPServiceDesc* pServiceDesc = pDPObject->GetDPServiceDesc(); if (pServiceDesc) aServiceName = pServiceDesc->aServiceName; @@ -1002,13 +1001,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope { uno::Sequence<beans::PropertyValue> aSeq( 4 ); beans::PropertyValue* pArray = aSeq.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME )); pArray[0].Value <<= pServiceDesc->aParSource; - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME )); pArray[1].Value <<= pServiceDesc->aParName; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME )); pArray[2].Value <<= pServiceDesc->aParUser; - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD )); pArray[3].Value <<= pServiceDesc->aParPass; aRet <<= aSeq; } @@ -1857,7 +1856,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException) aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ); else { - const rtl::OUString* pLayoutName = pDim->GetLayoutName(); + const OUString* pLayoutName = pDim->GetLayoutName(); if (pLayoutName) aName = *pLayoutName; else @@ -2263,7 +2262,7 @@ void ScDataPilotFieldObj::setUseCurrentPage( sal_Bool bUse ) { /* It is somehow useless to set the property "HasSelectedPage" to true, because it is still needed to set an explicit page name. */ - const ::rtl::OUString aPage; + const OUString aPage; pDim->SetCurrentPage( &aPage ); } else @@ -2408,7 +2407,7 @@ DataPilotFieldGroupInfo ScDataPilotFieldObj::getGroupInfo() ScFieldGroup aGroup; aGroup.maName = pGroup->GetGroupName(); for( sal_Int32 nMemIdx = 0, nMemCount = pGroup->GetElementCount(); nMemIdx < nMemCount; ++nMemIdx ) - if (const rtl::OUString* pMem = pGroup->GetElementByIndex(nMemIdx)) + if (const OUString* pMem = pGroup->GetElementByIndex(nMemIdx)) aGroup.maMembers.push_back( *pMem ); aGroups.push_back( aGroup ); } @@ -2555,13 +2554,13 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { - rtl::OUString aDimName = pDim->GetName(); + OUString aDimName = pDim->GetName(); ScDPSaveData aSaveData = *pDPObj->GetSaveData(); ScDPDimensionSaveData* pDimData = aSaveData.GetDimensionData(); // created if not there // find original base - rtl::OUString aBaseDimName( aDimName ); + OUString aBaseDimName( aDimName ); const ScDPSaveGroupDimension* pBaseGroupDim = pDimData->GetNamedGroupDim( aDimName ); if ( pBaseGroupDim ) { @@ -2581,7 +2580,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons { for (nEntry=0; nEntry<nEntryCount; nEntry++) { - const rtl::OUString& aEntryName = rItems[nEntry]; + const OUString& aEntryName = rItems[nEntry]; if ( pBaseGroupDim ) { // for each selected (intermediate) group, remove all its items @@ -2630,10 +2629,10 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons } } } - rtl::OUString aGroupDimName = pGroupDimension->GetGroupDimName(); + OUString aGroupDimName = pGroupDimension->GetGroupDimName(); //! localized prefix string - rtl::OUString aGroupName = pGroupDimension->CreateGroupName( String( RTL_CONSTASCII_USTRINGPARAM( "Group" ) ) ); + OUString aGroupName = pGroupDimension->CreateGroupName( String( RTL_CONSTASCII_USTRINGPARAM( "Group" ) ) ); ScDPSaveGroupItem aGroup( aGroupName ); Reference< XNameAccess > xMembers = GetMembers(); if (!xMembers.is()) @@ -2746,9 +2745,9 @@ Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( con ScDPDimensionSaveData& rDimData = *aSaveData.GetDimensionData(); // find source dimension name - const rtl::OUString& rDimName = pDim->GetName(); + const OUString& rDimName = pDim->GetName(); const ScDPSaveGroupDimension* pGroupDim = rDimData.GetNamedGroupDim( rDimName ); - rtl::OUString aSrcDimName = pGroupDim ? pGroupDim->GetSourceDimName() : rDimName; + OUString aSrcDimName = pGroupDim ? pGroupDim->GetSourceDimName() : rDimName; // find a group dimension for the base field, or get numeric grouping pGroupDim = rDimData.GetFirstNamedGroupDim( aSrcDimName ); diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index b45539503323..d41ffc85e052 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -112,7 +112,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() {MAP_CHAR_LEN(SC_UNONAME_ISUSER), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_KEEPFORM), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_MOVCELLS), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_STRIPDAT), 0, &getBooleanCppuType(), 0, 0}, @@ -217,28 +217,28 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS aDescriptor.setDataSource(rParam.aDBName); if (aDescriptor.has( svx::daDataSource )) { - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); pArray[0].Value <<= rParam.aDBName; } else if (aDescriptor.has( svx::daConnectionResource )) { - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); pArray[0].Value <<= rParam.aDBName; } - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); pArray[1].Value <<= eMode; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); pArray[2].Value <<= rParam.aStatement; - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative ); } void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequence<beans::PropertyValue>& rSeq ) { - rtl::OUString aStrVal; + OUString aStrVal; const beans::PropertyValue* pPropArray = rSeq.getConstArray(); long nPropCount = rSeq.getLength(); for (long i = 0; i < nPropCount; i++) @@ -340,31 +340,31 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq // Sequence fuellen - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); pArray[0].Value = ::cppu::bool2any(!rParam.bByRow); - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader ); - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); pArray[2].Value <<= static_cast<sal_Int32>( rParam.GetSortKeyCount() ); - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); pArray[3].Value <<= aFields; - pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); + pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern ); - pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); + pArray[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace ); - pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); + pArray[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); pArray[6].Value <<= aOutPos; - pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); + pArray[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef ); - pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); + pArray[8].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); pArray[8].Value <<= static_cast<sal_Int32>( rParam.nUserIndex ); } @@ -485,7 +485,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b } else if (aPropName.EqualsAscii( SC_UNONAME_COLLALG )) { - rtl::OUString sStr; + OUString sStr; if ( rProp.Value >>= sStr ) rParam.aCollatorAlgorithm = sStr; } @@ -675,7 +675,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); } // XIndexAccess @@ -728,7 +728,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPr } void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -771,7 +771,7 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( PutData(aParam); } -uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1476,7 +1476,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getProp } void SAL_CALL ScFilterDescriptorBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1523,7 +1523,7 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue( PutData(aParam); } -uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1736,13 +1736,13 @@ ScDBData* ScDatabaseRangeObj::GetDBData_Impl() const // XNamed -rtl::OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aName; } -void SAL_CALL ScDatabaseRangeObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2048,7 +2048,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getProperty } void SAL_CALL ScDatabaseRangeObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -2140,7 +2140,7 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue( } } -uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2168,7 +2168,7 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPr // ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_DBAREA ); } else if ( aString.EqualsAscii( SC_UNO_LINKDISPNAME ) ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); else if (aString.EqualsAscii( SC_UNONAME_AUTOFLT )) { sal_Bool bAutoFilter(GetDBData_Impl()->HasAutoFilter()); @@ -2216,12 +2216,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj ) // XServiceInfo -rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScDatabaseRangeObj" ); + return OUString( "ScDatabaseRangeObj" ); } -sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -2229,13 +2229,13 @@ sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rSer aServiceStr.EqualsAscii( SCLINKTARGET_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); return aRet; } @@ -2284,7 +2284,7 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByIndex_Impl(size_t nIndex) return new ScDatabaseRangeObj(pDocShell, itr->GetName()); } -ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName(aName) ) { @@ -2295,7 +2295,7 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const rtl::OUStrin } -void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, +void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, const table::CellRangeAddress& aRange ) throw(uno::RuntimeException) { @@ -2314,7 +2314,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2335,7 +2335,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); } // XIndexAccess @@ -2384,7 +2384,7 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException // XNameAccess -uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2397,7 +2397,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2410,7 +2410,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() if (pNames) { const ScDBCollection::NamedDBs& rDBs = pNames->getNamedDBs(); - uno::Sequence<rtl::OUString> aSeq(rDBs.size()); + uno::Sequence<OUString> aSeq(rDBs.size()); ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = rDBs.end(); for (size_t i = 0; itr != itrEnd; ++itr, ++i) aSeq[i] = itr->GetName(); @@ -2418,10 +2418,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() return aSeq; } } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 8e100da64d57..5afa88f7e900 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -50,15 +50,15 @@ static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, @@ -123,7 +123,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySe } void SAL_CALL ScDocDefaultsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -216,7 +216,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( } } -uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -276,7 +276,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocDefaultsObj ) // XPropertyState -beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -311,13 +311,13 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUS } uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { // the simple way: call getPropertyState SolarMutexGuard aGuard; - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -325,7 +325,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates return aRet; } -void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -346,7 +346,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const rtl::OUString& aProp } } -uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index ee5013fe9fbd..4f125516222c 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -98,7 +98,7 @@ void ScDispatchProviderInterceptor::Notify( SfxBroadcaster&, const SfxHint& rHin // XDispatchProvider uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDispatch( - const util::URL& aURL, const rtl::OUString& aTargetFrameName, + const util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(uno::RuntimeException) { @@ -266,7 +266,7 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport { // descriptor has to be complete anyway - rtl::OUString aEmpty; + OUString aEmpty; aDescriptor[svx::daDataSource] <<= aEmpty; aDescriptor[svx::daCommand] <<= aEmpty; aDescriptor[svx::daCommandType] <<= (sal_Int32)sdb::CommandType::TABLE; @@ -367,7 +367,7 @@ void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventO { frame::FeatureStateEvent aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); - aEvent.FeatureURL.Complete = rtl::OUString::createFromAscii( cURLDocDataSource ); + aEvent.FeatureURL.Complete = OUString::createFromAscii( cURLDocDataSource ); lcl_FillDataSource( aEvent, aNewImport ); // modifies State, IsEnabled diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 34a0de491604..4f66ccab159e 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -112,7 +112,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(SC_UNO_VBAGLOBNAME), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(SC_UNO_VBAGLOBNAME), 0, &getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, @@ -137,7 +137,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_SPELLONLINE), PROP_UNO_SPELLONLINE, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), PROP_UNO_STANDARDDEC, &getCppuType((sal_Int16*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_REGEXENABLED), PROP_UNO_REGEXENABLED, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID), 0, &getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_HASVALIDSIGNATURES),0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_ISLOADED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_ISUNDOENABLED), 0, &getBooleanCppuType(), 0, 0}, @@ -145,8 +145,8 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_ISEXECUTELINKENABLED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_ISCHANGEREADONLYENABLED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_REFERENCEDEVICE), 0, &getCppuType((uno::Reference<awt::XDevice>*)0), beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN("BuildId"), 0, &::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_CODENAME), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN("BuildId"), 0, &::getCppuType(static_cast< const OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_CODENAME), 0, &getCppuType(static_cast< const OUString * >(0)), 0, 0}, {0,0,0,0,0,0} }; @@ -229,64 +229,64 @@ ScPrintUIOptions::ScPrintUIOptions() m_aUIProperties.realloc(nNumProps); // load the writer PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = rtl::OUString("OptionsUIFile"); - m_aUIProperties[nIdx++].Value <<= rtl::OUString("modules/scalc/ui/printeroptions.ui"); + m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx++].Value <<= OUString("modules/scalc/ui/printeroptions.ui"); // create Section for spreadsheet (results in an extra tab page in dialog) SvtModuleOptions aOpt; String aAppGroupname( aStrings.GetString( 9 ) ); aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), aOpt.GetModuleName( SvtModuleOptions::E_SCALC ) ); - m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, rtl::OUString()); + m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, OUString()); // show subgroup for pages - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", rtl::OUString(aStrings.GetString(0)), rtl::OUString()); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", OUString(aStrings.GetString(0)), OUString()); // create a bool option for empty pages - m_aUIProperties[nIdx++].Value = setBoolControlOpt("includeemptypages", rtl::OUString( aStrings.GetString( 1 ) ), + m_aUIProperties[nIdx++].Value = setBoolControlOpt("includeemptypages", OUString( aStrings.GetString( 1 ) ), ".HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox", "IsIncludeEmptyPages", ! bSuppress); // show Subgroup for print content vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" ); - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aStrings.GetString(2)), - rtl::OUString(), + aPrintRangeOpt.maGroupHint = OUString( "PrintRange" ); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aStrings.GetString(2)), + OUString(), aPrintRangeOpt); // create a choice for the content to create - uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); + uno::Sequence< OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); aChoices[0] = aStrings.GetString( 3 ); - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); aWidgetIds[0] = "printallsheets"; aChoices[1] = aStrings.GetString( 4 ); - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); aWidgetIds[1] = "printselectedsheets"; aChoices[2] = aStrings.GetString( 5 ); - aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); + aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); aWidgetIds[2] = "printselectedcells"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, "PrintContent", aChoices, nContent ); // show Subgroup for print range aPrintRangeOpt.mbInternalOnly = sal_True; - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("fromwhich", rtl::OUString(aStrings.GetString(6)), - rtl::OUString(), + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("fromwhich", OUString(aStrings.GetString(6)), + OUString(), aPrintRangeOpt); // create a choice for the range to print - rtl::OUString aPrintRangeName( "PrintRange" ); + OUString aPrintRangeName( "PrintRange" ); aChoices.realloc( 2 ); aHelpIds.realloc( 2 ); aWidgetIds.realloc( 2 ); aChoices[0] = aStrings.GetString( 7 ); - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); aWidgetIds[0] = "printallpages"; aChoices[1] = aStrings.GetString( 8 ); - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); aWidgetIds[1] = "printpages"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintRangeName, aChoices, @@ -294,9 +294,9 @@ ScPrintUIOptions::ScPrintUIOptions() // create a an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); - m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", rtl::OUString(), + m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", OUString(), ".HelpID:vcl:PrintDialog:PageRange:Edit", - "PageRange", rtl::OUString(), aPageRangeOpt); + "PageRange", OUString(), aPageRangeOpt); assert(nIdx == nNumProps); } @@ -316,7 +316,7 @@ void ScPrintUIOptions::SetDefaults() { for (sal_Int32 nPropPos=0; nPropPos<aUIProp.getLength(); ++nPropPos) { - rtl::OUString aName = aUIProp[nPropPos].Name; + OUString aName = aUIProp[nPropPos].Name; if ( aName == "Property" ) { beans::PropertyValue aPropertyValue; @@ -776,7 +776,7 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, bool bHasPrintContent = false; sal_Int32 nPrintContent = 0; // all sheets / selected sheets / selected cells sal_Int32 nPrintRange = 0; // all pages / pages - rtl::OUString aPageRange; // "pages" edit value + OUString aPageRange; // "pages" edit value for( sal_Int32 i = 0, nLen = rOptions.getLength(); i < nLen; i++ ) { @@ -936,7 +936,7 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection, SolarMutexGuard aGuard; if (!pDocShell) { - throw lang::DisposedException( ::rtl::OUString(), + throw lang::DisposedException( OUString(), static_cast< sheet::XSpreadsheetDocument* >(this) ); } @@ -987,7 +987,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 SolarMutexGuard aGuard; if (!pDocShell) { - throw lang::DisposedException( ::rtl::OUString(), + throw lang::DisposedException( OUString(), static_cast< sheet::XSpreadsheetDocument* >(this) ); } @@ -1019,7 +1019,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 uno::Sequence<beans::PropertyValue> aSequence(1); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); pArray[0].Value <<= aPageSize; if( ! pPrinterOptions ) @@ -1066,17 +1066,17 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 long nPropCount = bWasCellRange ? 3 : 2; uno::Sequence<beans::PropertyValue> aSequence(nPropCount); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); pArray[0].Value <<= aPageSize; // #i111158# all positions are relative to the whole page, including non-printable area - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); pArray[1].Value = uno::makeAny( sal_True ); if ( bWasCellRange ) { table::CellRangeAddress aRangeAddress( nTab, aCellRange.aStart.Col(), aCellRange.aStart.Row(), aCellRange.aEnd.Col(), aCellRange.aEnd.Row() ); - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); pArray[2].Value <<= aRangeAddress; } @@ -1095,7 +1095,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec SolarMutexGuard aGuard; if (!pDocShell) { - throw lang::DisposedException( ::rtl::OUString(), + throw lang::DisposedException( OUString(), static_cast< sheet::XSpreadsheetDocument* >(this) ); } @@ -1169,7 +1169,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec // the sheet starts at the top of the page Rectangle aArea( pDev->PixelToLogic( Rectangle( 0,0,0,0 ) ) ); sal_Int32 nDestID = pPDFData->CreateDest( aArea ); - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( nTab, aTabName ); sal_Int32 nParent = -1; // top-level pPDFData->CreateOutlineItem( nParent, aTabName, nDestID ); @@ -1178,7 +1178,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec if( pPDFData && pPDFData->GetIsExportNamedDestinations() ) { Rectangle aArea( pDev->PixelToLogic( Rectangle( 0,0,0,0 ) ) ); - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( nTab, aTabName ); //need the PDF page number here pPDFData->CreateNamedDest( aTabName, aArea ); @@ -1198,7 +1198,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec std::vector< vcl::PDFExtOutDevBookmarkEntry >::iterator aIEnd = rBookmarks.end(); while ( aIter != aIEnd ) { - rtl::OUString aBookmark = aIter->aBookmark; + OUString aBookmark = aIter->aBookmark; if ( aBookmark.toChar() == (sal_Unicode) '#' ) { // try to resolve internal link @@ -1414,7 +1414,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn ) // XProtectable -void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::RuntimeException) +void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; // #i108245# if already protected, don't change anything @@ -1425,7 +1425,7 @@ void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::R } } -void SAL_CALL ScModelObj::unprotect( const rtl::OUString& aPassword ) +void SAL_CALL ScModelObj::unprotect( const OUString& aPassword ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1465,7 +1465,7 @@ uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(un sheet::GoalResult SAL_CALL ScModelObj::seekGoal( const table::CellAddress& aFormulaPosition, const table::CellAddress& aVariablePosition, - const ::rtl::OUString& aGoalValue ) + const OUString& aGoalValue ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1556,10 +1556,10 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) uno::Sequence< beans::PropertyValue > aSeq; aSeq.realloc(1); - rtl::OUString sName; + OUString sName; pDocShell->GetDocument()->GetName( pDocShell->GetDocument()->GetVisibleTab(), sName ); - rtl::OUString sOUName(sName); - aSeq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + OUString sOUName(sName); + aSeq[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); aSeq[0].Value <<= sOUName; xCont->insertByIndex( 0, uno::makeAny( aSeq ) ); } @@ -1581,7 +1581,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo( } void SAL_CALL ScModelObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1620,7 +1620,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } else if ( aString.EqualsAscii( SC_UNO_CODENAME ) ) { - rtl::OUString sCodeName; + OUString sCodeName; if ( aValue >>= sCodeName ) pDoc->SetCodeName( sCodeName ); } @@ -1699,7 +1699,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } else if ( aString.EqualsAscii( "SavedObject" ) ) // set from chart after saving { - rtl::OUString aObjName; + OUString aObjName; aValue >>= aObjName; if ( !aObjName.isEmpty() ) pDoc->RestoreChartListener( aObjName ); @@ -1716,7 +1716,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } } -uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1744,7 +1744,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa } else if ( aString.EqualsAscii( SC_UNO_CODENAME ) ) { - rtl::OUString sCodeName = pDoc->GetCodeName(); + OUString sCodeName = pDoc->GetCodeName(); aRet <<= sCodeName; } @@ -1839,7 +1839,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa That constant will be equivelant to 'ThisComponent' but for each application, so e.g. a 'ThisExcelDoc' and a 'ThisWordDoc' constant can co-exist, as required by VBA. */ - aRet <<= rtl::OUString( "ThisExcelDoc" ); + aRet <<= OUString( "ThisExcelDoc" ); } else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) ) { @@ -1893,7 +1893,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScModelObj ) // XMultiServiceFactory uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( - const rtl::OUString& aServiceSpecifier ) + const OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1972,7 +1972,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( } uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments( - const rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const uno::Sequence<uno::Any>& aArgs ) throw(uno::Exception, uno::RuntimeException) { @@ -1993,7 +1993,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments return xInt; } -uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() +uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2002,20 +2002,20 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(), //! SvxFmMSFactory::getAvailableServiceNames() ); - uno::Sequence<rtl::OUString> aMyServices(ScServiceProvider::GetAllServiceNames()); - uno::Sequence<rtl::OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames()); + uno::Sequence<OUString> aMyServices(ScServiceProvider::GetAllServiceNames()); + uno::Sequence<OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames()); return concatServiceNames( aMyServices, aDrawServices ); } // XServiceInfo -rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScModelObj" ); + return OUString( "ScModelObj" ); } -sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -2024,13 +2024,13 @@ sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName aServiceStr.EqualsAscii( SCDOC_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); return aRet; } @@ -2119,7 +2119,7 @@ bool ScModelObj::HasChangesListeners() const return pDocShell && pDocShell->GetDocument()->HasAnySheetEventScript(SC_SHEETEVENT_CHANGE); } -void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRangeList& rRanges, +void ScModelObj::NotifyChanges( const OUString& rOperation, const ScRangeList& rRanges, const uno::Sequence< beans::PropertyValue >& rProperties ) { if ( pDocShell && HasChangesListeners() ) @@ -2178,7 +2178,7 @@ void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRange const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CHANGE); + const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CHANGE); if (pScript) { ScRangeList aTabRanges; // collect ranges on this sheet @@ -2235,7 +2235,7 @@ void ScModelObj::HandleCalculateEvents() { if (const ScSheetEvents* pEvents = pDoc->GetSheetEvents( nTab )) { - if (const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CALCULATE)) + if (const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CALCULATE)) { uno::Any aRet; uno::Sequence<uno::Any> aParams; @@ -2315,7 +2315,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sa uno::Reference<drawing::XDrawPage> xRet; if (pDocShell) { - rtl::OUString aNewName; + OUString aNewName; pDocShell->GetDocument()->CreateValidTabName(aNewName); if ( pDocShell->GetDocFunc().InsertTable( static_cast<SCTAB>(nPos), aNewName, true, true ) ) @@ -2409,7 +2409,7 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const return NULL; } -ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const OUString& aName) const { if (pDocShell) { @@ -2420,7 +2420,7 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const rtl::OUString& aNa return NULL; } -void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal_Int16 nPosition ) +void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int16 nPosition ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2434,7 +2434,7 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int16 nDestination ) +void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDestination ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2449,8 +2449,8 @@ void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int1 throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, - const rtl::OUString& aCopy, sal_Int16 nDestination ) +void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName, + const OUString& aCopy, sal_Int16 nDestination ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2479,7 +2479,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2531,7 +2531,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2583,7 +2583,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const } } -void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2604,7 +2604,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) sal_Int32 ScTableSheetsObj::importSheet( const uno::Reference < sheet::XSpreadsheetDocument > & xDocSrc, - const rtl::OUString& srcName, const sal_Int32 nDestPosition ) + const OUString& srcName, const sal_Int32 nDestPosition ) throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, uno::RuntimeException ) { //pDocShell is the destination @@ -2660,7 +2660,7 @@ uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPos return xSheet->getCellRangeByPosition(nLeft, nTop, nRight, nBottom); } -uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const rtl::OUString& aRange ) +uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const OUString& aRange ) throw (lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2695,7 +2695,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); } // XIndexAccess @@ -2735,7 +2735,7 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException) // XNameAccess -uno::Any SAL_CALL ScTableSheetsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2747,7 +2747,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetsObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2755,9 +2755,9 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetsObj::getElementNames() { ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString aName; - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + OUString aName; + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (SCTAB i=0; i<nCount; i++) { pDoc->GetName( i, aName ); @@ -2765,10 +2765,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetsObj::getElementNames() } return aSeq; } - return uno::Sequence<rtl::OUString>(); + return uno::Sequence<OUString>(); } -sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2822,7 +2822,7 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) con return NULL; // falscher Index } -ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const OUString& aName) const { SCCOL nCol = 0; String aString(aName); @@ -2871,7 +2871,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableColumnsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableColumnsEnumeration")); } // XIndexAccess @@ -2906,7 +2906,7 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScTableColumnsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2918,20 +2918,20 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScTableColumnsObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SCCOL nCount = nEndCol - nStartCol + 1; - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (SCCOL i=0; i<nCount; i++) pAry[i] = ::ScColToAlpha( nStartCol + i ); return aSeq; } -sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2956,7 +2956,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertyS } void SAL_CALL ScTableColumnsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3005,7 +3005,7 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3130,7 +3130,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableRowsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableRowsEnumeration")); } // XIndexAccess @@ -3177,7 +3177,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetI } void SAL_CALL ScTableRowsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3278,7 +3278,7 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3368,7 +3368,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPr } void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( - const rtl::OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) + const OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3376,7 +3376,7 @@ void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( //! muss noch } -uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ ) +uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* aPropertyName */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3446,7 +3446,7 @@ ScAnnotationObj* ScAnnotationsObj::GetObjectByIndex_Impl( sal_Int32 nIndex ) con // XSheetAnnotations void SAL_CALL ScAnnotationsObj::insertNew( - const table::CellAddress& aPosition, const ::rtl::OUString& rText ) + const table::CellAddress& aPosition, const OUString& rText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3483,7 +3483,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera //! iterate directly (more efficiently)? SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); } // XIndexAccess @@ -3554,13 +3554,13 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XScenarios -sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const rtl::OUString& rName, SCTAB& rIndex ) +sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex ) { //! Case-insensitiv ???? if ( pDocShell ) { - rtl::OUString aTabName; + OUString aTabName; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nCount = (SCTAB)getCount(); for (SCTAB i=0; i<nCount; i++) @@ -3584,7 +3584,7 @@ ScTableSheetObj* ScScenariosObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return NULL; // kein Dokument oder falscher Index } -ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const OUString& aName) { SCTAB nIndex; if ( pDocShell && GetScenarioIndex_Impl( aName, nIndex ) ) @@ -3593,9 +3593,9 @@ ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const rtl::OUString& aName return NULL; // nicht gefunden } -void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, +void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName, const uno::Sequence<table::CellRangeAddress>& aRanges, - const rtl::OUString& aComment ) + const OUString& aComment ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3628,7 +3628,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, } } -void SAL_CALL ScScenariosObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3643,7 +3643,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.ScenariosEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.ScenariosEnumeration")); } // XIndexAccess @@ -3693,7 +3693,7 @@ sal_Bool SAL_CALL ScScenariosObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScScenariosObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3705,18 +3705,18 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScScenariosObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SCTAB nCount = (SCTAB)getCount(); - uno::Sequence<rtl::OUString> aSeq(nCount); + uno::Sequence<OUString> aSeq(nCount); if ( pDocShell ) // sonst ist auch Count = 0 { - rtl::OUString aTabName; + OUString aTabName; ScDocument* pDoc = pDocShell->GetDocument(); - rtl::OUString* pAry = aSeq.getArray(); + OUString* pAry = aSeq.getArray(); for (SCTAB i=0; i<nCount; i++) if (pDoc->GetName( nTab+i+1, aTabName )) pAry[i] = aTabName; @@ -3725,7 +3725,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScScenariosObj::getElementNames() return aSeq; } -sal_Bool SAL_CALL ScScenariosObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 8c2822ea6f77..5539a3f47fe9 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -56,7 +56,7 @@ void ScSheetEventsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -static sal_Int32 lcl_GetEventFromName( const rtl::OUString& aName ) +static sal_Int32 lcl_GetEventFromName( const OUString& aName ) { for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent) if ( aName == ScSheetEvents::GetEventName(nEvent) ) @@ -67,7 +67,7 @@ static sal_Int32 lcl_GetEventFromName( const rtl::OUString& aName ) // XNameReplace -void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -84,7 +84,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const if (pOldEvents) aNewEvents = *pOldEvents; - rtl::OUString aScript; + OUString aScript; if ( aElement.hasValue() ) // empty Any -> reset event { uno::Sequence<beans::PropertyValue> aPropSeq; @@ -96,7 +96,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const const beans::PropertyValue& rProp = aPropSeq[nPos]; if ( rProp.Name.compareToAscii( SC_UNO_EVENTTYPE ) == 0 ) { - rtl::OUString aEventType; + OUString aEventType; if ( rProp.Value >>= aEventType ) { // only "Script" is supported @@ -120,7 +120,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const // XNameAccess -uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -128,7 +128,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) if (nEvent < 0) throw container::NoSuchElementException(); - const rtl::OUString* pScript = NULL; + const OUString* pScript = NULL; if (mpDocShell) { const ScSheetEvents* pEvents = mpDocShell->GetDocument()->GetSheetEvents(mnTab); @@ -141,10 +141,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) { uno::Sequence<beans::PropertyValue> aPropSeq( 2 ); aPropSeq[0] = beans::PropertyValue( - rtl::OUString("EventType"), -1, - uno::makeAny( rtl::OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); + OUString("EventType"), -1, + uno::makeAny( OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); aPropSeq[1] = beans::PropertyValue( - rtl::OUString("Script"), -1, + OUString("Script"), -1, uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE ); aRet <<= aPropSeq; } @@ -152,16 +152,16 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) return aRet; } -uno::Sequence<rtl::OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence<rtl::OUString> aNames(SC_SHEETEVENT_COUNT); + uno::Sequence<OUString> aNames(SC_SHEETEVENT_COUNT); for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent) aNames[nEvent] = ScSheetEvents::GetEventName(nEvent); return aNames; } -sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; sal_Int32 nEvent = lcl_GetEventFromName(aName); diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index d47d01691aba..13ace176952f 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -28,10 +28,10 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) throw (com::sun::star::uno::RuntimeException); static com::sun::star::uno::Sequence<OUString> impl_getStaticSupportedServiceNames(); diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index b478f1bd146c..c42c119990ca 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -81,10 +81,10 @@ const SfxItemPropertySet* lcl_GetURLPropertySet() { {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_TARGET), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_REPR), 0, &getCppuType((OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_TARGET), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((OUString*)0), 0, 0}, {0,0,0,0,0,0} }; static SfxItemPropertySet aURLPropertySet_Impl( aURLPropertyMap_Impl ); @@ -392,7 +392,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScCellFieldsObj::addContainerListener( @@ -572,7 +572,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScHeaderFieldsObj::addContainerListener( @@ -662,7 +662,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::EXTENDED_FILE: mpData.reset( - new SvxExtFileField(rtl::OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT)); + new SvxExtFileField(OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT)); break; case text::textfield::Type::PAGE: mpData.reset(new SvxPageField); @@ -689,7 +689,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::URL: mpData.reset( - new SvxURLField(rtl::OUString(), rtl::OUString(), SVXURLFORMAT_APPDEFAULT)); + new SvxURLField(OUString(), OUString(), SVXURLFORMAT_APPDEFAULT)); break; default: mpData.reset(new SvxFieldData); @@ -698,9 +698,9 @@ SvxFieldData* ScEditFieldObj::getData() return mpData.get(); } -void ScEditFieldObj::setPropertyValueURL(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal) +void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const com::sun::star::uno::Any& rVal) { - rtl::OUString aStrVal; + OUString aStrVal; if (mpEditSource) { // Edit engine instance already exists for this field item. Use it. @@ -768,7 +768,7 @@ void ScEditFieldObj::setPropertyValueURL(const rtl::OUString& rName, const com:: throw beans::UnknownPropertyException(); } -uno::Any ScEditFieldObj::getPropertyValueURL(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueURL(const OUString& rName) { uno::Any aRet; @@ -820,7 +820,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const rtl::OUString& rName) return aRet; } -void ScEditFieldObj::setPropertyValueFile(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueFile(const OUString& rName, const uno::Any& rVal) { if (rName == SC_UNONAME_FILEFORM) { @@ -855,7 +855,7 @@ void ScEditFieldObj::setPropertyValueFile(const rtl::OUString& rName, const uno: throw beans::UnknownPropertyException(); } -uno::Any ScEditFieldObj::getPropertyValueFile(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueFile(const OUString& rName) { uno::Any aRet; if (rName == SC_UNONAME_FILEFORM) @@ -887,7 +887,7 @@ uno::Any ScEditFieldObj::getPropertyValueFile(const rtl::OUString& rName) return aRet; } -void ScEditFieldObj::setPropertyValueDateTime(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::Any& rVal) { if (mpEditSource) { @@ -981,7 +981,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const rtl::OUString& rName, const } } -uno::Any ScEditFieldObj::getPropertyValueDateTime(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName) { if (mpEditSource) { @@ -1086,7 +1086,7 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const rtl::OUString& rName) throw beans::UnknownPropertyException(); } -void ScEditFieldObj::setPropertyValueSheet(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any& rVal) { if (mpEditSource) { @@ -1221,13 +1221,13 @@ bool ScEditFieldObj::IsInserted() const // XTextField -rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) +OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (!mpEditSource) - return rtl::OUString(); + return OUString(); //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine(); @@ -1238,7 +1238,7 @@ rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) aSelection.nStartPara, aSelection.nStartPos, text::textfield::Type::UNSPECIFIED); OSL_ENSURE(pField,"getPresentation: Feld nicht gefunden"); if (!pField) - return rtl::OUString(); + return OUString(); switch (meType) { @@ -1255,7 +1255,7 @@ rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) default: ; } - return rtl::OUString(); + return OUString(); } // XTextContent @@ -1312,7 +1312,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScEditFieldObj::getPropertySetI } void SAL_CALL ScEditFieldObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1346,7 +1346,7 @@ void SAL_CALL ScEditFieldObj::setPropertyValue( } } -uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1431,22 +1431,22 @@ ScEditFieldObj* ScEditFieldObj::getImplementation(const uno::Reference<text::XTe // XServiceInfo -rtl::OUString SAL_CALL ScEditFieldObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScEditFieldObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScEditFieldObj"); + return OUString("ScEditFieldObj"); } -sal_Bool SAL_CALL ScEditFieldObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScEditFieldObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { return rServiceName == SCTEXTFIELD_SERVICE || rServiceName == SCTEXTCONTENT_SERVICE; } -uno::Sequence<rtl::OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); pArray[0] = SCTEXTFIELD_SERVICE; pArray[1] = SCTEXTCONTENT_SERVICE; return aRet; diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 0357c88e213b..3e4e0883642d 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; -using ::rtl::OUStringBuffer; using namespace rtl; using namespace com::sun::star::uno; @@ -133,16 +132,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance( return (::cppu::OWeakObject*) new ScFilterOptionsObj; } -rtl::OUString ScFilterOptionsObj::getImplementationName_Static() +OUString ScFilterOptionsObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); } -uno::Sequence<rtl::OUString> ScFilterOptionsObj::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScFilterOptionsObj::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); return aRet; } @@ -153,7 +152,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); pArray[0].Value <<= aFilterOptions; return aRet; @@ -183,7 +182,7 @@ void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans:: // XExecutableDialog -void SAL_CALL ScFilterOptionsObj::setTitle( const ::rtl::OUString& /* aTitle */ ) throw(uno::RuntimeException) +void SAL_CALL ScFilterOptionsObj::setTitle( const OUString& /* aTitle */ ) throw(uno::RuntimeException) { // not used } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index e5dcc7f7f882..197321325c2c 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -48,11 +48,11 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() static SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ERRALSTY), 0, &getCppuType((sheet::ValidationAlertStyle*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_ERRMESS), 0, &getCppuType((rtl::OUString*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_ERRTITLE), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_ERRMESS), 0, &getCppuType((OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_ERRTITLE), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_IGNOREBL), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_INPMESS), 0, &getCppuType((rtl::OUString*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_INPTITLE), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_INPMESS), 0, &getCppuType((OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_INPTITLE), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SHOWERR), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SHOWINP), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SHOWLIST), 0, &getCppuType((sal_Int16*)0), 0, 0}, @@ -279,7 +279,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else if ( rProp.Name == SC_UNONAME_FORMULA1 ) { - rtl::OUString aStrVal; + OUString aStrVal; uno::Sequence<sheet::FormulaToken> aTokens; if ( rProp.Value >>= aStrVal ) aEntry.maExpr1 = aStrVal; @@ -291,7 +291,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else if ( rProp.Name == SC_UNONAME_FORMULA2 ) { - rtl::OUString aStrVal; + OUString aStrVal; uno::Sequence<sheet::FormulaToken> aTokens; if ( rProp.Value >>= aStrVal ) aEntry.maExpr2 = aStrVal; @@ -309,26 +309,26 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else if ( rProp.Name == SC_UNONAME_SOURCESTR ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maPosStr = String( aStrVal ); } else if ( rProp.Name == SC_UNONAME_STYLENAME ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PARA ); } else if ( rProp.Name == SC_UNONAME_FORMULANMSP1 ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maExprNmsp1 = aStrVal; } else if ( rProp.Name == SC_UNONAME_FORMULANMSP2 ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maExprNmsp2 = aStrVal; } @@ -383,7 +383,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); } // XIndexAccess @@ -421,14 +421,14 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce // conditional format entries have no real names // -> generate name from index -static rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) +static OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) { - rtl::OUString aRet( "Entry" ); - aRet += rtl::OUString::valueOf( nIndex ); + OUString aRet( "Entry" ); + aRet += OUString::valueOf( nIndex ); return aRet; } -uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -449,21 +449,21 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aNam throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScTableConditionalFormat::getElementNames() +uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; long nCount = aEntries.size(); - uno::Sequence<rtl::OUString> aNames(nCount); - rtl::OUString* pArray = aNames.getArray(); + uno::Sequence<OUString> aNames(nCount); + OUString* pArray = aNames.getArray(); for (long i=0; i<nCount; i++) pArray[i] = lcl_GetEntryNameFromIndex(i); return aNames; } -sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -557,26 +557,26 @@ void SAL_CALL ScTableConditionalEntry::setConditionOperator( sal_Int32 nOperator aData.meMode = ScConditionEntry::GetModeFromApi( nOperator ); } -rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException) +OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aData.maExpr1; } -void SAL_CALL ScTableConditionalEntry::setFormula1( const rtl::OUString& aFormula1 ) +void SAL_CALL ScTableConditionalEntry::setFormula1( const OUString& aFormula1 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; aData.maExpr1 = String( aFormula1 ); } -rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula2() throw(uno::RuntimeException) +OUString SAL_CALL ScTableConditionalEntry::getFormula2() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aData.maExpr2; } -void SAL_CALL ScTableConditionalEntry::setFormula2( const rtl::OUString& aFormula2 ) +void SAL_CALL ScTableConditionalEntry::setFormula2( const OUString& aFormula2 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -602,13 +602,13 @@ void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddre // XSheetConditionalEntry -rtl::OUString SAL_CALL ScTableConditionalEntry::getStyleName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableConditionalEntry::getStyleName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return ScStyleNameConversion::DisplayToProgrammaticName( aData.maStyle, SFX_STYLE_FAMILY_PARA ); } -void SAL_CALL ScTableConditionalEntry::setStyleName( const rtl::OUString& aStyleName ) +void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -755,26 +755,26 @@ void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator ) nMode = sal::static_int_cast<sal_uInt16>( ScConditionEntry::GetModeFromApi( nOperator ) ); } -rtl::OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException) +OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aExpr1; } -void SAL_CALL ScTableValidationObj::setFormula1( const rtl::OUString& aFormula1 ) +void SAL_CALL ScTableValidationObj::setFormula1( const OUString& aFormula1 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; aExpr1 = String( aFormula1 ); } -rtl::OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException) +OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aExpr2; } -void SAL_CALL ScTableValidationObj::setFormula2( const rtl::OUString& aFormula2 ) +void SAL_CALL ScTableValidationObj::setFormula2( const OUString& aFormula2 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -842,7 +842,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getProper } void SAL_CALL ScTableValidationObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -856,25 +856,25 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aValue >>= nShowList; else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aInputTitle = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aInputMessage = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aErrorTitle = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aErrorMessage = String( aStrVal ); } @@ -918,7 +918,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aPosString = String( aStrVal ); } @@ -926,7 +926,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) maExprNmsp1 = aStrVal; } @@ -934,7 +934,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) maExprNmsp2 = aStrVal; } @@ -956,7 +956,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -968,10 +968,10 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowError ); else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bIgnoreBlank ); else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aRet <<= nShowList; - else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) aRet <<= rtl::OUString( aInputTitle ); - else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) aRet <<= rtl::OUString( aInputMessage ); - else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) aRet <<= rtl::OUString( aErrorTitle ); - else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) aRet <<= rtl::OUString( aErrorMessage ); + else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) aRet <<= OUString( aInputTitle ); + else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) aRet <<= OUString( aInputMessage ); + else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) aRet <<= OUString( aErrorTitle ); + else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) aRet <<= OUString( aErrorMessage ); else if ( aString.EqualsAscii( SC_UNONAME_TYPE ) ) { sheet::ValidationType eType = sheet::ValidationType_ANY; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 558d17012067..61f2074e529c 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -244,27 +244,27 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( return xInst; } -rtl::OUString ScFunctionAccess::getImplementationName_Static() +OUString ScFunctionAccess::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScFunctionAccess" ); + return OUString( "stardiv.StarCalc.ScFunctionAccess" ); } -uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScFunctionAccess::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); return aRet; } // XServiceInfo -rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScFunctionAccess"); + return OUString( "ScFunctionAccess"); } -sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -272,13 +272,13 @@ sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServi aServiceStr.EqualsAscii( SCDOCSETTINGS_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); return aRet; } @@ -294,7 +294,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySe } void SAL_CALL ScFunctionAccess::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -319,7 +319,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue( } } -uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -340,10 +340,10 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess ) // XFunctionAccess -static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,const ScCompiler& rCompiler ) +static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const OUString& rName,const ScCompiler& rCompiler ) { // function names are always case-insensitive - rtl::OUString aUpper = ScGlobal::pCharClass->uppercase(rName); + OUString aUpper = ScGlobal::pCharClass->uppercase(rName); // same options as in ScCompiler::IsOpCode: // 1. built-in function name @@ -365,7 +365,7 @@ static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& // 3. new (uno) add in functions - rtl::OUString aIntName = + OUString aIntName = ScGlobal::GetAddInCollection()->FindFunction(aUpper, false); if (!aIntName.isEmpty()) { @@ -398,7 +398,7 @@ public: SimpleVisitor( ScDocument* pDoc ) : mbArgError( false ), mpDoc( pDoc ) {} // could possibly just get away with JUST the following overload // 1) virtual void visitElem( long& nCol, long& nRow, const double& elem ) - // 2) virtual void visitElem( long& nCol, long& nRow, const rtl::OUString& elem ) + // 2) virtual void visitElem( long& nCol, long& nRow, const OUString& elem ) // 3) virtual void visitElem( long& nCol, long& nRow, const uno::Any& elem ) // the other types methods are here just to reflect the orig code and for // completeness. @@ -415,7 +415,7 @@ public: { mpDoc->SetValue( (SCCOL) nCol, (SCROW) nRow, 0, elem ); } - void visitElem( long nCol, long nRow, const rtl::OUString& elem ) + void visitElem( long nCol, long nRow, const OUString& elem ) { if (!elem.isEmpty()) { @@ -447,7 +447,7 @@ public: } else if ( eElemClass == uno::TypeClass_STRING ) { - rtl::OUString aUStr; + OUString aUStr; rElement >>= aUStr; visitElem( nCol, nRow, aUStr ); } @@ -517,7 +517,7 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr } }; -uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, +uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, const uno::Sequence<uno::Any>& aArguments ) throw(container::NoSuchElementException, lang::IllegalArgumentException, uno::RuntimeException) @@ -597,7 +597,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, } else if ( eClass == uno::TypeClass_STRING ) { - rtl::OUString aUStr; + OUString aUStr; rArg >>= aUStr; String aStr( aUStr ); aTokenArr.AddString( aStr.GetBuffer() ); @@ -614,9 +614,9 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, { ArrayOfArrayProc<double>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } - else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<rtl::OUString> > *)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<OUString> > *)0 ) ) ) { - ArrayOfArrayProc<rtl::OUString>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); + ArrayOfArrayProc<OUString>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<uno::Any> > *)0 ) ) ) { @@ -699,7 +699,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, else { // string result - rtl::OUString aStrVal = pFormula->GetString(); + OUString aStrVal = pFormula->GetString(); aRet <<= aStrVal; } } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 38f1ce4bd610..3cff46ba8287 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -45,7 +45,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; using ::std::vector; //------------------------------------------------------------------------ @@ -55,9 +54,9 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { static SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {0,0,0,0,0,0} @@ -130,13 +129,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const // XNamed -rtl::OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return getFileName(); // Name ist der Dateiname (URL) } -void SAL_CALL ScSheetLinkObj::setName( const rtl::OUString& aName ) throw(uno::RuntimeException) +void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; setFileName(aName); // Name ist der Dateiname (URL) @@ -212,14 +211,14 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetI } void SAL_CALL ScSheetLinkObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; String aNameString(aPropertyName); - rtl::OUString aValStr; + OUString aValStr; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) { if ( aValue >>= aValStr ) @@ -249,7 +248,7 @@ void SAL_CALL ScSheetLinkObj::setPropertyValue( } } -uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -273,13 +272,13 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSheetLinkObj ) // internal: -rtl::OUString ScSheetLinkObj::getFileName(void) const +OUString ScSheetLinkObj::getFileName(void) const { SolarMutexGuard aGuard; return aFileName; } -void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) +void ScSheetLinkObj::setFileName(const OUString& rNewName) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -295,7 +294,7 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) - if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == rtl::OUString(aFileName) ) // alte Datei + if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == OUString(aFileName) ) // alte Datei pDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), aNewStr, pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab), pDoc->GetLinkTab(nTab), @@ -316,17 +315,17 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) } } -rtl::OUString ScSheetLinkObj::getFilter(void) const +OUString ScSheetLinkObj::getFilter(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScTableLink* pLink = GetLink_Impl(); if (pLink) aRet = pLink->GetFilterName(); return aRet; } -void ScSheetLinkObj::setFilter(const rtl::OUString& Filter) +void ScSheetLinkObj::setFilter(const OUString& Filter) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -337,17 +336,17 @@ void ScSheetLinkObj::setFilter(const rtl::OUString& Filter) } } -rtl::OUString ScSheetLinkObj::getFilterOptions(void) const +OUString ScSheetLinkObj::getFilterOptions(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScTableLink* pLink = GetLink_Impl(); if (pLink) aRet = pLink->GetOptions(); return aRet; } -void ScSheetLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) +void ScSheetLinkObj::setFilterOptions(const OUString& FilterOptions) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -406,7 +405,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) if (!pDocShell) return NULL; - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType; + typedef boost::unordered_set<OUString, OUStringHash> StrSetType; StrSetType aNames; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); @@ -416,7 +415,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) { // unique document name. @@ -429,7 +428,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return NULL; // kein Dokument oder Index zu gross } -ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName) { // Name ist der Dateiname @@ -458,14 +457,14 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetLinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetLinksEnumeration")); } // XIndexAccess sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException) { - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType; + typedef boost::unordered_set<OUString, OUStringHash> StrSetType; SolarMutexGuard aGuard; if (!pDocShell) @@ -481,7 +480,7 @@ sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException) if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) ++nCount; } @@ -512,7 +511,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScSheetLinksObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -525,7 +524,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -549,30 +548,30 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) return false; } -uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException) { - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType; + typedef boost::unordered_set<OUString, OUStringHash> StrSetType; SolarMutexGuard aGuard; // Name ist der Dateiname if (!pDocShell) - return uno::Sequence<rtl::OUString>(); + return uno::Sequence<OUString>(); StrSetType aNames; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); sal_Int32 nLinkCount = getCount(); - uno::Sequence<rtl::OUString> aSeq(nLinkCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nLinkCount); + OUString* pAry = aSeq.getArray(); sal_uInt16 nPos = 0; for (SCTAB nTab = 0; nTab < nTabCount; ++nTab) { if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) pAry[nPos++] = aLinkDoc; } @@ -642,8 +641,8 @@ void ScAreaLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XFileLink -void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUString* pNewFilter, - const rtl::OUString* pNewOptions, const rtl::OUString* pNewSource, +void ScAreaLinkObj::Modify_Impl( const OUString* pNewFile, const OUString* pNewFilter, + const OUString* pNewOptions, const OUString* pNewSource, const table::CellRangeAddress* pNewDest ) { ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); @@ -755,14 +754,14 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetIn } void SAL_CALL ScAreaLinkObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; String aNameString(aPropertyName); - rtl::OUString aValStr; + OUString aValStr; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) { if ( aValue >>= aValStr ) @@ -792,7 +791,7 @@ void SAL_CALL ScAreaLinkObj::setPropertyValue( } } -uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -816,49 +815,49 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAreaLinkObj ) // internal: -rtl::OUString ScAreaLinkObj::getFileName(void) const +OUString ScAreaLinkObj::getFileName(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetFile(); return aRet; } -void ScAreaLinkObj::setFileName(const rtl::OUString& rNewName) +void ScAreaLinkObj::setFileName(const OUString& rNewName) { SolarMutexGuard aGuard; Modify_Impl( &rNewName, NULL, NULL, NULL, NULL ); } -rtl::OUString ScAreaLinkObj::getFilter(void) const +OUString ScAreaLinkObj::getFilter(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetFilter(); return aRet; } -void ScAreaLinkObj::setFilter(const rtl::OUString& Filter) +void ScAreaLinkObj::setFilter(const OUString& Filter) { SolarMutexGuard aGuard; Modify_Impl( NULL, &Filter, NULL, NULL, NULL ); } -rtl::OUString ScAreaLinkObj::getFilterOptions(void) const +OUString ScAreaLinkObj::getFilterOptions(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetOptions(); return aRet; } -void ScAreaLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) +void ScAreaLinkObj::setFilterOptions(const OUString& FilterOptions) { SolarMutexGuard aGuard; Modify_Impl( NULL, NULL, &FilterOptions, NULL, NULL ); @@ -882,17 +881,17 @@ void ScAreaLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) // XAreaLink -rtl::OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException) +OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetSource(); return aRet; } -void SAL_CALL ScAreaLinkObj::setSourceArea( const rtl::OUString& aSourceArea ) +void SAL_CALL ScAreaLinkObj::setSourceArea( const OUString& aSourceArea ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -952,10 +951,10 @@ ScAreaLinkObj* ScAreaLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) } void SAL_CALL ScAreaLinksObj::insertAtPosition( const 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(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -993,7 +992,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); } // XIndexAccess @@ -1092,13 +1091,13 @@ static String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const return aRet; } -rtl::OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return lcl_BuildDDEName( aAppl, aTopic, aItem ); } -void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) +void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException) { // name can't be changed (formulas wouldn't find the link) throw uno::RuntimeException(); @@ -1106,7 +1105,7 @@ void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(un // XDDELink -rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1114,7 +1113,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeExceptio return aAppl; } -rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1122,7 +1121,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) return aTopic; } -rtl::OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1209,7 +1208,7 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinkObj::getResults: failed to get results!" ), uno::Reference< uno::XInterface >() ); } @@ -1241,7 +1240,7 @@ void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinkObj::setResults: failed to set results!" ), uno::Reference< uno::XInterface >() ); } @@ -1286,7 +1285,7 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) { if (pDocShell) { - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; if ( nIndex <= USHRT_MAX && pDocShell->GetDocument()->GetDdeLinkData( (sal_uInt16)nIndex, aAppl, aTopic, aItem ) ) return new ScDDELinkObj( pDocShell, aAppl, aTopic, aItem ); @@ -1294,12 +1293,12 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return NULL; } -ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName) { if (pDocShell) { String aNamStr(aName); - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); @@ -1319,7 +1318,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DDELinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DDELinksEnumeration")); } // XIndexAccess @@ -1357,7 +1356,7 @@ sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScDDELinksObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1369,17 +1368,17 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) { - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (sal_uInt16 i=0; i<nCount; i++) { @@ -1388,17 +1387,17 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno } return aSeq; } - return uno::Sequence<rtl::OUString>(); + return uno::Sequence<OUString>(); } -sal_Bool SAL_CALL ScDDELinksObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) { String aNamStr(aName); - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); @@ -1415,8 +1414,8 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const rtl::OUString& aName ) // XDDELinks uno::Reference< sheet::XDDELink > ScDDELinksObj::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 (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1453,7 +1452,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( if ( pDoc->CreateDdeLink( aApplication, aTopic, aItem, nMod, ScMatrixRef() ) ) { - const ::rtl::OUString aName( lcl_BuildDDEName( aApplication, aTopic, aItem ) ); + const OUString aName( lcl_BuildDDEName( aApplication, aTopic, aItem ) ); xLink.set( GetObjectByName_Impl( aName ) ); } } @@ -1461,7 +1460,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( if ( !xLink.is() ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinksObj::addDDELink: cannot add DDE link!" ), uno::Reference< uno::XInterface >() ); } @@ -1597,7 +1596,7 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC return aSheetCache; } -Any SAL_CALL ScExternalDocLinkObj::getByName(const::rtl::OUString &aName) +Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; @@ -1729,7 +1728,7 @@ Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( return aDocLink; } -Any SAL_CALL ScExternalDocLinksObj::getByName(const::rtl::OUString &aName) +Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index f7b05a8f4bf0..f5f6719b1123 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //------------------------------------------------------------------------ @@ -42,7 +41,7 @@ uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::A } sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, - const rtl::OUString& rName, sal_Bool bDefault ) + const OUString& rName, sal_Bool bDefault ) { sal_Bool bRet = bDefault; if ( xProp.is() ) @@ -67,7 +66,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope } sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp, - const rtl::OUString& rName, long nDefault ) + const OUString& rName, long nDefault ) { sal_Int32 nRet = nDefault; if ( xProp.is() ) @@ -86,7 +85,7 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp } sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertySet>& xProp, - const rtl::OUString& rName, long nDefault ) + const OUString& rName, long nDefault ) { sal_Int32 nRet = nDefault; if ( xProp.is() ) @@ -187,7 +186,7 @@ void ScUnoHelpFunctions::SetOptionalPropertyValue( //------------------------------------------------------------------------ ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd, - const rtl::OUString& rServiceName) : + const OUString& rServiceName) : xIndex( rInd ), sServiceName(rServiceName), nPos( 0 ) @@ -222,24 +221,24 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme return aReturn; } -::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName() +OUString SAL_CALL ScIndexEnumeration::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("ScIndexEnumeration"); + return OUString("ScIndexEnumeration"); } -sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { return sServiceName == ServiceName; } -::com::sun::star::uno::Sequence< ::rtl::OUString > +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScIndexEnumeration::getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); - ::rtl::OUString* pArray = aRet.getArray(); + ::com::sun::star::uno::Sequence< OUString > aRet(1); + OUString* pArray = aRet.getArray(); pArray[0] = sServiceName; return aRet; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 3539c7e30314..511c4677b515 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -52,7 +52,7 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() static SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_TOKENINDEX), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ISSHAREDFMLA), 0, &getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} @@ -139,7 +139,7 @@ SCTAB ScNamedRangeObj::GetTab_Impl() return -2; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab; - rtl::OUString sName = mxSheet->getName(); + OUString sName = mxSheet->getName(); pDoc->GetTable(sName, nTab); return nTab; } @@ -212,13 +212,13 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p } -rtl::OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aName; } -void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -232,7 +232,7 @@ void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) throw uno::RuntimeException(); // no other exceptions specified } -rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aContent; @@ -243,7 +243,7 @@ rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException return aContent; } -void SAL_CALL ScNamedRangeObj::setContent( const rtl::OUString& aContent ) +void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -378,7 +378,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySet } void SAL_CALL ScNamedRangeObj::setPropertyValue( - const rtl::OUString& rPropertyName, const uno::Any& aValue ) + const OUString& rPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -395,7 +395,7 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue( } } -uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPropertyName ) +uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -407,7 +407,7 @@ uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPrope // ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_RANGENAME ); } else if ( rPropertyName == SC_UNO_LINKDISPNAME ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); else if ( rPropertyName == SC_UNONAME_TOKENINDEX ) { // get index for use in formula tokens (read-only) @@ -427,24 +427,24 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScNamedRangeObj" ); + return OUString( "ScNamedRangeObj" ); } -sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ) || rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCLINKTARGET_SERVICE ) ); } -uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - aRet[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ); - aRet[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) ); + uno::Sequence<OUString> aRet(2); + aRet[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ); + aRet[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) ); return aRet; } @@ -506,8 +506,8 @@ bool ScNamedRangesObj::IsModifyAndBroadcast() const // sheet::XNamedRanges -void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName, - const rtl::OUString& aContent, const table::CellAddress& aPosition, +void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, + const OUString& aContent, const table::CellAddress& aPosition, sal_Int32 nUnoType ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -571,7 +571,7 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& pDocShell->GetDocFunc().CreateNames( aRange, nFlags, sal_True, GetTab_Impl() ); } -void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -611,7 +611,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.NamedRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.NamedRangesEnumeration")); } // container::XIndexAccess @@ -667,7 +667,7 @@ Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo } void SAL_CALL ScNamedRangesObj::setPropertyValue( - const rtl::OUString& rPropertyName, const uno::Any& aValue ) + const OUString& rPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -678,7 +678,7 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue( } } -Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyName ) +Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -693,7 +693,7 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyN SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangesObj ) -uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -705,7 +705,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -715,8 +715,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() if (pNames) { long nVisCount = getCount(); // Namen mit lcl_UserVisibleName - uno::Sequence<rtl::OUString> aSeq(nVisCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nVisCount); + OUString* pAry = aSeq.getArray(); sal_uInt16 nVisPos = 0; ScRangeName::const_iterator itr = pNames->begin(), itrEnd = pNames->end(); for (; itr != itrEnd; ++itr) @@ -727,10 +727,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() return aSeq; } } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -864,7 +864,7 @@ ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex return NULL; } -ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByName_Impl(const ::rtl::OUString& aName) +ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName(aName) ) return new ScNamedRangeObj(this, pDocShell, String(aName)); @@ -895,7 +895,7 @@ ScLocalNamedRangesObj::~ScLocalNamedRangesObj() } -ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByName_Impl(const ::rtl::OUString& aName) +ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName( aName ) ) return new ScNamedRangeObj( this, pDocShell, String(aName), mxSheet); @@ -908,7 +908,7 @@ ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByIndex_Impl( sal_uInt16 nIndex if (!pDocShell) return NULL; - rtl::OUString aName = mxSheet->getName(); + OUString aName = mxSheet->getName(); ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab; pDoc->GetTable( aName, nTab ); @@ -1186,7 +1186,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.LabelRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.LabelRangesEnumeration")); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index b9415092ee9e..ad1787b055b5 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -138,20 +138,20 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRa return GetUnoText().createTextCursorByRange(aTextPosition); } -rtl::OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetUnoText().getString(); } -void SAL_CALL ScAnnotationObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; GetUnoText().setString(aText); } void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRange>& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -196,18 +196,18 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc return aAdr; } -rtl::OUString SAL_CALL ScAnnotationObj::getAuthor() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getAuthor() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); - return pNote ? pNote->GetAuthor() : rtl::OUString(); + return pNote ? pNote->GetAuthor() : OUString(); } -rtl::OUString SAL_CALL ScAnnotationObj::getDate() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getDate() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); - return pNote ? pNote->GetDate() : rtl::OUString(); + return pNote ? pNote->GetDate() : OUString(); } sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() throw(uno::RuntimeException) diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 2a5fefe1b956..8efb9e3c395a 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -52,7 +52,7 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) { //! use map (with new identifiers) @@ -125,7 +125,7 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, uno::Any ScDocOptionsHelper::getPropertyValue( const ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) { uno::Any aRet; const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName( aPropertyName ); @@ -192,7 +192,7 @@ ScDocOptionsObj::~ScDocOptionsObj() } void SAL_CALL ScDocOptionsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -205,7 +205,7 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue( ScModelObj::setPropertyValue( aPropertyName, aValue ); } -uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index dc4364a08bc2..390d4fb749dd 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -42,25 +42,25 @@ uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) cons return xShape; } -::rtl::OUString SAL_CALL ScPageObj::getImplementationName() +OUString SAL_CALL ScPageObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScPageObj"); + return OUString("ScPageObj"); } -sal_Bool SAL_CALL ScPageObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScPageObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); return aServiceStr.EqualsAscii( "com.sun.star.sheet.SpreadsheetDrawPage" ); } -uno::Sequence<rtl::OUString> SAL_CALL ScPageObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScPageObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString("com.sun.star.sheet.SpreadsheetDrawPage"); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString("com.sun.star.sheet.SpreadsheetDrawPage"); return aRet; } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 20cd22ce8b4a..e40be82dda5e 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -71,7 +71,6 @@ using namespace ::com::sun::star::task; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; ScFilterDetect::ScFilterDetect( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) { @@ -155,11 +154,11 @@ static const SfxFilter* lcl_DetectExcelXML( SvStream& rStream, SfxFilterMatcher& { // Be consistent with XMLFilterDetect service: Check for presence of "Workbook" in XML file. - rtl::OString aTryStr( "Workbook" ); - rtl::OString aFileString(reinterpret_cast<const sal_Char*>(aBuffer), nBytesRead); + OString aTryStr( "Workbook" ); + OString aFileString(reinterpret_cast<const sal_Char*>(aBuffer), nBytesRead); if (aFileString.indexOf(aTryStr) >= 0) - pFound = rMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcelXML) ); + pFound = rMatcher.GetFilter4FilterName( OUString(pFilterExcelXML) ); } return pFound; @@ -216,18 +215,18 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) return ( 0x0d == nEndFlag ); } -::rtl::OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) +OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) throw( uno::RuntimeException ) { uno::Reference< XInputStream > xStream; uno::Reference< XContent > xContent; uno::Reference< XInteractionHandler > xInteraction; String aURL; - ::rtl::OUString sTemp; + OUString sTemp; String aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) String aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action) - ::rtl::OUString aDocumentTitle; // interesting only if set in this method + OUString aDocumentTitle; // interesting only if set in this method // opening as template is done when a parameter tells to do so and a template filter can be detected // (otherwise no valid filter would be found) or if the detected filter is a template filter and @@ -309,11 +308,11 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) bWasReadOnly = pItem && pItem->GetValue(); const SfxFilter* pFilter = 0; - String aPrefix = rtl::OUString( "private:factory/" ); + String aPrefix = OUString( "private:factory/" ); if( aURL.Match( aPrefix ) == aPrefix.Len() ) { String aPattern( aPrefix ); - aPattern += rtl::OUString("scalc"); + aPattern += OUString("scalc"); if ( aURL.Match( aPattern ) >= aPattern.Len() ) pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL ); } @@ -653,14 +652,14 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // get file header rStr.Seek( 0 ); const sal_Size nTrySize = 80; - rtl::OString aHeader = read_uInt8s_ToOString(rStr, nTrySize); + OString aHeader = read_uInt8s_ToOString(rStr, nTrySize); bool bMaybeHtml = HTMLParser::IsHTMLFormat( aHeader.getStr()); if ( aHeader.copy(0, 5).equalsL("{\\rtf", 5) ) { // test for RTF - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterRtf) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterRtf) ); } else if ( bIsXLS && (bMaybeText && !bMaybeHtml) ) { @@ -669,7 +668,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // The configured detection for Excel 2003 XML is still in XMLFilterDetect. pFilter = lcl_DetectExcelXML( rStr, aMatcher ); if (!pFilter) - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterAscii) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterAscii) ); bFakeXLS = true; } else if ( pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) ) @@ -693,7 +692,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } else { - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterHtmlWeb) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterHtmlWeb) ); if ( bIsXLS ) bFakeXLS = true; } @@ -788,11 +787,11 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) { lDescriptor.realloc( nPropertyCount + 1 ); lDescriptor[nPropertyCount].Name = "FilterName"; - lDescriptor[nPropertyCount].Value <<= rtl::OUString(pFilter->GetName()); + lDescriptor[nPropertyCount].Value <<= OUString(pFilter->GetName()); nPropertyCount++; } else - lDescriptor[nIndexOfFilterName].Value <<= rtl::OUString(pFilter->GetName()); + lDescriptor[nIndexOfFilterName].Value <<= OUString(pFilter->GetName()); } if ( pFilter ) diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 63702f88eb8f..d36cdf6493ae 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -45,8 +45,8 @@ public: /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); /* Helper for XServiceInfo */ static com::sun::star::uno::Sequence<OUString> impl_getStaticSupportedServiceNames(); @@ -60,7 +60,7 @@ public: //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) throw (com::sun::star::uno::RuntimeException); }; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index a6662f8bac22..e36f967fd447 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -86,7 +86,7 @@ public: { ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString(""), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString(""), uno::Reference< uno::XInterface >() ); uno::Sequence< uno::Any > aArgs(2); // access the application object ( parent for workbook ) @@ -95,7 +95,7 @@ public: maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs ); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -110,7 +110,7 @@ public: maCachedObject = maWorkbook; else { - rtl::OUString sCodeName; + OUString sCodeName; SCTAB nCount = pDoc->GetTableCount(); for( SCTAB i = 0; i < nCount; i++ ) { @@ -119,7 +119,7 @@ public: // from the code name if( String(sCodeName).EqualsIgnoreCaseAscii( sName ) ) { - rtl::OUString sSheetName; + OUString sSheetName; if( pDoc->GetName( i, sSheetName ) ) { uno::Reference< frame::XModel > xModel( mpDocShell->GetModel() ); @@ -130,7 +130,7 @@ public: uno::Sequence< uno::Any > aArgs(3); aArgs[0] = maWorkbook; aArgs[1] = uno::Any( xModel ); - aArgs[2] = uno::Any( rtl::OUString( sSheetName ) ); + aArgs[2] = uno::Any( OUString( sSheetName ) ); // use the convience function maCachedObject <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs ); break; @@ -141,25 +141,25 @@ public: return maCachedObject.hasValue(); } - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::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) { SolarMutexGuard aGuard; OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )", - rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( !hasByName( aName ) ) throw ::com::sun::star::container::NoSuchElementException(); return maCachedObject; } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) throw uno::RuntimeException(); SCTAB nCount = pDoc->GetTableCount(); - uno::Sequence< rtl::OUString > aNames( nCount + 1 ); + uno::Sequence< OUString > aNames( nCount + 1 ); SCTAB index = 0; - rtl::OUString sCodeName; + OUString sCodeName; for( ; index < nCount; ++index ) { pDoc->GetCodeName( index, sCodeName ); @@ -180,10 +180,10 @@ class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNam public: ScVbaCodeNameProvider( ScDocShell& rDocShell ) : mrDocShell(rDocShell) {} // XCodeNameQuery - rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - rtl::OUString sCodeName; + OUString sCodeName; // need to find the page ( and index ) for this control uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mrDocShell.GetModel(), uno::UNO_QUERY_THROW ); @@ -206,7 +206,7 @@ public: bMatched = ( xControl == xIf ); if ( bMatched ) { - rtl::OUString sName; + OUString sName; mrDocShell.GetDocument()->GetCodeName( static_cast<SCTAB>( index ), sName ); sCodeName = sName; } @@ -220,7 +220,7 @@ public: return sCodeName; } - rtl::OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) + OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -237,14 +237,14 @@ public: uno::Reference<container::XIndexAccess> xFormControls(xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW); if (xFormControls == xContainer) { - rtl::OUString aName; + OUString aName; if (mrDocShell.GetDocument()->GetCodeName(static_cast<SCTAB>(i), aName)) return aName; } } catch( uno::Exception& ) {} } - return rtl::OUString(); + return OUString(); } }; @@ -632,7 +632,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDocShell->GetModel(); - xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( "ooo.vba.excel.Globals" ), aArgs ); + xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( OUString( "ooo.vba.excel.Globals" ), aArgs ); pDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", uno::Any( xRet ) ); BasicManager* pAppMgr = SFX_APP()->GetBasicManager(); if ( pAppMgr ) @@ -651,14 +651,14 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( return xRet; } -uno::Sequence<rtl::OUString> ScServiceProvider::GetAllServiceNames() +uno::Sequence<OUString> ScServiceProvider::GetAllServiceNames() { const sal_uInt16 nEntries = sizeof(aProvNamesId) / sizeof(aProvNamesId[0]); - uno::Sequence<rtl::OUString> aRet(nEntries); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence<OUString> aRet(nEntries); + OUString* pArray = aRet.getArray(); for (sal_uInt16 i = 0; i < nEntries; i++) { - pArray[i] = rtl::OUString::createFromAscii( aProvNamesId[i].pName ); + pArray[i] = OUString::createFromAscii( aProvNamesId[i].pName ); } return aRet; } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 55fcc99bdb8e..c5ec413e1b57 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -61,8 +61,8 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap() {MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_MOVEPROTECT), 0, &getCppuType((sal_Bool*)0), 0, 0 }, // #i66550 HLINK_FOR_SHAPES - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; @@ -271,14 +271,14 @@ static sal_Bool lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum ) static sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point& rCaptionPoint ) { sal_Bool bReturn = false; - rtl::OUString sType(xShape->getShapeType()); + OUString sType(xShape->getShapeType()); sal_Bool bCaptionShape( sType == "com.sun.star.drawing.CaptionShape" ); if (bCaptionShape) { uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - xShapeProp->getPropertyValue( rtl::OUString( "CaptionPoint" ) ) >>= rCaptionPoint; + xShapeProp->getPropertyValue( OUString( "CaptionPoint" ) ) >>= rCaptionPoint; bReturn = sal_True; } } @@ -332,7 +332,7 @@ static awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape, } void SAL_CALL ScShapeObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -446,7 +446,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } else - throw lang::IllegalArgumentException(rtl::OUString("only XCell or XSpreadsheet objects allowed"), static_cast<cppu::OWeakObject*>(this), 0); + throw lang::IllegalArgumentException(OUString("only XCell or XSpreadsheet objects allowed"), static_cast<cppu::OWeakObject*>(this), 0); } else if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) { @@ -642,7 +642,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) || aNameString.EqualsAscii( SC_UNONAME_URL) ) { - rtl::OUString sHlink; + OUString sHlink; ScMacroInfo* pInfo = ScShapeObj_getShapeHyperMacroInfo(this, true); if ( ( aValue >>= sHlink ) && pInfo ) pInfo->SetHlink( sHlink ); @@ -664,7 +664,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } -uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -827,7 +827,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) || aNameString.EqualsAscii( SC_UNONAME_URL ) ) { - rtl::OUString sHlink; + OUString sHlink; if ( ScMacroInfo* pInfo = ScShapeObj_getShapeHyperMacroInfo(this) ) sHlink = pInfo->GetHlink(); aAny <<= sHlink; @@ -849,7 +849,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa return aAny; } -void SAL_CALL ScShapeObj::addPropertyChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XPropertyChangeListener>& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -873,7 +873,7 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const rtl::OUString& aPrope } } -void SAL_CALL ScShapeObj::removePropertyChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XPropertyChangeListener>& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -885,7 +885,7 @@ void SAL_CALL ScShapeObj::removePropertyChangeListener( const rtl::OUString& aPr pShapePropertySet->removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL ScShapeObj::addVetoableChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XVetoableChangeListener>& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -897,7 +897,7 @@ void SAL_CALL ScShapeObj::addVetoableChangeListener( const rtl::OUString& aPrope pShapePropertySet->addVetoableChangeListener( aPropertyName, aListener ); } -void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XVetoableChangeListener>& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -911,7 +911,7 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPr // XPropertyState -beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -945,14 +945,14 @@ beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& } uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; // simple loop to get own and aggregated states - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -960,7 +960,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( return aRet; } -void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -991,7 +991,7 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyNa } } -uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1102,7 +1102,7 @@ void SAL_CALL ScShapeObj::removeEventListener( static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet& rSource, const sal_Char* pName ) { - rtl::OUString aNameStr(rtl::OUString::createFromAscii(pName)); + OUString aNameStr(OUString::createFromAscii(pName)); try { rDest.setPropertyValue( aNameStr, rSource.getPropertyValue( aNameStr ) ); @@ -1200,7 +1200,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( } void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1260,7 +1260,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::Runtim // return uno::Reference<text::XTextRange>(); } -rtl::OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1270,10 +1270,10 @@ rtl::OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) else throw uno::RuntimeException(); -// return rtl::OUString(); +// return OUString(); } -void SAL_CALL ScShapeObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1360,7 +1360,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId() if( xAggShape.is() ) { - const rtl::OUString aShapeType( xAggShape->getShapeType() ); + const OUString aShapeType( xAggShape->getShapeType() ); // did we already compute an implementation id for the agregated shape type? ScShapeImplementationIdMap::iterator aIter( aImplementationIdMap.find(aShapeType ) ); if( aIter == aImplementationIdMap.end() ) @@ -1403,9 +1403,9 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() return NULL; } -#define SC_EVENTACC_ONCLICK ::rtl::OUString( "OnClick" ) -#define SC_EVENTACC_SCRIPT ::rtl::OUString( "Script" ) -#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( "EventType" ) +#define SC_EVENTACC_ONCLICK OUString( "OnClick" ) +#define SC_EVENTACC_SCRIPT OUString( "Script" ) +#define SC_EVENTACC_EVENTTYPE OUString( "EventType" ) typedef ::cppu::WeakImplHelper1< container::XNameReplace > ShapeUnoEventAcess_BASE; class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE @@ -1424,7 +1424,7 @@ public: } // XNameReplace - virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -1443,7 +1443,7 @@ public: } if ( isEventType && (pProperties->Name == SC_EVENTACC_SCRIPT) ) { - rtl::OUString sValue; + OUString sValue; if ( pProperties->Value >>= sValue ) { ScMacroInfo* pInfo = getInfo( sal_True ); @@ -1460,7 +1460,7 @@ public: } // XNameAccess - virtual uno::Any SAL_CALL getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Sequence< beans::PropertyValue > aProperties; ScMacroInfo* pInfo = getInfo(); @@ -1484,14 +1484,14 @@ public: return uno::Any( aProperties ); } - virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames() throw(uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException) { - uno::Sequence< rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); aSeq[ 0 ] = SC_EVENTACC_ONCLICK; return aSeq; } - virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException) { return aName == SC_EVENTACC_ONCLICK; } @@ -1515,15 +1515,15 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException) return new ShapeUnoEventAccessImpl( this ); } -::rtl::OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException) +OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.sc.ScShapeObj" ); + return OUString( "com.sun.star.comp.sc.ScShapeObj" ); } -::sal_Bool SAL_CALL ScShapeObj::supportsService( const ::rtl::OUString& _ServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& _ServiceName ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pSupported = aSupported.getConstArray(); + uno::Sequence< OUString > aSupported( getSupportedServiceNames() ); + for ( const OUString* pSupported = aSupported.getConstArray(); pSupported != aSupported.getConstArray() + aSupported.getLength(); ++pSupported ) @@ -1532,23 +1532,23 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException) return false; } -uno::Sequence< ::rtl::OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) throw (uno::RuntimeException) { uno::Reference<lang::XServiceInfo> xSI; if ( mxShapeAgg.is() ) mxShapeAgg->queryAggregation( lang::XServiceInfo::static_type() ) >>= xSI; - uno::Sequence< ::rtl::OUString > aSupported; + uno::Sequence< OUString > aSupported; if ( xSI.is() ) aSupported = xSI->getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.Shape" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.sheet.Shape" ); if( bIsNoteCaption ) { aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.CellAnnotationShape" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.sheet.CellAnnotationShape" ); } return aSupported; diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 1ead24df1f09..0d0228b5e96d 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -99,13 +99,13 @@ ScCellSearchObj::~ScCellSearchObj() // XSearchDescriptor -rtl::OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return pSearchItem->GetSearchString(); } -void SAL_CALL ScCellSearchObj::setSearchString( const rtl::OUString& aString ) +void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -114,13 +114,13 @@ void SAL_CALL ScCellSearchObj::setSearchString( const rtl::OUString& aString ) // XReplaceDescriptor -rtl::OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return pSearchItem->GetReplaceString(); } -void SAL_CALL ScCellSearchObj::setReplaceString( const rtl::OUString& aReplaceString ) +void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -139,7 +139,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySet } void SAL_CALL ScCellSearchObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -162,7 +162,7 @@ void SAL_CALL ScCellSearchObj::setPropertyValue( else if (aString.EqualsAscii( SC_UNO_SRCHFILTERED )) pSearchItem->SetSearchFiltered( ScUnoHelpFunctions::GetBoolFromAny(aValue) ); } -uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -191,12 +191,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj ) // XServiceInfo -rtl::OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellSearchObj" ); + return OUString( "ScCellSearchObj" ); } -sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellSearchObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -204,13 +204,13 @@ sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCREPLACEDESCRIPTOR_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index a5d5cb5c7c7e..9c7cc587d386 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -88,15 +88,15 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -123,7 +123,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &::getCppuType((const table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, @@ -159,7 +159,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_HIDDEN), ATTR_HIDDEN, &getCppuType((sal_Bool*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellStyleSet_Impl( aCellStyleMap_Impl ); @@ -173,9 +173,9 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() static SfxItemPropertyMapEntry aPageStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, @@ -184,13 +184,13 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERHOR), ATTR_PAGE_HORCENTER,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,&::getCppuType((const sal_Int16*)0), 0, 0 }, // {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -215,9 +215,9 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, // {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -261,7 +261,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTHEADER), ATTR_PAGE_HEADERS, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTOBJS), ATTR_PAGE_OBJECTS, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTZERO), ATTR_PAGE_NULLVALS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, @@ -294,9 +294,9 @@ static const SfxItemPropertyMap* lcl_GetHeaderStyleMap() static SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, @@ -333,9 +333,9 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() static SfxItemPropertyMapEntry aFooterStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS }, @@ -424,19 +424,19 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bCellMapFilled ) { aCellMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aCellMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); + aCellMap[0].aProgName = OUString( SC_STYLE_PROG_STANDARD ); aCellMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT ); - aCellMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT ); + aCellMap[1].aProgName = OUString( SC_STYLE_PROG_RESULT ); aCellMap[2].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT1 ); - aCellMap[2].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT1 ); + aCellMap[2].aProgName = OUString( SC_STYLE_PROG_RESULT1 ); aCellMap[3].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE ); - aCellMap[3].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE ); + aCellMap[3].aProgName = OUString( SC_STYLE_PROG_HEADLINE ); aCellMap[4].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE1 ); - aCellMap[4].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE1 ); + aCellMap[4].aProgName = OUString( SC_STYLE_PROG_HEADLINE1 ); // last entry remains empty @@ -451,10 +451,10 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bPageMapFilled ) { aPageMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aPageMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); + aPageMap[0].aProgName = OUString( SC_STYLE_PROG_STANDARD ); aPageMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_REPORT ); - aPageMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_REPORT ); + aPageMap[1].aProgName = OUString( SC_STYLE_PROG_REPORT ); // last entry remains empty @@ -596,7 +596,7 @@ ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByIndex_Impl(sal_uInt32 nIndex) c return NULL; // ungueltiger Index } -ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const OUString& aName) const { if ( pDocShell ) { @@ -644,7 +644,7 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -657,18 +657,18 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence<rtl::OUString> aNames(SC_STYLE_FAMILY_COUNT); - rtl::OUString* pNames = aNames.getArray(); - pNames[0] = rtl::OUString(SC_FAMILYNAME_CELL ); - pNames[1] = rtl::OUString(SC_FAMILYNAME_PAGE ); + uno::Sequence<OUString> aNames(SC_STYLE_FAMILY_COUNT); + OUString* pNames = aNames.getArray(); + pNames[0] = OUString(SC_FAMILYNAME_CELL ); + pNames[1] = OUString(SC_FAMILYNAME_PAGE ); return aNames; } -sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -678,15 +678,15 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const rtl::OUString& aName ) // style::XStyleLoader -void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const rtl::OUString& aURL, +void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL, const uno::Sequence<beans::PropertyValue>& aOptions ) throw(io::IOException, uno::RuntimeException) { //! use aOptions (like Writer) //! set flag to disable filter option dialogs when importing - rtl::OUString aFilter; // empty - detect - rtl::OUString aFiltOpt; + OUString aFilter; // empty - detect + OUString aFiltOpt; ScDocumentLoader aLoader( aURL, aFilter, aFiltOpt ); ScDocShell* pSource = aLoader.GetDocShell(); @@ -726,13 +726,13 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO uno::Sequence<beans::PropertyValue> aSequence(3); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(SC_UNONAME_OVERWSTL ); + pArray[0].Name = OUString(SC_UNONAME_OVERWSTL ); ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, true ); - pArray[1].Name = rtl::OUString(SC_UNONAME_LOADCELL ); + pArray[1].Name = OUString(SC_UNONAME_LOADCELL ); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, true ); - pArray[2].Name = rtl::OUString(SC_UNONAME_LOADPAGE ); + pArray[2].Name = OUString(SC_UNONAME_LOADPAGE ); ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, true ); return aSequence; @@ -786,7 +786,7 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByIndex_Impl(sal_uInt32 nIndex) return NULL; } -ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell ) { @@ -800,7 +800,7 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const rtl::OUString& aName) return NULL; } -void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -846,7 +846,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -856,7 +856,7 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const insertByName( aName, aElement ); } -void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -954,7 +954,7 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -968,7 +968,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -980,8 +980,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames() SfxStyleSheetIterator aIter( pStylePool, eFamily ); sal_uInt16 nCount = aIter.Count(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); SfxStyleSheetBase* pStyle = aIter.First(); sal_uInt16 nPos = 0; while (pStyle) @@ -994,10 +994,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames() } return aSeq; } - return uno::Sequence<rtl::OUString>(); + return uno::Sequence<OUString>(); } -sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1021,12 +1021,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getProperty return uno::Reference< beans::XPropertySetInfo >(); } -void SAL_CALL ScStyleFamilyObj::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -1045,34 +1045,34 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr } if ( nResId > 0 ) { - ::rtl::OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) ); + OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) ); aRet = uno::makeAny( sDisplayName ); } } else { - throw beans::UnknownPropertyException( ::rtl::OUString( "unknown property: " ) + sPropertyName, static_cast<OWeakObject *>(this) ); + throw beans::UnknownPropertyException( OUString( "unknown property: " ) + sPropertyName, static_cast<OWeakObject *>(this) ); } return aRet; } -void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } @@ -1185,16 +1185,16 @@ sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException) return false; } -rtl::OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetParent(), sal::static_int_cast<sal_uInt16>(eFamily) ); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) +void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle ) throw(container::NoSuchElementException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1241,16 +1241,16 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) // container::XNamed -rtl::OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetName(), sal::static_int_cast<sal_uInt16>(eFamily) ); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScStyleObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1295,7 +1295,7 @@ uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules() // beans::XPropertyState -const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, +const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const OUString& rPropName, const SfxItemPropertySimpleEntry*& rpResultEntry ) { //! OUString as argument? @@ -1331,7 +1331,7 @@ const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rProp return NULL; } -beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1372,14 +1372,14 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& } uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { // duemmliche Default-Implementierung: alles einzeln per getPropertyState holen //! sollte optimiert werden! SolarMutexGuard aGuard; - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -1387,7 +1387,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( return aRet; } -void SAL_CALL ScStyleObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1400,7 +1400,7 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const rtl::OUString& aPropertyNa SetOnePropertyValue( aPropertyName, pEntry, NULL ); } -uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1492,7 +1492,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty // XMultiPropertySet -void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames, +void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1505,7 +1505,7 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString if ( nCount ) { - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap(); @@ -1518,7 +1518,7 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString } uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( - const uno::Sequence< rtl::OUString >& aPropertyNames ) + const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1536,7 +1536,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( return aSequence; } -void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence<rtl::OUString>& /* aPropertyNames */, +void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence<OUString>& /* aPropertyNames */, const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) throw (uno::RuntimeException) { @@ -1550,7 +1550,7 @@ void SAL_CALL ScStyleObj::removePropertiesChangeListener( // no bound properties } -void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<rtl::OUString>& /* aPropertyNames */, +void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<OUString>& /* aPropertyNames */, const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) throw (uno::RuntimeException) { @@ -1606,7 +1606,7 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() throw (uno::RuntimeExcepti } } -void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<rtl::OUString>& aPropertyNames ) +void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1614,7 +1614,7 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<rtl::OUStr sal_Int32 nCount = aPropertyNames.getLength(); if ( nCount ) { - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap(); for (sal_Int32 i = 0; i < nCount; i++) @@ -1626,7 +1626,7 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<rtl::OUStr } uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1655,7 +1655,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScStyleObj::getPropertySetInfo( } void SAL_CALL ScStyleObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1669,7 +1669,7 @@ void SAL_CALL ScStyleObj::setPropertyValue( SetOnePropertyValue( aPropertyName, pEntry, &aValue ); } -void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) +void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1830,7 +1830,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS; sal_Bool bFound = false; - rtl::OUString aName; + OUString aName; if ( *pValue >>= aName ) { if ( aName == SC_PAPERBIN_DEFAULTNAME ) @@ -1976,7 +1976,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons } } -uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScStyleObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1988,7 +1988,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa // core always has the display name SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) - aAny <<= rtl::OUString( pStyle->GetName() ); + aAny <<= OUString( pStyle->GetName() ); } else { @@ -2043,9 +2043,9 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa // property PrinterPaperTray is the name of the tray sal_uInt8 nValue = ((const SvxPaperBinItem&)pItemSet->Get(nWhich)).GetValue(); - rtl::OUString aName; + OUString aName; if ( nValue == PAPERBIN_PRINTER_SETTINGS ) - aName = rtl::OUString(SC_PAPERBIN_DEFAULTNAME ); + aName = OUString(SC_PAPERBIN_DEFAULTNAME ); else { Printer* pPrinter = pDocShell->GetPrinter(); @@ -2119,12 +2119,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScStyleObj" ); + return OUString("ScStyleObj" ); } -sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE ); @@ -2133,15 +2133,15 @@ sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName RTL_CONSTASCII_STRINGPARAM ( bPage ? SCPAGESTYLE_SERVICE : SCCELLSTYLE_SERVICE )); } -uno::Sequence<rtl::OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() throw(uno::RuntimeException) { sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE ); - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(SCSTYLE_SERVICE ); - pArray[1] = bPage ? rtl::OUString(SCPAGESTYLE_SERVICE) - : rtl::OUString(SCCELLSTYLE_SERVICE); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(SCSTYLE_SERVICE ); + pArray[1] = bPage ? OUString(SCPAGESTYLE_SERVICE) + : OUString(SCCELLSTYLE_SERVICE); return aRet; } diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 8a64525cc0a0..e7196b037359 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -53,7 +53,7 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((const uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {0,0,0,0,0,0} }; return aLinkTargetMap_Impl; @@ -93,7 +93,7 @@ void ScLinkTargetTypesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // container::XNameAccess -uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const rtl::OUString& aName) +uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { if (pDocShell) @@ -107,16 +107,16 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const rtl::OUString& aName) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException ) { - uno::Sequence<rtl::OUString> aRet(SC_LINKTARGETTYPE_COUNT); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence<OUString> aRet(SC_LINKTARGETTYPE_COUNT); + OUString* pArray = aRet.getArray(); for (sal_uInt16 i=0; i<SC_LINKTARGETTYPE_COUNT; i++) pArray[i] = aNames[i]; return aRet; } -sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const rtl::OUString& aName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( uno::RuntimeException ) { String aNameStr = aName; for (sal_uInt16 i=0; i<SC_LINKTARGETTYPE_COUNT; i++) @@ -199,7 +199,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getProp return aRef; } -void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aPropertyName */, const uno::Any& /* aValue */) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -234,7 +234,7 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType } } -uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const rtl::OUString& PropertyName) +uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& PropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { uno::Any aRet; @@ -242,7 +242,7 @@ uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const rtl::OUString& Pro if ( aNameStr.EqualsAscii( SC_UNO_LINKDISPBIT ) ) SetLinkTargetBitmap( aRet, nType ); else if ( aNameStr.EqualsAscii( SC_UNO_LINKDISPNAME ) ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); return aRet; } @@ -263,7 +263,7 @@ ScLinkTargetsObj::~ScLinkTargetsObj() // container::XNameAccess -uno::Any SAL_CALL ScLinkTargetsObj::getByName(const rtl::OUString& aName) +uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProp( ScUnoHelpFunctions::AnyToInterface( xCollection->getByName(aName) ), uno::UNO_QUERY ); @@ -274,12 +274,12 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const rtl::OUString& aName) // return uno::Any(); } -uno::Sequence<rtl::OUString> SAL_CALL ScLinkTargetsObj::getElementNames(void) throw( uno::RuntimeException ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames(void) throw( uno::RuntimeException ) { return xCollection->getElementNames(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const rtl::OUString& aName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno::RuntimeException ) { return xCollection->hasByName(aName); } diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 29e61fdd8f8b..77ba10fa924b 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -321,7 +321,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) { - rtl::OUString aDummy("???"); + OUString aDummy("???"); rData.aTitle = aDummy; rData.aLongDocName = aDummy; rData.aShortDocName = aDummy; @@ -330,10 +330,10 @@ void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) rData.nTotalPages = 99; } -rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; const EditTextObject* pData; sal_uInt16 nPart = aTextData.GetPart(); @@ -360,7 +360,7 @@ rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeExce return aRet; } -void SAL_CALL ScHeaderFooterTextObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aText); @@ -372,7 +372,7 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const rtl::OUString& aText ) thr } void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XTextRange>& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 6be263f1e816..bb49faf9d49d 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -125,7 +125,7 @@ void ScFormulaParserObj::SetCompilerFlags( ScCompiler& rCompiler ) const } uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( - const rtl::OUString& aFormula, const table::CellAddress& rReferencePos ) + const OUString& aFormula, const table::CellAddress& rReferencePos ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -150,12 +150,12 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( return aRet; } -rtl::OUString SAL_CALL ScFormulaParserObj::printFormula( +OUString SAL_CALL ScFormulaParserObj::printFormula( const uno::Sequence<sheet::FormulaToken>& aTokens, const table::CellAddress& rReferencePos ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; if (mpDocShell) { @@ -168,7 +168,7 @@ rtl::OUString SAL_CALL ScFormulaParserObj::printFormula( aCompiler.SetGrammar(pDoc->GetGrammar()); SetCompilerFlags( aCompiler ); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aCompiler.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -187,7 +187,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getProperty } void SAL_CALL ScFormulaParserObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -246,7 +246,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( throw beans::UnknownPropertyException(); } -uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -362,12 +362,12 @@ bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc, rAPI.Data <<= rToken.GetDouble(); break; case formula::svString: - rAPI.Data <<= rtl::OUString( rToken.GetString() ); + rAPI.Data <<= OUString( rToken.GetString() ); break; case svExternal: // Function name is stored as string. // Byte (parameter count) is ignored. - rAPI.Data <<= rtl::OUString( rToken.GetExternal() ); + rAPI.Data <<= OUString( rToken.GetExternal() ); break; case svSingleRef: { @@ -431,7 +431,7 @@ bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc, { sheet::ExternalReference aExtRef; aExtRef.Index = rToken.GetIndex(); - aExtRef.Reference <<= ::rtl::OUString( rToken.GetString() ); + aExtRef.Reference <<= OUString( rToken.GetString() ); rAPI.Data <<= aExtRef; eOpCode = ocPush; } diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index dacd7ec34313..378177ae2e8d 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -30,15 +30,15 @@ using namespace ::com::sun::star; -::rtl::OUString SAL_CALL ScDocument_getImplementationName() throw() +OUString SAL_CALL ScDocument_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); + return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() { - uno::Sequence< rtl::OUString > aSeq( 1 ); - aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); + uno::Sequence< OUString > aSeq( 1 ); + aSeq[0] = OUString( "com.sun.star.sheet.SpreadsheetDocument" ); return aSeq; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 7e9e1be6a09a..2c791eb2e455 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -531,7 +531,7 @@ static void lcl_CallActivate( ScDocShell* pDocSh, SCTAB nTab, sal_Int32 nEvent ) const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(nEvent); + const OUString* pScript = pEvents->GetScript(nEvent); if (pScript) { uno::Any aRet; @@ -986,7 +986,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); } // XIndexAccess @@ -1240,7 +1240,7 @@ sal_Bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(nEvent); + const OUString* pScript = pEvents->GetScript(nEvent); if (pScript) { // the macro parameter is the clicked object, as in the mousePressed call above @@ -1760,7 +1760,7 @@ void ScTabViewObj::SelectionChanged() const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_SELECT); + const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_SELECT); if (pScript) { // the macro parameter is the selection as returned by getSelection @@ -1806,7 +1806,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInf } void SAL_CALL ScTabViewObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1930,7 +1930,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue( } } -uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1990,7 +1990,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty return aRet; } -void SAL_CALL ScTabViewObj::addPropertyChangeListener( const ::rtl::OUString& /* aPropertyName */, +void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2002,7 +2002,7 @@ void SAL_CALL ScTabViewObj::addPropertyChangeListener( const ::rtl::OUString& /* aPropertyChgListeners.push_back( pObj ); } -void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString& /* aPropertyName */, +void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2020,7 +2020,7 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString& } } -void SAL_CALL ScTabViewObj::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, +void SAL_CALL ScTabViewObj::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2028,7 +2028,7 @@ void SAL_CALL ScTabViewObj::addVetoableChangeListener( const ::rtl::OUString& /* { } -void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, +void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2059,7 +2059,7 @@ void SAL_CALL ScTabViewObj::startRangeSelection( sal_Bool bSingleCell = false; sal_Bool bMultiSelection = false; - rtl::OUString aStrVal; + OUString aStrVal; const beans::PropertyValue* pPropArray = aArguments.getConstArray(); long nPropCount = aArguments.getLength(); for (long i = 0; i < nPropCount; i++) @@ -2153,7 +2153,7 @@ void ScTabViewObj::RangeSelDone( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionListenerVector const listeners(aRangeSelListeners); @@ -2166,7 +2166,7 @@ void ScTabViewObj::RangeSelAborted( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionListenerVector const listeners(aRangeSelListeners); @@ -2179,7 +2179,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionChangeListenerVector const listener(aRangeChgListeners); @@ -2190,12 +2190,12 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) // XServiceInfo -rtl::OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScTabViewObj" ); + return OUString( "ScTabViewObj" ); } -sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -2203,13 +2203,13 @@ sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceNa aServiceStr.EqualsAscii( SCVIEWSETTINGS_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); return aRet; } @@ -2277,7 +2277,7 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref SolarMutexGuard aGuard; ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pShell) - pShell->GetEditView()->InsertText( xTrans, ::rtl::OUString(), false ); + pShell->GetEditView()->InsertText( xTrans, OUString(), false ); else { ScDrawTextObjectBar* pTextShell = PTR_CAST( ScDrawTextObjectBar, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); @@ -2288,7 +2288,7 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref OutlinerView* pOutView = pView->GetTextEditOutlinerView(); if ( pOutView ) { - pOutView->GetEditView().InsertText( xTrans, ::rtl::OUString(), false ); + pOutView->GetEditView().InsertText( xTrans, OUString(), false ); return; } } diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index 086948ae05d6..df022b2b4330 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -30,7 +30,6 @@ #include <svx/svxerr.hxx> -using ::rtl::OUString; using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index f61239c37bf3..86943a21d4ac 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -50,7 +50,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) if ( pShell ) xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); return xUnnamedDBRanges; } @@ -66,7 +66,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc uno::Reference< sheet::XDatabaseRange > xDBRange( xUnnamedDBRanges->getByTable( nSheet ) , uno::UNO_QUERY_THROW ); sal_Bool bHasAuto = false; uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString("AutoFilter") ) >>= bHasAuto; + xProps->getPropertyValue( OUString("AutoFilter") ) >>= bHasAuto; if ( bHasAuto ) { xDataBaseRange=xDBRange; @@ -80,7 +80,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); if ( !pScCellRangesBase ) { - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); } return pScCellRangesBase->GetDocShell(); } @@ -101,7 +101,7 @@ void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom pViewSh->RefreshZoom(); } -const ::rtl::OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning"); +const OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning"); class PasteCellsWarningReseter { @@ -113,7 +113,7 @@ private: comphelper::getProcessComponentContext() ); static uno::Reference<lang::XMultiComponentFactory > xServiceManager( xContext->getServiceManager() ); - static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); + static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } @@ -264,8 +264,8 @@ uno::Reference< XHelperInterface > getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW ); - rtl::OUString sCodeName; - xProps->getPropertyValue( rtl::OUString("CodeName") ) >>= sCodeName; + OUString sCodeName; + xProps->getPropertyValue( OUString("CodeName") ) >>= sCodeName; // #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible // to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at @@ -327,7 +327,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -338,19 +338,19 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& pDoc->SetCodeName( sCodeName ); } - std::vector< rtl::OUString > sDocModuleNames; + std::vector< OUString > sDocModuleNames; sDocModuleNames.push_back( sCodeName ); for ( SCTAB index = 0; index < pDoc->GetTableCount(); index++) { - rtl::OUString aName; + OUString aName; pDoc->GetCodeName( index, aName ); sDocModuleNames.push_back( aName ); } - std::vector<rtl::OUString>::iterator it_end = sDocModuleNames.end(); + std::vector<OUString>::iterator it_end = sDocModuleNames.end(); - for ( std::vector<rtl::OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) + for ( std::vector<OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) { script::ModuleInfo sModuleInfo; @@ -359,9 +359,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); + xLib->replaceByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); + xLib->insertByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n" ) ) ); } } } diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 186c7ffd4afb..12208dde8812 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -79,7 +79,7 @@ template < typename ImplObject > if ( xTunnel.is() ) pObj = reinterpret_cast<ImplObject*>( xTunnel->getSomething(ImplObject::getUnoTunnelId())); if ( bThrow && !pObj ) - throw css::uno::RuntimeException( rtl::OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); + throw css::uno::RuntimeException( OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); return pObj; } // ============================================================================ diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx index 8e8729a31ae9..05060b6f6f8a 100644 --- a/sc/source/ui/vba/testvba/testvba.cxx +++ b/sc/source/ui/vba/testvba/testvba.cxx @@ -60,7 +60,6 @@ using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::XInterface; using ::com::sun::star::ucb::XSimpleFileAccess3; using ::com::sun::star::document::XTypeDetection; -using ::rtl::OUString; using ::std::auto_ptr; @@ -68,7 +67,7 @@ const OUString EXTN(".xls"); OUString convertToURL( const OUString& rPath ) { - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( rPath ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -78,7 +77,7 @@ OUString convertToURL( const OUString& rPath ) { osl::FileBase::getFileURLFromSystemPath( rPath, aURL ); if ( aURL.equals( rPath ) ) - throw uno::RuntimeException( rtl::OUString( "could'nt convert " ).concat( rPath ).concat( rtl::OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "could'nt convert " ).concat( rPath ).concat( OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() ); } return aURL; } @@ -108,55 +107,55 @@ private: Reference< XMultiComponentFactory > mxMCF; Reference< XComponentLoader > mxCompLoader; Reference< XSimpleFileAccess3 > mxSFA; - rtl::OUString msOutDirPath; + OUString msOutDirPath; protected: public: TestVBA( const Reference< XComponentContext >& _xContext, const Reference< XMultiComponentFactory >& _xMCF, const Reference< XComponentLoader >& _xCompLoader, - const rtl::OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ), + const OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ), mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) { mxSFA.set( ucb::SimpleFileAccess::create(_xContext) ); } - rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) + OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { - rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( rtl::OUString( "HelperAPI-test.log" ) ); + OUString sLogLocation; + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( OUString( "/" ) ).concat( OUString( "HelperAPI-test.log" ) ); return sLogLocation; } - rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) + OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { printf("%s\n", getenv("HOME") ); - printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); - rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ) ); + printf("file name %s\n", OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUString sLogLocation; + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + OUString( ".log" ) ); return sLogLocation; } - void proccessDocument( const rtl::OUString& sUrl ) + void proccessDocument( const OUString& sUrl ) { if ( !mxSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".xls", 4 ) ) { try { - OSL_TRACE( "processing %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); - printf( "processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE( "processing %s", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf( "processing %s\n", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); // Loading the wanted document Sequence< PropertyValue > propertyValues(1); - propertyValues[0].Name = rtl::OUString( "Hidden" ); + propertyValues[0].Name = OUString( "Hidden" ); propertyValues[0].Value <<= false; - rtl::OUString sfileUrl = convertToURL( sUrl ); - printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUString sfileUrl = convertToURL( sUrl ); + printf( "try to get xDoc %s\n", OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); Reference< uno::XInterface > xDoc = - mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString( "_blank" ), 0, propertyValues); + mxCompLoader->loadComponentFromURL( sfileUrl, OUString( "_blank" ), 0, propertyValues); printf( "got xDoc\n" ); OUString logFileURL = convertToURL( getLogLocation() ); @@ -173,18 +172,18 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) Reference< script::provider::XScript > xScript; try { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document")); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document")); } catch ( uno::Exception& e ) { try { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )); } catch ( uno::Exception& e2 ) { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )); } } - OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Got script for doc %s", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("get the Script\n"); Sequence< uno::Any > aArgs; Sequence< sal_Int16 > aOutArgsIndex; @@ -193,27 +192,27 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) xScript->invoke(aArgs, aOutArgsIndex, aOutArgs); OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) ); - OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ); + OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + OUString( ".log" ); try { printf("move log file\n"); mxSFA->move( logFileURL, newLocation ); - OSL_TRACE("new logfile location is %s ", rtl::OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("new logfile location is %s ", OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("moved to new location\n"); } catch ( uno::Exception& e ) { logFileURL = convertToURL( getLogLocationWithName( fileName ) ); - printf("move log file from %s\n", rtl::OUStringToOString( logFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("move log file from %s\n", OUStringToOString( logFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); mxSFA->move( logFileURL, newLocation ); - OSL_TRACE("new logfile location is %s ", rtl::OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("new logfile location is %s ", OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("moved to new location\n"); } } catch ( uno::Exception& e ) { - std::cerr << "Caught exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cerr << "Caught exception " << OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } // interface is supported, otherwise use XComponent.dispose @@ -241,19 +240,19 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) } catch( uno::Exception& e ) { - std::cerr << "Caught exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cerr << "Caught exception " << OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } } - printf("complete processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("complete processing %s\n", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); } - void traverse( const rtl::OUString& sFileDirectory ) + void traverse( const OUString& sFileDirectory ) { - rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory ); + OUString sFileDirectoryURL = convertToURL( sFileDirectory ); if ( !mxSFA->isFolder( sFileDirectoryURL) ) { - throw lang::IllegalArgumentException( rtl::OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); + throw lang::IllegalArgumentException( OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); } // Getting all files and directories in the current directory Sequence<OUString> entries = mxSFA->getFolderContents( sFileDirectoryURL, false ); @@ -278,7 +277,7 @@ void tryDispose( Reference< uno::XInterface > xIF, const char* sComp ) } catch( uno::Exception& e ) { - std::cerr << "tryDispose caught exception " <<rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << " while disposing " << sComp << std::endl; + std::cerr << "tryDispose caught exception " <<OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << " while disposing " << sComp << std::endl; } } } @@ -314,7 +313,7 @@ int main( int argv, char** argc ) } catch( uno::Exception& e ) { - std::cerr << "Caught Exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cerr << "Caught Exception " << OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } } diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 07e53cb93f03..8ef65b3fb935 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -96,7 +96,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; -using ::rtl::OUString; // #TODO is this defined somewhere else? #if ( defined UNX ) //unix @@ -153,8 +152,8 @@ SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XMod return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) ); } -::rtl::OUString SAL_CALL -ScVbaApplication::getExactName( const ::rtl::OUString& aApproximateName ) throw (uno::RuntimeException) +OUString SAL_CALL +ScVbaApplication::getExactName( const OUString& aApproximateName ) throw (uno::RuntimeException) { uno::Reference< beans::XExactName > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getExactName( aApproximateName ); @@ -168,7 +167,7 @@ ScVbaApplication::getIntrospection() throw(css::uno::RuntimeException) } uno::Any SAL_CALL -ScVbaApplication::invoke( const ::rtl::OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { /* When calling the functions directly at the Application object, no runtime errors are thrown, but the error is inserted into the return value. */ @@ -180,34 +179,34 @@ ScVbaApplication::invoke( const ::rtl::OUString& FunctionName, const uno::Sequen } catch (const uno::Exception&) { - aAny <<= script::BasicErrorException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), 1000, ::rtl::OUString() ); + aAny <<= script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), 1000, OUString() ); } return aAny; } void SAL_CALL -ScVbaApplication::setValue( const ::rtl::OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); xWSF->setValue( PropertyName, Value ); } uno::Any SAL_CALL -ScVbaApplication::getValue( const ::rtl::OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) +ScVbaApplication::getValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getValue( PropertyName ); } sal_Bool SAL_CALL -ScVbaApplication::hasMethod( const ::rtl::OUString& Name ) throw(uno::RuntimeException) +ScVbaApplication::hasMethod( const OUString& Name ) throw(uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasMethod( Name ); } sal_Bool SAL_CALL -ScVbaApplication::hasProperty( const ::rtl::OUString& Name ) throw(uno::RuntimeException) +ScVbaApplication::hasProperty( const OUString& Name ) throw(uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasProperty( Name ); @@ -259,12 +258,12 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if (!aSelection.is()) { throw uno::RuntimeException( - rtl::OUString("failed to obtain current selection"), + OUString("failed to obtain current selection"), uno::Reference< uno::XInterface >() ); } uno::Reference< lang::XServiceInfo > xServiceInfo( aSelection, uno::UNO_QUERY_THROW ); - rtl::OUString sImplementationName = xServiceInfo->getImplementationName(); + OUString sImplementationName = xServiceInfo->getImplementationName(); if( sImplementationName.equalsIgnoreAsciiCase("com.sun.star.drawing.SvxShapeCollection") ) { @@ -277,15 +276,15 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if ( ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape ) { uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW ); - if ( xShapeServiceInfo->supportsService( rtl::OUString( "com.sun.star.drawing.Text" ) ) ) + if ( xShapeServiceInfo->supportsService( OUString( "com.sun.star.drawing.Text" ) ) ) { return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) ); } } return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) ); } - else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRange") ) || - xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRanges") ) ) + else if( xServiceInfo->supportsService( OUString("com.sun.star.sheet.SheetCellRange") ) || + xServiceInfo->supportsService( OUString("com.sun.star.sheet.SheetCellRanges") ) ) { uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY); if ( !xRange.is() ) @@ -299,7 +298,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) } else { - throw uno::RuntimeException( sImplementationName + rtl::OUString( + throw uno::RuntimeException( sImplementationName + OUString( " not supported"), uno::Reference< uno::XInterface >() ); } } @@ -311,10 +310,10 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException ) uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW); ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); ScViewData* pTabView = pViewShell->GetViewData(); if ( !pTabView ) - throw uno::RuntimeException( rtl::OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); sal_Int32 nCursorX = pTabView->GetCurX(); sal_Int32 nCursorY = pTabView->GetCurY(); @@ -350,7 +349,7 @@ ScVbaApplication::WorksheetFunction( ) throw (::com::sun::star::uno::RuntimeExce } uno::Any SAL_CALL -ScVbaApplication::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -402,7 +401,7 @@ ScVbaApplication::getStatusBar() throw (uno::RuntimeException) void SAL_CALL ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException) { - rtl::OUString sText; + OUString sText; sal_Bool bDefault = false; uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< task::XStatusIndicatorSupplier > xStatusIndicatorSupplier( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -424,7 +423,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime } } else - throw uno::RuntimeException( rtl::OUString( "Invalid prarameter. It should be a string or False" ), + throw uno::RuntimeException( OUString( "Invalid prarameter. It should be a string or False" ), uno::Reference< uno::XInterface >() ); } @@ -472,7 +471,7 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException) SbxVariableRef aRef = new SbxVariable; aRef->PutDouble( time ); aArgs->Put( aRef, 1 ); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("WaitUntil"), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( OUString("WaitUntil"), SbxCLASS_METHOD ); if ( pMeth ) { @@ -496,7 +495,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( - rtl::OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); + OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -525,7 +524,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException) if ( !result.is() ) { // Fixme - check if this is reasonable/desired behavior - throw uno::RuntimeException( rtl::OUString( "No activeSheet available" ), + throw uno::RuntimeException( OUString( "No activeSheet available" ), uno::Reference< uno::XInterface >() ); } return result; @@ -557,11 +556,11 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro bScroll = aScroll; } else - throw uno::RuntimeException( rtl::OUString( "second parameter should be boolean" ), + throw uno::RuntimeException( OUString( "second parameter should be boolean" ), uno::Reference< uno::XInterface >() ); } - rtl::OUString sRangeName; + OUString sRangeName; if( Reference >>= sRangeName ) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); @@ -603,7 +602,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro //and the createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) to get a root browse::XBrowseNode. //for query XInvocation interface. //but how to directly get the XInvocation? - throw uno::RuntimeException( rtl::OUString( "invalid reference for range name, it should be procedure name" ), + throw uno::RuntimeException( OUString( "invalid reference for range name, it should be procedure name" ), uno::Reference< uno::XInterface >() ); } return; @@ -638,7 +637,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro } return; } - throw uno::RuntimeException( rtl::OUString( "invalid reference or name" ), + throw uno::RuntimeException( OUString( "invalid reference or name" ), uno::Reference< uno::XInterface >() ); } @@ -691,7 +690,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -704,10 +703,10 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) // #TODO perhaps we should switch the return type depending of the filter // type, e.g. return Calc for Calc and Excel if its an imported doc -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getName() throw (uno::RuntimeException) { - static rtl::OUString appName("Microsoft Excel" ); + static OUString appName("Microsoft Excel" ); return appName; } @@ -756,7 +755,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeExce // #FIXME calling ScViewUtil::SetFullScreen( *pShell, bSet ); // directly results in a strange crash, using dispatch instead if ( bSet != getDisplayFullScreen() ) - dispatchRequests( getCurrentDocument(), rtl::OUString(".uno:FullScreen") ); + dispatchRequests( getCurrentDocument(), OUString(".uno:FullScreen") ); } sal_Bool SAL_CALL @@ -776,8 +775,8 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce // use uno here as it does all he repainting etc. magic uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xView, uno::UNO_QUERY ); - xProps->setPropertyValue( rtl::OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); - xProps->setPropertyValue( rtl::OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue( OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue( OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); } sal_Bool SAL_CALL @@ -830,17 +829,17 @@ static uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const u if ( !xPathSettings.is() ) { uno::Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW ); + xPathSettings.set( xSMgr->createInstanceWithContext( OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW ); } return xPathSettings; } -rtl::OUString ScVbaApplication::getOfficePath( const rtl::OUString& _sPathType ) throw ( uno::RuntimeException ) +OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw ( uno::RuntimeException ) { - rtl::OUString sRetPath; + OUString sRetPath; uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext ); try { - rtl::OUString sUrl; + OUString sUrl; xProps->getPropertyValue( _sPathType ) >>= sUrl; // if its a list of paths then use the last one @@ -851,42 +850,42 @@ rtl::OUString ScVbaApplication::getOfficePath( const rtl::OUString& _sPathType ) } catch (const uno::Exception&) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return sRetPath; } void SAL_CALL -ScVbaApplication::setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (uno::RuntimeException) +ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext ); - rtl::OUString aURL; + OUString aURL; osl::FileBase::getFileURLFromSystemPath( DefaultFilePath, aURL ); - xProps->setPropertyValue( rtl::OUString("Work"), uno::Any( aURL ) ); + xProps->setPropertyValue( OUString("Work"), uno::Any( aURL ) ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Work")); + return getOfficePath( OUString("Work")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getLibraryPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Basic")); + return getOfficePath( OUString("Basic")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Template")); + return getOfficePath( OUString("Template")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getPathSeparator() throw (uno::RuntimeException) { - static rtl::OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) ); + static OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) ); return sPathSep; } @@ -1080,7 +1079,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( throw (script::BasicErrorException, uno::RuntimeException) { if( !rArg1.is() || !rArg2.is() ) - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); // initialize the result list with 1st parameter, join its ranges together ListOfScRange aList; @@ -1134,7 +1133,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( throw (script::BasicErrorException, uno::RuntimeException) { if( !rArg1.is() || !rArg2.is() ) - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); ListOfScRange aList; lclAddToListOfScRange( aList, uno::Any( rArg1 ) ); @@ -1183,7 +1182,7 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeExc SbMethod* pMeth = StarBASIC::GetActiveMethod(); if ( pMeth ) { - OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() ); uno::Reference< frame::XModel > xModel( getCurrentDocument() ); ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument(); pDoc->GetMacroManager()->SetUserFuncVolatile( pMeth->GetName(), bVolatile); @@ -1229,14 +1228,14 @@ uno::Any SAL_CALL ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException ) { StarBASIC* pBasic = SFX_APP()->GetBasic(); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("FuncCaller"), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( OUString("FuncCaller"), SbxCLASS_METHOD ); uno::Any aRet; if ( pMeth ) { SbxVariableRef refTemp = pMeth; // forces a broadcast SbxVariableRef pNew = new SbxMethod( *((SbxMethod*)pMeth)); - OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), OUStringToOString( pNew->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); aRet = sbxToUnoValue( pNew ); } return aRet; @@ -1255,7 +1254,7 @@ uno::Any SAL_CALL ScVbaApplication::GetOpenFilename( aArgs[ 5 ] = rMultiSelect; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1272,7 +1271,7 @@ uno::Any SAL_CALL ScVbaApplication::GetSaveAsFilename( aArgs[ 5 ] = rButtonText; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1295,7 +1294,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::Any( xMenuBars ); } -void SAL_CALL ScVbaApplication::OnKey( const ::rtl::OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException) +void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException) { try { @@ -1310,20 +1309,20 @@ void SAL_CALL ScVbaApplication::OnKey( const ::rtl::OUString& Key, const uno::An } } -rtl::OUString +OUString ScVbaApplication::getServiceImplName() { - return rtl::OUString("ScVbaApplication"); + return OUString("ScVbaApplication"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaApplication::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Application" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Application" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 754117845722..1991714fb77a 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -38,7 +38,7 @@ private: // note: member variables moved to struct "ScVbaAppSettings", see cxx file, to be shared by all application instances ScVbaAppSettings& mrAppSettings; - rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException ); + OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException ); protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); @@ -53,24 +53,24 @@ public: virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XExactName - virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException); // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke(const rtl::OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue(const rtl::OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue(const rtl::OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMethod(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException); // XApplication - virtual void SAL_CALL setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException); + virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException); virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException); @@ -88,7 +88,7 @@ public: virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException); virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException); @@ -96,7 +96,7 @@ public: virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException); virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException); - virtual void SAL_CALL OnKey( const ::rtl::OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException); + virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException); virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException); @@ -125,8 +125,8 @@ public: virtual css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_APPLICATION_HXX */ diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 0d3ed7eb84bf..18ccafd8d979 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -98,26 +98,26 @@ ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeE m_nAnimation = _animation; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return m_sName; } -rtl::OUString +OUString ScVbaAssistant::getServiceImplName() { - return rtl::OUString("ScVbaAssistant"); + return OUString("ScVbaAssistant"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAssistant::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.Assistant" ); + aServiceNames[ 0 ] = OUString("ooo.vba.Assistant" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index bc0a9aca63a5..20c75c7cd343 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -36,7 +36,7 @@ private: sal_Bool m_bIsVisible; sal_Int32 m_nPointsLeft; sal_Int32 m_nPointsTop; - rtl::OUString m_sName; + OUString m_sName; sal_Int32 m_nAnimation; public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext ); @@ -53,10 +53,10 @@ public: virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException); virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_ASSISTANT_HXX diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 3174bd2ed093..4e59d1b3dce7 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -64,17 +64,17 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xAxisPropertySet; if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue))) { if ((nAxisGroup != xlPrimary) && (nAxisGroup != xlSecondary)) - throw script::BasicErrorException( rtl::OUString(), NULL, SbERR_METHOD_FAILED, rtl::OUString()); + throw script::BasicErrorException( OUString(), NULL, SbERR_METHOD_FAILED, OUString()); xAxisPropertySet.set( pChart->getAxisPropertySet(nType, nAxisGroup), uno::UNO_QUERY_THROW ); } else - throw script::BasicErrorException( rtl::OUString(), NULL, SbERR_METHOD_FAILED, rtl::OUString()); + throw script::BasicErrorException( OUString(), NULL, SbERR_METHOD_FAILED, OUString()); uno::Reference< XHelperInterface > xParent( xChart, uno::UNO_QUERY_THROW ); return new ScVbaAxis( xParent, xContext, xAxisPropertySet, nType, nAxisGroup); } @@ -96,18 +96,18 @@ public: // primary sal_Bool bBool = false; uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) ); if ( pChart->is3D() ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) ); // secondary - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) ); } @@ -160,7 +160,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) sal_Int32 nAxisGroup = xlPrimary; sal_Int32 nType = -1; if ( !_nType.hasValue() || ( ( _nType >>= nType ) == false ) ) - throw uno::RuntimeException( rtl::OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); if ( _oAxisGroup.hasValue() ) _oAxisGroup >>= nAxisGroup ; @@ -174,20 +174,20 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource) return aSource; // pass through ( it's already an XAxis object } -rtl::OUString +OUString ScVbaAxes::getServiceImplName() { - return rtl::OUString("ScVbaAxes"); + return OUString("ScVbaAxes"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxes::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axes" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Axes" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index 9420815efc92..b8a0bc1f68bc 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -35,8 +35,8 @@ public: css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException ); }; diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 52f152ffd008..f52eec90a38b 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -29,16 +29,16 @@ using namespace ::ooo::vba::excel::XlAxisCrosses; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlScaleType; -const rtl::OUString ORIGIN("Origin"); -const rtl::OUString AUTOORIGIN("AutoOrigin"); -const rtl::OUString VBA_MIN("Max"); -const rtl::OUString VBA_MAX("Min"); +const OUString ORIGIN("Origin"); +const OUString AUTOORIGIN("AutoOrigin"); +const OUString VBA_MIN("Max"); +const OUString VBA_MAX("Min"); ScVbaChart* ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); return pChart; } @@ -47,7 +47,7 @@ ScVbaAxis::isValueAxis() throw( script::BasicErrorException ) { if ( getType() == xlCategory ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return sal_True; } @@ -103,13 +103,13 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce void SAL_CALL ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } ::sal_Int32 SAL_CALL ScVbaAxis::getDisplayUnit( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return -1; } @@ -143,7 +143,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } ::sal_Int32 SAL_CALL @@ -175,7 +175,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return nCrosses; } @@ -205,7 +205,7 @@ ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fCrosses; } @@ -232,13 +232,13 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); break; default: // xlValue: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); } } @@ -259,13 +259,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasXAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasXAxisTitle") ) >>= bHasTitle; break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasZAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasZAxisTitle") ) >>= bHasTitle; break; default: // xlValue: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasYAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasYAxisTitle") ) >>= bHasTitle; } } catch (const uno::Exception& e) @@ -281,11 +281,11 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString("StepHelp"), uno::makeAny(_fMinorUnit)); + mxPropertySet->setPropertyValue( OUString("StepHelp"), uno::makeAny(_fMinorUnit)); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -296,11 +296,11 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString("StepHelp")) >>= fMinor; + mxPropertySet->getPropertyValue( OUString("StepHelp")) >>= fMinor; } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fMinor; } @@ -311,11 +311,11 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); + mxPropertySet->setPropertyValue( OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -327,12 +327,12 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepHelp") ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoStepHelp") ) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -340,13 +340,13 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti void SAL_CALL ScVbaAxis::setReversePlotOrder( ::sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } ::sal_Bool SAL_CALL ScVbaAxis::getReversePlotOrder( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return false; } @@ -357,12 +357,12 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString("StepMain"), uno::makeAny(_fMajorUnit)); + mxPropertySet->setPropertyValue( OUString("StepMain"), uno::makeAny(_fMajorUnit)); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -373,11 +373,11 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString("StepMain")) >>= fMax; + mxPropertySet->getPropertyValue( OUString("StepMain")) >>= fMax; } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return fMax; } @@ -389,12 +389,12 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); + mxPropertySet->setPropertyValue( OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -406,12 +406,12 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepMain")) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoStepMain")) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -423,12 +423,12 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc { if ( isValueAxis() ) { - mxPropertySet->setPropertyValue( rtl::OUString( "Max" ), uno::makeAny(_fMaximumScale)); + mxPropertySet->setPropertyValue( OUString( "Max" ), uno::makeAny(_fMaximumScale)); } } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -440,12 +440,12 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "Max" )) >>= fMax; + mxPropertySet->getPropertyValue( OUString( "Max" )) >>= fMax; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fMax; @@ -457,12 +457,12 @@ ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (scrip try { if ( isValueAxis() ) - mxPropertySet->setPropertyValue( rtl::OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); + mxPropertySet->setPropertyValue( OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -474,11 +474,11 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( "AutoMax" ) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoMax" ) ) >>= bIsAuto; } catch ( uno::Exception& ) { - DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception( SbERR_METHOD_FAILED, OUString() ); } return bIsAuto; } @@ -489,11 +489,11 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString("Min"), uno::makeAny( _fMinimumScale ) ); + mxPropertySet->setPropertyValue( OUString("Min"), uno::makeAny( _fMinimumScale ) ); } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -504,7 +504,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( "Min")) >>= fMin; + mxPropertySet->getPropertyValue( OUString( "Min")) >>= fMin; } catch (const uno::Exception& e) { @@ -520,12 +520,12 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); + mxPropertySet->setPropertyValue( OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -537,12 +537,12 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString("AutoMin") ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString("AutoMin") ) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -563,10 +563,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce switch (_nScaleType) { case xlScaleLinear: - mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); + mxPropertySet->setPropertyValue( OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); break; case xlScaleLogarithmic: - mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); + mxPropertySet->setPropertyValue( OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); break; default: // According to MS the paramenter is ignored and no Error is thrown @@ -576,7 +576,7 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -589,7 +589,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce if (isValueAxis()) { sal_Bool bisLogarithmic = false; - mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString("Logarithmic")) ) >>= bisLogarithmic; + mxPropertySet->getPropertyValue( OUString( OUString("Logarithmic")) ) >>= bisLogarithmic; if (bisLogarithmic) nScaleType = xlScaleLogarithmic; else @@ -598,7 +598,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return nScaleType; } @@ -638,20 +638,20 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx oShapeHelper->setLeft( left ); } -rtl::OUString +OUString ScVbaAxis::getServiceImplName() { - return rtl::OUString("ScVbaAxis"); + return OUString("ScVbaAxis"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxis::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axis" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Axis" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index fde704028d5f..028d82cd6270 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -84,8 +84,8 @@ public: virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_AXIS_HXX diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index 986d1a3766e7..9c1993c62131 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -25,21 +25,21 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen { } -rtl::OUString +OUString ScVbaAxisTitle::getServiceImplName() { - return rtl::OUString("ScVbaAxisTitle"); + return OUString("ScVbaAxisTitle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxisTitle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { - uno::Sequence< rtl::OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); + uno::Sequence< OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.AxisTitle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.AxisTitle" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx index 0a9b09ff754d..b0cbd9e92e95 100644 --- a/sc/source/ui/vba/vbaaxistitle.hxx +++ b/sc/source/ui/vba/vbaaxistitle.hxx @@ -30,8 +30,8 @@ class ScVbaAxisTitle : public AxisTitleBase public: ScVbaAxisTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index a184897d9ef0..38ee47e8c919 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -42,7 +42,7 @@ typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base; // borders, the enumeration will match the order in this list static const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal }; -const static rtl::OUString sTableBorder("TableBorder"); +const static OUString sTableBorder("TableBorder"); // Equiv widths in in 1/100 mm const static sal_Int32 OOLineThin = 35; @@ -144,17 +144,17 @@ private: } ScVbaBorder(); // no impl protected: - virtual rtl::OUString getServiceImplName() + virtual OUString getServiceImplName() { - return rtl::OUString("ScVbaBorder"); + return OUString("ScVbaBorder"); } - virtual css::uno::Sequence<rtl::OUString> getServiceNames() + virtual css::uno::Sequence<OUString> getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Border" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Border" ); } return aServiceNames; } @@ -167,7 +167,7 @@ public: table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); - throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException) { @@ -180,7 +180,7 @@ public: setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException) @@ -231,7 +231,7 @@ public: break; } } - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException) { @@ -255,12 +255,12 @@ public: aBorderLine.OuterLineWidth = OOLineHairline; break; default: - throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException) @@ -289,12 +289,12 @@ public: case XlLineStyle::xlSlantDashDot: break; default: - throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } }; @@ -546,20 +546,20 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run } -rtl::OUString +OUString ScVbaBorders::getServiceImplName() { - return rtl::OUString("ScVbaBorders"); + return OUString("ScVbaBorders"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaBorders::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Borders" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Borders" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index cda900232898..a7a5eba2ca2d 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -60,8 +60,8 @@ public: virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException); // xxxxBASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_BORDERS_HXX diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index ae4f367c3a31..496c8d6d2cec 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -49,13 +49,13 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaCharacters::getCaption() throw (css::uno::RuntimeException) { return m_xTextRange->getString(); } void SAL_CALL -ScVbaCharacters::setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException) +ScVbaCharacters::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException) { m_xTextRange->setString( _caption ); @@ -67,13 +67,13 @@ ScVbaCharacters::getCount() throw (css::uno::RuntimeException) return getCaption().getLength(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaCharacters::getText() throw (css::uno::RuntimeException) { return getCaption(); } void SAL_CALL -ScVbaCharacters::setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException) +ScVbaCharacters::setText( const OUString& _text ) throw (css::uno::RuntimeException) { setCaption( _text ); } @@ -87,13 +87,13 @@ void SAL_CALL ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException) { // #TODO #FIXME needs implementation, or can't be done? - throw uno::RuntimeException( ::rtl::OUString( "Not Implemented"), uno::Reference< XInterface >() ); + throw uno::RuntimeException( OUString( "Not Implemented"), uno::Reference< XInterface >() ); } // Methods void SAL_CALL -ScVbaCharacters::Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException) +ScVbaCharacters::Insert( const OUString& String ) throw (css::uno::RuntimeException) { m_xSimpleText->insertString( m_xTextRange, String, bReplace ); } @@ -103,24 +103,24 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException) { // #FIXME #TODO is this a bit suspect?, I wonder should the contents // of the cell be deleted from the parent ( range ) - m_xSimpleText->setString(rtl::OUString()); + m_xSimpleText->setString(OUString()); } -rtl::OUString +OUString ScVbaCharacters::getServiceImplName() { - return rtl::OUString("ScVbaCharacters"); + return OUString("ScVbaCharacters"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaCharacters::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Characters" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Characters" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 57ed5fd4f658..4e3121d3878c 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -44,22 +44,22 @@ public: virtual ~ScVbaCharacters() {} // Attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException); // Methods - virtual void SAL_CALL Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException); + virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 760095a49bae..449b9d744ad1 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -47,23 +47,23 @@ using namespace ::ooo::vba::excel::XlRowCol; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlAxisGroup; -const rtl::OUString CHART_NAME("Name"); +const OUString CHART_NAME("Name"); // #TODO move this constant to vbaseries.[ch]xx ( when it exists ) -const rtl::OUString DEFAULTSERIESPREFIX("Series"); -const rtl::OUString DATAROWSOURCE("DataRowSource"); -const rtl::OUString UPDOWN("UpDown"); -const rtl::OUString VOLUME("Volume"); -const rtl::OUString LINES("Lines"); -const rtl::OUString SPLINETYPE("SplineType"); -const rtl::OUString SYMBOLTYPE("SymbolType"); -const rtl::OUString DEEP("Deep"); -const rtl::OUString SOLIDTYPE("SolidType"); -const rtl::OUString VERTICAL("Vertical"); -const rtl::OUString PERCENT("Percent"); -const rtl::OUString STACKED("Stacked"); -const rtl::OUString DIM3D("Dim3D"); -const rtl::OUString HASMAINTITLE("HasMainTitle"); -const rtl::OUString HASLEGEND("HasLegend"); +const OUString DEFAULTSERIESPREFIX("Series"); +const OUString DATAROWSOURCE("DataRowSource"); +const OUString UPDOWN("UpDown"); +const OUString VOLUME("Volume"); +const OUString LINES("Lines"); +const OUString SPLINETYPE("SplineType"); +const OUString SYMBOLTYPE("SymbolType"); +const OUString DEEP("Deep"); +const OUString SOLIDTYPE("SolidType"); +const OUString VERTICAL("Vertical"); +const OUString PERCENT("Percent"); +const OUString STACKED("Stacked"); +const OUString DIM3D("Dim3D"); +const OUString HASMAINTITLE("HasMainTitle"); +const OUString HASLEGEND("HasLegend"); ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ) : ChartImpl_BASE( _xParent, _xContext ), mxTableChart( _xTableChart ) { @@ -77,10 +77,10 @@ ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xPar mxChartPropertySet.set( _xChartComponent, uno::UNO_QUERY_THROW ) ; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaChart::getName() throw (css::uno::RuntimeException) { - rtl::OUString sName; + OUString sName; uno::Reference< beans::XPropertySet > xProps( mxChartDocument, uno::UNO_QUERY_THROW ); try { @@ -104,7 +104,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce sal_Int32 nChartType = -1; try { - rtl::OUString sDiagramType = mxChartDocument->getDiagram()->getDiagramType(); + OUString sDiagramType = mxChartDocument->getDiagram()->getDiagramType(); if ( sDiagramType == "com.sun.star.chart.AreaDiagram" ) { if (is3D()) @@ -212,7 +212,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return nChartType; } @@ -262,7 +262,7 @@ try case xlSurfaceWireframe: case xlSurfaceTopView: case xlSurfaceTopViewWireframe: - setDiagram( rtl::OUString("com.sun.star.chart.BarDiagram")); + setDiagram( OUString("com.sun.star.chart.BarDiagram")); break; case xlLine: case xl3DLine: @@ -271,7 +271,7 @@ try case xlLineMarkers: case xlLineMarkersStacked: case xlLineMarkersStacked100: - setDiagram( rtl::OUString("com.sun.star.chart.LineDiagram")); + setDiagram( OUString("com.sun.star.chart.LineDiagram")); break; case xl3DArea: case xlArea: @@ -279,17 +279,17 @@ try case xlAreaStacked100: case xl3DAreaStacked: case xl3DAreaStacked100: - setDiagram( rtl::OUString("com.sun.star.chart.AreaDiagram") ); + setDiagram( OUString("com.sun.star.chart.AreaDiagram") ); break; case xlDoughnut: case xlDoughnutExploded: - setDiagram( rtl::OUString("com.sun.star.chart.DonutDiagram") ); + setDiagram( OUString("com.sun.star.chart.DonutDiagram") ); break; case xlStockHLC: case xlStockOHLC: case xlStockVHLC: case xlStockVOHLC: - setDiagram( rtl::OUString("com.sun.star.chart.StockDiagram")); + setDiagram( OUString("com.sun.star.chart.StockDiagram")); mxDiagramPropertySet->setPropertyValue( UPDOWN, uno::makeAny(sal_Bool((_nChartType == xlStockOHLC) || (_nChartType == xlStockVOHLC)))); mxDiagramPropertySet->setPropertyValue(VOLUME, uno::makeAny(sal_Bool((_nChartType == xlStockVHLC) || (_nChartType == xlStockVOHLC)))); break; @@ -300,13 +300,13 @@ try case xl3DPie: case xlPie: case xlBarOfPie: // not possible (Zoom pie) - setDiagram( rtl::OUString("com.sun.star.chart.PieDiagram")); + setDiagram( OUString("com.sun.star.chart.PieDiagram")); break; case xlRadar: case xlRadarMarkers: case xlRadarFilled: - setDiagram( rtl::OUString("com.sun.star.chart.NetDiagram")); + setDiagram( OUString("com.sun.star.chart.NetDiagram")); break; case xlXYScatter: case xlBubble: // not possible @@ -315,7 +315,7 @@ try case xlXYScatterLinesNoMarkers: case xlXYScatterSmooth: case xlXYScatterSmoothNoMarkers: - setDiagram( rtl::OUString("com.sun.star.chart.XYDiagram")); + setDiagram( OUString("com.sun.star.chart.XYDiagram")); switch(_nChartType) { case xlXYScatter: @@ -336,7 +336,7 @@ try } break; default: - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_CONVERSION, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_CONVERSION, OUString() ); } switch (_nChartType) @@ -539,7 +539,7 @@ try } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -555,7 +555,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException if ( pChartObj ) pChartObj->Activate(); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "no ChartObject as parent" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "no ChartObject as parent" ) ); } void SAL_CALL @@ -622,18 +622,18 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount ) { - uno::Sequence< rtl::OUString > sDescriptions ( _nCount ); + uno::Sequence< OUString > sDescriptions ( _nCount ); sal_Int32 nLen = sDescriptions.getLength(); for (sal_Int32 i = 0; i < nLen; i++) { - sDescriptions[i] = DEFAULTSERIESPREFIX + rtl::OUString::valueOf(i+1); + sDescriptions[i] = DEFAULTSERIESPREFIX + OUString::valueOf(i+1); } return sDescriptions; } @@ -660,12 +660,12 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorExce mxDiagramPropertySet->setPropertyValue( DATAROWSOURCE, uno::makeAny( chart::ChartDataRowSource_COLUMNS) ); break; default: - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -687,12 +687,12 @@ ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeExcept } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } void -ScVbaChart::setDiagram( const rtl::OUString& _sDiagramType ) throw( script::BasicErrorException ) +ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErrorException ) { try { @@ -703,7 +703,7 @@ ScVbaChart::setDiagram( const rtl::OUString& _sDiagramType ) throw( script::Basi } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -819,7 +819,7 @@ ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasTitle; } @@ -833,7 +833,7 @@ ScVbaChart::setHasTitle( ::sal_Bool bTitle ) throw (script::BasicErrorException, } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -848,7 +848,7 @@ ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeExc } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasLegend; } @@ -862,7 +862,7 @@ ScVbaChart::setHasLegend( ::sal_Bool bLegend ) throw (script::BasicErrorExceptio } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -953,7 +953,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _ } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -976,8 +976,8 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw } catch (const uno::Exception&) { - rtl::OUString aTemp; // temporary needed for g++ 3.3.5 - script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + OUString aTemp; // temporary needed for g++ 3.3.5 + script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return _nNotUpDown; } @@ -994,8 +994,8 @@ ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) } catch (const uno::Exception&) { - rtl::OUString aTemp; // temporary needed for g++ 3.3.5 - script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + OUString aTemp; // temporary needed for g++ 3.3.5 + script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasMarkers; } @@ -1052,20 +1052,20 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro } -rtl::OUString +OUString ScVbaChart::getServiceImplName() { - return rtl::OUString("ScVbaChart"); + return OUString("ScVbaChart"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChart::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Chart" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index bef1cb23cd3d..e2282e84a626 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -48,10 +48,10 @@ friend class ScVbaAxis; css::uno::Reference< css::chart::XTwoAxisXSupplier > xTwoAxisXSupplier; css::uno::Reference< css::chart::XTwoAxisYSupplier > xTwoAxisYSupplier; - css::uno::Sequence< rtl::OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); + css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); css::uno::Sequence< css::uno::Sequence< double > > dblValues; void setDefaultChartType()throw ( css::script::BasicErrorException ) ; - void setDiagram( const rtl::OUString& _sDiagramType) throw( css::script::BasicErrorException ); + void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException ); bool isStacked() throw ( css::uno::RuntimeException ); bool is100PercentStacked() throw ( css::uno::RuntimeException ); sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( css::uno::RuntimeException ); @@ -68,7 +68,7 @@ public: bool is3D() throw ( css::uno::RuntimeException ); css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException ); // Methods - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException); virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException); @@ -86,8 +86,8 @@ public: virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 42cf8f1758f2..f08764f439f3 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -const rtl::OUString PERSIST_NAME("PersistName"); +const OUString PERSIST_NAME("PersistName"); ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier ) { @@ -41,7 +41,7 @@ ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterf oShapeHelper.reset(new ShapeHelper(xShape)); } -rtl::OUString ScVbaChartObject::getPersistName() +OUString ScVbaChartObject::getPersistName() { if ( sPersistName.isEmpty() ) sPersistName = xNamed->getName(); @@ -60,7 +60,7 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) if (xShape->getShapeType().compareToAscii("com.sun.star.drawing.OLE2Shape") == 0 ) { uno::Reference< beans::XPropertySet > xShapePropertySet(xShape, uno::UNO_QUERY_THROW ); - rtl::OUString sName; + OUString sName; xShapePropertySet->getPropertyValue(PERSIST_NAME ) >>=sName; if ( sName.equals(sPersistName)) { @@ -72,19 +72,19 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return NULL; } void SAL_CALL -ScVbaChartObject::setName( const rtl::OUString& sName ) throw (css::uno::RuntimeException) +ScVbaChartObject::setName( const OUString& sName ) throw (css::uno::RuntimeException) { xNamedShape->setName(sName); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaChartObject::getName() throw (css::uno::RuntimeException) { return xNamedShape->getName(); @@ -100,7 +100,7 @@ ScVbaChartObject::Delete() throw ( css::script::BasicErrorException ) if (pChartObjectsImpl) pChartObjectsImpl->removeByName( getPersistName() ); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "Parent is not ChartObjects" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "Parent is not ChartObjects" ) ); } void @@ -117,7 +117,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException ) } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "ChartObject Activate internal error" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "ChartObject Activate internal error" ) ); } } @@ -127,20 +127,20 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException) return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart ); } -rtl::OUString +OUString ScVbaChartObject::getServiceImplName() { - return rtl::OUString("ScVbaChartObject"); + return OUString("ScVbaChartObject"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartObject::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ChartObject" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.ChartObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 99f94ebb7e8b..f0a557e6f080 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -40,23 +40,23 @@ class ScVbaChartObject : public ChartObjectImpl_BASE css::uno::Reference< css::drawing::XDrawPage > xDrawPage; css::uno::Reference< css::drawing::XShape > xShape; css::uno::Reference< css::container::XNamed > xNamed; - rtl::OUString sPersistName; + OUString sPersistName; SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<ov::ShapeHelper> oShapeHelper; SAL_WNODEPRECATED_DECLARATIONS_POP css::uno::Reference< css::container::XNamed > xNamedShape; - rtl::OUString getPersistName(); + OUString getPersistName(); css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); public: ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& sName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException); virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException ); virtual void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index cdfd42545885..81904861106a 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -58,15 +58,15 @@ ScVbaChartObjects::ScVbaChartObjects( const css::uno::Reference< ov::XHelperInte } void -ScVbaChartObjects::removeByName(const rtl::OUString& _sChartName) +ScVbaChartObjects::removeByName(const OUString& _sChartName) { xTableCharts->removeByName( _sChartName ); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ) { - uno::Sequence< rtl::OUString > sChartNames; + uno::Sequence< OUString > sChartNames; try { // c++ hackery @@ -74,34 +74,34 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() ); ScDocShell* pDocShell = NULL; if ( !pUno ) - throw uno::RuntimeException( rtl::OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); pDocShell = pUno->GetDocShell(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets(); - std::vector< rtl::OUString > aChartNamesVector; + std::vector< OUString > aChartNamesVector; - uno::Sequence< rtl::OUString > sSheetNames = xSpreadsheets->getElementNames(); + uno::Sequence< OUString > sSheetNames = xSpreadsheets->getElementNames(); sal_Int32 nItems = sSheetNames.getLength(); for (sal_Int32 i = 0; i < nItems; i++) { uno::Reference< table::XTableChartsSupplier > xLocTableChartsSupplier( xSpreadsheets->getByName(sSheetNames[i]), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > scurchartnames = xLocTableChartsSupplier->getCharts()->getElementNames(); + uno::Sequence< OUString > scurchartnames = xLocTableChartsSupplier->getCharts()->getElementNames(); sal_Int32 nChartNames = scurchartnames.getLength(); for (sal_Int32 n = 0; n < nChartNames; n++ ) aChartNamesVector.push_back(scurchartnames[n]); } sChartNames.realloc( aChartNamesVector.size() ); - std::vector< rtl::OUString > ::const_iterator it = aChartNamesVector.begin(); - std::vector< rtl::OUString > ::const_iterator it_end = aChartNamesVector.end(); + std::vector< OUString > ::const_iterator it = aChartNamesVector.begin(); + std::vector< OUString > ::const_iterator it_end = aChartNamesVector.end(); for ( sal_Int32 index = 0 ; it != it_end; ++it, ++index ) sChartNames[index] = *it; } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return sChartNames; } @@ -119,7 +119,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight aRectangle.Width = Millimeter::getInHundredthsOfOneMillimeter(_nWidth); aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight); // Note the space at the end of the stem ("Chart "). In ChartSheets only "Chart" is the stem - rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( "Chart " ) , rtl::OUString(), 1); + OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), OUString( "Chart " ) , OUString(), 1); xTableCharts->addNewByName(sPersistChartName, aRectangle, aCellRangeAddress, true, false ); uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW ); xChartObject->getChart()->setChartType(excel::XlChartType::xlColumnClustered); @@ -127,13 +127,13 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight } catch (const uno::Exception& ex) { - OSL_TRACE("AddItem caught exception ->%s", rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("AddItem caught exception ->%s", OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } return aNULL(); } void SAL_CALL ScVbaChartObjects::Delete( ) throw (script::BasicErrorException) { - uno::Sequence< rtl::OUString > sChartNames = xTableCharts->getElementNames(); + uno::Sequence< OUString > sChartNames = xTableCharts->getElementNames(); sal_Int32 ncount = sChartNames.getLength(); for (sal_Int32 i = 0; i < ncount ; i++) removeByName(sChartNames[i]); @@ -165,20 +165,20 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( getParent(), mxContext, xTableChart, xDrawPageSupplier ) ) ); } -rtl::OUString +OUString ScVbaChartObjects::getServiceImplName() { - return rtl::OUString("ScVbaChartObjects"); + return OUString("ScVbaChartObjects"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaChartObjects::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.ChartObjects"); + sNames[0] = OUString("ooo.vba.excel.ChartObjects"); } return sNames; } diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 7c52f5c1962d..6ced7893db7f 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -31,10 +31,10 @@ typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE; /* #TODO see if this hash table is 'really' necessary -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, css::uno::Reference< ov::excel::XChartObject >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > aHashTable; + OUStringHash, + ::std::equal_to< OUString > > aHashTable; */ class ScVbaChartObjects : public ChartObjects_BASE @@ -47,8 +47,8 @@ class ScVbaChartObjects : public ChartObjects_BASE public: ScVbaChartObjects( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableCharts >& _xTableCharts, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - css::uno::Sequence< rtl::OUString > getChartObjectNames() throw( css::script::BasicErrorException ); - void removeByName(const rtl::OUString& _sChartName); + css::uno::Sequence< OUString > getChartObjectNames() throw( css::script::BasicErrorException ); + void removeByName(const OUString& _sChartName); // XChartObjects virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException); @@ -60,8 +60,8 @@ public: // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ChartObjects_BASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index 3fbe661f98fa..a07722c86f1b 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -25,21 +25,21 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar { } -rtl::OUString +OUString ScVbaChartTitle::getServiceImplName() { - return rtl::OUString("ScVbaChartTitle"); + return OUString("ScVbaChartTitle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartTitle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { - uno::Sequence< rtl::OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); + uno::Sequence< OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Chart" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index 22989e8a3106..dec1b7717572 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -30,8 +30,8 @@ class ScVbaChartTitle : public ChartTitleBase public: ScVbaChartTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index 1393237312bf..d6f18cc40bbc 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -47,7 +47,7 @@ ScVbaComment::ScVbaComment( mxRange( xRange ) { if ( !xRange.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY ); } @@ -108,14 +108,14 @@ ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException) // public vba functions -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaComment::getAuthor() throw (uno::RuntimeException) { return getAnnotation()->getAuthor(); } void SAL_CALL -ScVbaComment::setAuthor( const rtl::OUString& /*_author*/ ) throw (uno::RuntimeException) +ScVbaComment::setAuthor( const OUString& /*_author*/ ) throw (uno::RuntimeException) { // #TODO #FIXME implementation needed } @@ -163,14 +163,14 @@ ScVbaComment::Previous() throw (uno::RuntimeException) return getCommentByIndex( getAnnotationIndex() ); } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite ) throw (uno::RuntimeException) { - rtl::OUString sText; + OUString sText; aText >>= sText; uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY_THROW ); - rtl::OUString sAnnoText = xAnnoText->getString(); + OUString sAnnoText = xAnnoText->getString(); if ( aStart.hasValue() ) { @@ -200,7 +200,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An xAnnoText->insertString( xRange, sText, bOverwrite ); return xAnnoText->getString(); } - throw uno::RuntimeException( rtl::OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); } else if ( aText.hasValue() ) { @@ -212,20 +212,20 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An return sAnnoText; } -rtl::OUString +OUString ScVbaComment::getServiceImplName() { - return rtl::OUString("ScVbaComment"); + return OUString("ScVbaComment"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaComment::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ScVbaComment" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.ScVbaComment" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index e8c2381639a2..17a2c319cc08 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -53,8 +53,8 @@ public: virtual ~ScVbaComment() {} // Attributes - virtual rtl::OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAuthor( const rtl::OUString& _author ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException); + virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException); @@ -63,10 +63,10 @@ public: virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_COMMENT_HXX */ diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 9e09ee631cda..1a678afb68e7 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -88,20 +88,20 @@ ScVbaComments::getElementType() throw (uno::RuntimeException) return excel::XComment::static_type(0); } -rtl::OUString +OUString ScVbaComments::getServiceImplName() { - return rtl::OUString("ScVbaComments"); + return OUString("ScVbaComments"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaComments::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Comments"); + sNames[0] = OUString("ooo.vba.excel.Comments"); } return sNames; } diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 93d248dccb20..431409d4c54e 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -46,8 +46,8 @@ public: // ScVbaComments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); private: css::uno::Reference< css::frame::XModel > mxModel; diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 3ebd89adf753..54d320c07743 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -77,14 +77,14 @@ ScVbaCondition< Ifc1 >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( } template< typename Ifc1 > -rtl::OUString +OUString ScVbaCondition< Ifc1 >::Formula1( ) throw ( script::BasicErrorException, uno::RuntimeException ) { return mxSheetCondition->getFormula1(); } template< typename Ifc1 > -rtl::OUString +OUString ScVbaCondition< Ifc1 >::Formula2( ) throw ( script::BasicErrorException, uno::RuntimeException ) { return mxSheetCondition->getFormula2(); @@ -94,7 +94,7 @@ template< typename Ifc1 > void ScVbaCondition< Ifc1 >::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) { - rtl::OUString sFormula; + OUString sFormula; if ( (_aFormula1 >>= sFormula )) { mxSheetCondition->setFormula1( sFormula ); @@ -108,7 +108,7 @@ template< typename Ifc1 > void ScVbaCondition< Ifc1 >::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException ) { - rtl::OUString sFormula2; + OUString sFormula2; // #TODO surely this can't be right? // ( from helperapi/impl/.../calc/ConditionImpl.java if ( (_aFormula2 >>= sFormula2 )) @@ -157,7 +157,7 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script: } case sheet::ConditionOperator_NONE: default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString("Operator not supported")); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString("Operator not supported")); break; } return retvalue; diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx index db0eb8f1c94d..b5bed15ae80f 100644 --- a/sc/source/ui/vba/vbacondition.hxx +++ b/sc/source/ui/vba/vbacondition.hxx @@ -35,8 +35,8 @@ public: static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator) throw ( css::script::BasicErrorException ); - virtual rtl::OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + virtual OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ); virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ); virtual sal_Int32 Operator(sal_Bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index 1f1c3736bce9..a5c59fd27d8b 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -23,59 +23,59 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const rtl::OUString aStringList[]= +static const OUString aStringList[]= { - rtl::OUString( ".uno:Open" ), - rtl::OUString( ".uno:FormatCellDialog" ), - rtl::OUString( ".uno:InsertCell" ), - rtl::OUString( ".uno:Print" ), - rtl::OUString( ".uno:PasteSpecial" ), - rtl::OUString( ".uno:ToolProtectionDocument" ), - rtl::OUString( ".uno:ColumnWidth" ), - rtl::OUString( ".uno:DefineName" ), - rtl::OUString( ".uno:ConfigureDialog" ), - rtl::OUString( ".uno:HyperlinkDialog" ), - rtl::OUString( ".uno:InsertGraphic" ), - rtl::OUString( ".uno:InsertObject" ), - rtl::OUString( ".uno:PageFormatDialog" ), - rtl::OUString( ".uno:DataSort" ), - rtl::OUString( ".uno:RowHeight" ), - rtl::OUString( ".uno:AutoCorrectDlg" ), - rtl::OUString( ".uno:ConditionalFormatDialog" ), - rtl::OUString( ".uno:DataConsolidate" ), - rtl::OUString( ".uno:CreateNames" ), - rtl::OUString( ".uno:FillSeries" ), - rtl::OUString( ".uno:Validation"), - rtl::OUString( ".uno:DefineLabelRange" ), - rtl::OUString( ".uno:DataFilterAutoFilter" ), - rtl::OUString( ".uno:DataFilterSpecialFilter" ), - rtl::OUString( ".uno:AutoFormat" ) + OUString( ".uno:Open" ), + OUString( ".uno:FormatCellDialog" ), + OUString( ".uno:InsertCell" ), + OUString( ".uno:Print" ), + OUString( ".uno:PasteSpecial" ), + OUString( ".uno:ToolProtectionDocument" ), + OUString( ".uno:ColumnWidth" ), + OUString( ".uno:DefineName" ), + OUString( ".uno:ConfigureDialog" ), + OUString( ".uno:HyperlinkDialog" ), + OUString( ".uno:InsertGraphic" ), + OUString( ".uno:InsertObject" ), + OUString( ".uno:PageFormatDialog" ), + OUString( ".uno:DataSort" ), + OUString( ".uno:RowHeight" ), + OUString( ".uno:AutoCorrectDlg" ), + OUString( ".uno:ConditionalFormatDialog" ), + OUString( ".uno:DataConsolidate" ), + OUString( ".uno:CreateNames" ), + OUString( ".uno:FillSeries" ), + OUString( ".uno:Validation"), + OUString( ".uno:DefineLabelRange" ), + OUString( ".uno:DataFilterAutoFilter" ), + OUString( ".uno:DataFilterSpecialFilter" ), + OUString( ".uno:AutoFormat" ) }; const sal_Int32 nDialogSize = sizeof (aStringList) / sizeof (aStringList[0]); -rtl::OUString +OUString ScVbaDialog::mapIndexToName( sal_Int32 nIndex ) { if( nIndex < nDialogSize ) return aStringList[ nIndex ]; - return rtl::OUString(); + return OUString(); } -rtl::OUString +OUString ScVbaDialog::getServiceImplName() { - return rtl::OUString("ScVbaDialog"); + return OUString("ScVbaDialog"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaDialog::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialog" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Dialog" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx index 4adeea7798aa..bdf1e75aacbb 100644 --- a/sc/source/ui/vba/vbadialog.hxx +++ b/sc/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~ScVbaDialog() {} // Methods - virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ); + virtual OUString mapIndexToName( sal_Int32 nIndex ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index 367dbcf6cea1..6c3982b4ff2e 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -37,20 +37,20 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) return uno::Any( aDialog ); } -rtl::OUString +OUString ScVbaDialogs::getServiceImplName() { - return rtl::OUString("ScVbaDialogs"); + return OUString("ScVbaDialogs"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaDialogs::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialogs" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Dialogs" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 0542f5cf4698..420f955cb2e1 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -40,8 +40,8 @@ public: // XDialogs virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_DIALOGS_HXX */ diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index b444c2f836a8..9135324f8dfb 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; -using ::rtl::OUString; // ============================================================================ @@ -798,7 +797,7 @@ OUString ScVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& r if( bSheetEvent && (nTab < 0) ) throw lang::IllegalArgumentException(); - rtl::OUString aCodeName; + OUString aCodeName; if( bSheetEvent ) mpDoc->GetCodeName( nTab, aCodeName ); else diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 7129c3f66af4..5779f624a89e 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -43,7 +43,7 @@ protected: virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); private: /** Checks if selection has been changed compared to selection of last call. diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 91dfba73542a..8eceec21ba28 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -105,8 +105,8 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio nValue = SUPERSCRIPT; nValue2 = SUPERSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); - xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue( OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); } uno::Any SAL_CALL @@ -138,7 +138,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException ) xCell.set( xCellRange->getCellByPosition( 0,0 ) ); uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = 0; - xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; + xProps->getPropertyValue( OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUPERSCRIPT ) ); } @@ -178,8 +178,8 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException nValue2 = SUBSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); - xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue( OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( OUString( "CharEscapement" ), ( uno::Any )nValue ); } @@ -213,7 +213,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = NORMAL; - xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; + xProps->getPropertyValue( OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUBSCRIPT ) ); } @@ -258,9 +258,9 @@ void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException ) { //XXX #TODO# #FIXME# - //mxFont->setPropertyValue( rtl::OUString( "CharSize" ), ( uno::Any )fValue ); + //mxFont->setPropertyValue( OUString( "CharSize" ), ( uno::Any )fValue ); throw uno::RuntimeException( - rtl::OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); + OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); } @@ -269,7 +269,7 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); + OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -279,7 +279,7 @@ ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeExce { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() ); + OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() ); } @@ -288,7 +288,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() ); + OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -298,18 +298,18 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) sal_Bool bBold = false; sal_Bool bItalic = false; - rtl::OUString aStyles; + OUString aStyles; aValue >>= aStyles; - std::vector< rtl::OUString > aTokens; + std::vector< OUString > aTokens; sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aStyles.getToken( 0, ' ', nIndex ); + OUString aToken = aStyles.getToken( 0, ' ', nIndex ); aTokens.push_back( aToken ); }while( nIndex >= 0 ); - std::vector< rtl::OUString >::iterator it; + std::vector< OUString >::iterator it; for( it = aTokens.begin(); it != aTokens.end(); ++it ) { if( (*it).equalsIgnoreAsciiCase("Bold") ) @@ -327,7 +327,7 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) uno::Any SAL_CALL ScVbaFont::getFontStyle() throw ( uno::RuntimeException ) { - rtl::OUStringBuffer aStyles; + OUStringBuffer aStyles; sal_Bool bValue = false; getBold() >>= bValue; if( bValue ) @@ -379,10 +379,10 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException nValue = awt::FontUnderline::DOUBLE; break; default: - throw uno::RuntimeException( rtl::OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); } - mxFont->setPropertyValue( rtl::OUString( "CharUnderline" ), ( uno::Any )nValue ); + mxFont->setPropertyValue( OUString( "CharUnderline" ), ( uno::Any )nValue ); } @@ -394,7 +394,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) return aNULL(); sal_Int32 nValue = awt::FontUnderline::NONE; - mxFont->getPropertyValue( rtl::OUString( "CharUnderline" ) ) >>= nValue; + mxFont->getPropertyValue( OUString( "CharUnderline" ) ) >>= nValue; switch ( nValue ) { case awt::FontUnderline::DOUBLE: @@ -407,7 +407,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone; break; default: - throw uno::RuntimeException( rtl::OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( nValue ); @@ -454,14 +454,14 @@ ScVbaFont::getColor() throw (uno::RuntimeException) { // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet ) uno::Any aAny; - aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( "CharColor" ) ) ); + aAny = OORGBToXLRGB( mxFont->getPropertyValue( OUString( "CharColor" ) ) ); return aAny; } void SAL_CALL ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException ) { - mxFont->setPropertyValue( rtl::OUString( "CharContoured" ), aValue ); + mxFont->setPropertyValue( OUString( "CharContoured" ), aValue ); } uno::Any SAL_CALL @@ -470,23 +470,23 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException) if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); - return mxFont->getPropertyValue( rtl::OUString( "CharContoured" ) ); + return mxFont->getPropertyValue( OUString( "CharContoured" ) ); } -rtl::OUString +OUString ScVbaFont::getServiceImplName() { - return rtl::OUString("ScVbaFont"); + return OUString("ScVbaFont"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFont::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Font" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Font" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index abb76a46390f..1a93fffb5da1 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -70,8 +70,8 @@ public: virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ; virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index e05e3ce53bd4..24f230b30369 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -50,18 +50,18 @@ using namespace ::com::sun::star; #define LOCALE "Locale" template< typename Ifc1 > -ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString("en"), rtl::OUString( "US"), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) +ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) { try { if ( !mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") ); // mxServiceInfo is unused, // mxNumberFormatsSupplier is initialized when needed in initializeNumberFormats. } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -95,11 +95,11 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s aVal = uno::makeAny( table::CellVertJustify2::STANDARD ); break; } - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -110,10 +110,10 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, uno::Any aResult = aNULL(); try { - if (!isAmbiguous( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) ) + if (!isAmbiguous( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) ) { sal_Int32 aAPIAlignment = table::CellVertJustify2::STANDARD; - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment; + mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment; switch( aAPIAlignment ) { case table::CellVertJustify2::BOTTOM: @@ -135,7 +135,7 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aResult; } @@ -171,11 +171,11 @@ ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -187,7 +187,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException uno::Any NRetAlignment = aNULL(); try { - rtl::OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); if (!isAmbiguous(sHoriJust)) { table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_BLOCK; @@ -216,7 +216,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return NRetAlignment; } @@ -238,7 +238,7 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script break; case excel::XlOrientation::xlHorizontal: aVal = uno::makeAny( table::CellOrientation_STANDARD ); - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ROTANG ) ), uno::makeAny( sal_Int32(0) ) ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ROTANG ) ), uno::makeAny( sal_Int32(0) ) ); break; case excel::XlOrientation::xlUpward: aVal = uno::makeAny( table::CellOrientation_BOTTOMTOP); @@ -250,12 +250,12 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } template< typename Ifc1 > @@ -265,10 +265,10 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R uno::Any NRetOrientation = aNULL(); try { - if (!isAmbiguous(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) + if (!isAmbiguous(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) { table::CellOrientation aOrientation = table::CellOrientation_STANDARD; - if ( !( mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ) ) >>= aOrientation ) ) + if ( !( mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ) ) >>= aOrientation ) ) throw uno::RuntimeException(); switch(aOrientation) @@ -292,7 +292,7 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return NRetOrientation; } @@ -303,11 +303,11 @@ ScVbaFormat<Ifc1>::setWrapText( const uno::Any& _aWrapText ) throw (script::Basi { try { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -318,7 +318,7 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt uno::Any aWrap = aNULL(); try { - rtl::OUString aPropName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); + OUString aPropName( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); if (!isAmbiguous( aPropName )) { aWrap = mxPropertySet->getPropertyValue(aPropName); @@ -326,7 +326,7 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return aWrap; } @@ -364,10 +364,10 @@ template< typename Ifc1 > uno::Any SAL_CALL ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::RuntimeException) { - uno::Any aRet = uno::makeAny( rtl::OUString() ); + uno::Any aRet = uno::makeAny( OUString() ); try { - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if (!isAmbiguous( sPropName )) { @@ -377,15 +377,15 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, if ( ! (mxPropertySet->getPropertyValue( sPropName ) >>= nFormat ) ) throw uno::RuntimeException(); - rtl::OUString sFormat; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + OUString sFormat; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; aRet = uno::makeAny( sFormat.toAsciiLowerCase() ); } } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aRet; @@ -397,9 +397,9 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t { try { - rtl::OUString sLocalFormatString; + OUString sLocalFormatString; sal_Int32 nFormat = -1; - rtl::OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if ( !(_oLocalFormatString >>= sLocalFormatString ) || !( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat ) ) throw uno::RuntimeException(); @@ -407,7 +407,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t sLocalFormatString = sLocalFormatString.toAsciiUpperCase(); initializeNumberFormats(); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormats->queryKey(sLocalFormatString, aRangeLocale, sal_True); if (nNewFormat == -1) @@ -416,7 +416,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -426,7 +426,7 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri { try { - rtl::OUString sFormatString; + OUString sFormatString; if ( !( _oFormatString >>= sFormatString ) ) throw uno::RuntimeException(); @@ -440,13 +440,13 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri nFormat = xNumberFormats->addNew(sFormatString, aDefaultLocale); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, aRangeLocale); - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nNewFormat)); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nNewFormat)); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -462,16 +462,16 @@ ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::Basi throw uno::RuntimeException(); table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD; - rtl::OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); if ( !( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment ) ) throw uno::RuntimeException(); if (aAPIAlignment == table::CellHoriJustify_STANDARD) mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ; - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -482,7 +482,7 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R uno::Any NRetIndentLevel = aNULL(); try { - rtl::OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); + OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); if (!isAmbiguous(sParaIndent)) { sal_Int16 IndentLevel = 0; @@ -494,7 +494,7 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return NRetIndentLevel; } @@ -509,14 +509,14 @@ ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErr if ( !( _aLocked >>= bIsLocked ) ) throw uno::RuntimeException(); util::CellProtection aCellProtection; - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsLocked = bIsLocked; mxPropertySet->setPropertyValue(sCellProt, uno::makeAny( aCellProtection ) ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -529,14 +529,14 @@ ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (scri sal_Bool bIsFormulaHidden = false; FormulaHidden >>= bIsFormulaHidden; util::CellProtection aCellProtection; - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsFormulaHidden = bIsFormulaHidden; mxPropertySet->setPropertyValue(sCellProt,uno::makeAny(aCellProtection)); } catch (const uno::Exception& ) { - DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception( SbERR_METHOD_FAILED, OUString() ); } } @@ -547,7 +547,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim uno::Any aCellProtection = aNULL(); try { - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); if (!isAmbiguous(sCellProt)) { @@ -569,7 +569,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aCellProtection; } @@ -581,7 +581,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: uno::Any aBoolRet = aNULL(); try { - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); if (!isAmbiguous(sCellProt)) { SfxItemSet* pDataSet = getCurrentDataSet(); @@ -602,7 +602,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: } catch (const uno::Exception&) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aBoolRet; } @@ -613,11 +613,11 @@ ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script:: { try { - mxPropertySet->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ), ShrinkToFit); + mxPropertySet->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ), ShrinkToFit); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString() ); } } @@ -629,13 +629,13 @@ ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::R uno::Any aRet = aNULL(); try { - rtl::OUString sShrinkToFit( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ); + OUString sShrinkToFit( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ); if (!isAmbiguous(sShrinkToFit)) aRet = mxPropertySet->getPropertyValue(sShrinkToFit); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } return aRet; } @@ -659,16 +659,16 @@ ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script aVal = uno::makeAny( text::WritingMode_RL_TB ); break; case excel::Constants::xlContext: - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -680,7 +680,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno:: uno::Any NRetReadingOrder = aNULL(); try { - rtl::OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ); + OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ); if (!isAmbiguous(sWritingMode)) { text::WritingMode aWritingMode = text::WritingMode_LR_TB; @@ -699,7 +699,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno:: } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } return NRetReadingOrder; @@ -713,28 +713,28 @@ ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno try { sal_Int32 nFormat = -1; - rtl::OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if (!isAmbiguous(sNumFormat) && ( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat) ) { initializeNumberFormats(); sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, getDefaultLocale() ); - rtl::OUString sFormat; - xNumberFormats->getByKey(nNewFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + OUString sFormat; + xNumberFormats->getByKey(nNewFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; aFormat = uno::makeAny( sFormat ); } } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aFormat; } template< typename Ifc1 > bool -ScVbaFormat<Ifc1>::isAmbiguous(const rtl::OUString& _sPropertyName) throw ( script::BasicErrorException ) +ScVbaFormat<Ifc1>::isAmbiguous(const OUString& _sPropertyName) throw ( script::BasicErrorException ) { bool bResult = false; try @@ -744,7 +744,7 @@ ScVbaFormat<Ifc1>::isAmbiguous(const rtl::OUString& _sPropertyName) throw ( scri } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bResult; } @@ -771,21 +771,21 @@ ScVbaFormat<Ifc1>::getXPropertyState() throw ( uno::RuntimeException ) } template< typename Ifc1 > -rtl::OUString +OUString ScVbaFormat<Ifc1>::getServiceImplName() { - return rtl::OUString("ScVbaFormat"); + return OUString("ScVbaFormat"); } template< typename Ifc1 > -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormat<Ifc1>::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Format" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Format" ); } return aServiceNames; } @@ -803,7 +803,7 @@ ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); return pDataSet; } diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index edd9fc5f663c..b227381a2ba0 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -49,7 +49,7 @@ protected: sal_Bool mbAddIndent; //NumberFormatter oNumberFormatter = null; css::uno::Reference< css::lang::XMultiServiceFactory > xMultiServiceFactory; - bool isAmbiguous(const rtl::OUString& _sPropertyName) throw ( css::script::BasicErrorException ); + bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException ); css::uno::Reference< css::beans::XPropertyState > getXPropertyState() throw ( css::uno::RuntimeException ); void initializeNumberFormats() throw ( css::script::BasicErrorException ); SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); @@ -90,8 +90,8 @@ public: virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 09a1455a3d73..ce4f8969538d 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -28,7 +28,7 @@ lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions { ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() ); if ( !pFormatConditions ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return pFormatConditions; } ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const uno::Reference< excel::XStyle >& _xStyle, const uno::Reference< excel::XFormatConditions >& _xFormatConditions, const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException ) : ScVbaFormatCondition_BASE( xParent, xContext, uno::Reference< sheet::XSheetCondition >( _xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ), moFormatConditions( _xFormatConditions ), mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet ) @@ -59,7 +59,7 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -93,7 +93,7 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< aAPIType = sheet::ConditionOperator_NONE; break; default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return aAPIType; } @@ -140,28 +140,28 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); + mxParentRangePropertySet->setPropertyValue( OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } -rtl::OUString +OUString ScVbaFormatCondition::getServiceImplName() { - return rtl::OUString("ScVbaFormatCondition"); + return OUString("ScVbaFormatCondition"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormatCondition::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatCondition" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.FormatCondition" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 63fb310bc40e..ca373fd61c8d 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -32,7 +32,7 @@ typedef ScVbaCondition< ov::excel::XFormatCondition > ScVbaFormatCondition_BASE class ScVbaFormatCondition : public ScVbaFormatCondition_BASE { protected: - rtl::OUString msStyleName; + OUString msStyleName; css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry; css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions; @@ -56,8 +56,8 @@ public: virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 8e1989f6b2de..e0bf2411bada 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -31,11 +31,11 @@ using namespace ::com::sun::star; typedef std::vector< beans::PropertyValue > VecPropValues; -static rtl::OUString OPERATOR("Operator"); -static rtl::OUString FORMULA1("Formula1"); -static rtl::OUString FORMULA2("Formula2"); -static rtl::OUString STYLENAME("StyleName"); -static rtl::OUString sStyleNamePrefix("Excel_CondFormat"); +static OUString OPERATOR("Operator"); +static OUString FORMULA1("Formula1"); +static OUString FORMULA2("Formula2"); +static OUString STYLENAME("StyleName"); +static OUString sStyleNamePrefix("Excel_CondFormat"); void SAL_CALL ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) @@ -44,7 +44,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); sal_Int32 nCount = mxSheetConditionalEntries->getCount(); for (sal_Int32 i = nCount - 1; i >= 0; i--) { @@ -56,7 +56,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -128,7 +128,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons uno::Reference< excel::XFormatCondition > xFormatCondition; try { - rtl::OUString sStyleName; + OUString sStyleName; if ( !xStyle.is() ) { sStyleName = getStyleName(); @@ -186,7 +186,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons catch (uno::Exception& ) { } - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return xFormatCondition; } @@ -203,36 +203,36 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); + mxParentRangePropertySet->setPropertyValue( OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( script::BasicErrorException ) { // #TODO, #FIXME hook-in proper formula conversion detection & logic - rtl::OUString sFormula; + OUString sFormula; if ( !( _aFormula >>= sFormula ) ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); return sFormula; } -rtl::OUString +OUString ScVbaFormatConditions::getStyleName() { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); - uno::Sequence< rtl::OUString > sCellStyleNames = pStyles->getStyleNames(); - return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString("_")); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); + uno::Sequence< OUString > sCellStyleNames = pStyles->getStyleNames(); + return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, OUString("_")); } void -ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( script::BasicErrorException ) +ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( script::BasicErrorException ) { try { @@ -247,7 +247,7 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); pStyles->Delete( _sStyleName ); } return; @@ -256,24 +256,24 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaFormatConditions::getServiceImplName() { - return rtl::OUString("ScVbaFormatConditions"); + return OUString("ScVbaFormatConditions"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormatConditions::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatConditions" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.FormatConditions" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index 303852ac98c8..100916426dce 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -50,9 +50,9 @@ class ScVbaFormatConditions: public ScVbaFormatConditions_BASE public: void notifyRange() throw ( css::script::BasicErrorException ); virtual css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - rtl::OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); - rtl::OUString getStyleName(); - void removeFormatCondition( const rtl::OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( css::script::BasicErrorException ); + OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); + OUString getStyleName(); + void removeFormatCondition( const OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( css::script::BasicErrorException ); css::uno::Reference< css::sheet::XSheetConditionalEntries > getSheetConditionalEntries() const { return mxSheetConditionalEntries; } // XFormatConditions virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); @@ -62,8 +62,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #ifdef _MSC_VER diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 707a5578b605..94d42fcc777f 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -42,14 +42,14 @@ using namespace ::ooo::vba; // ============================================================================= //ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext, ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext ) -rtl::OUString sDocCtxName( "ExcelDocumentContext" ); +OUString sDocCtxName( "ExcelDocumentContext" ); ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName ) { OSL_TRACE("ScVbaGlobals::ScVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); - aInitArgs[ 0 ].Name = rtl::OUString("Application"); + aInitArgs[ 0 ].Name = OUString("Application"); aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); @@ -93,7 +93,7 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException) return xWorkbook; } // FIXME check if this is correct/desired behavior - throw uno::RuntimeException( rtl::OUString( + throw uno::RuntimeException( OUString( "No activeWorkbook available" ), Reference< uno::XInterface >() ); } @@ -198,7 +198,7 @@ ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, c } uno::Any SAL_CALL -ScVbaGlobals::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaGlobals::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { return getApplication()->Evaluate( Name ); } @@ -230,7 +230,7 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException) { uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< uno::XInterface > xVBADebug = xServiceManager->createInstanceWithContext( - ::rtl::OUString( "ooo.vba.Debug" ), mxContext ); + OUString( "ooo.vba.Debug" ), mxContext ); return uno::Any( xVBADebug ); } catch( uno::Exception& ) @@ -245,21 +245,21 @@ ScVbaGlobals::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException) return uno::Any( getApplication()->MenuBars(aIndex) ); } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) { static bool bInit = false; - static uno::Sequence< rtl::OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() ); + static uno::Sequence< OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() ); if ( !bInit ) { - rtl::OUString names[] = { - ::rtl::OUString( "ooo.vba.excel.Range" ), - ::rtl::OUString( "ooo.vba.excel.Workbook" ), - ::rtl::OUString( "ooo.vba.excel.Window" ), - ::rtl::OUString( "ooo.vba.excel.Worksheet" ), - ::rtl::OUString( "ooo.vba.excel.Application" ), - ::rtl::OUString( "ooo.vba.excel.Hyperlink" ), - ::rtl::OUString( "com.sun.star.script.vba.VBASpreadsheetEventProcessor" ) + OUString names[] = { + OUString( "ooo.vba.excel.Range" ), + OUString( "ooo.vba.excel.Workbook" ), + OUString( "ooo.vba.excel.Window" ), + OUString( "ooo.vba.excel.Worksheet" ), + OUString( "ooo.vba.excel.Application" ), + OUString( "ooo.vba.excel.Hyperlink" ), + OUString( "com.sun.star.script.vba.VBASpreadsheetEventProcessor" ) }; sal_Int32 nExcelServices = ( sizeof( names )/ sizeof( names[0] ) ); sal_Int32 startIndex = serviceNames.getLength(); @@ -271,20 +271,20 @@ ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) return serviceNames; } -rtl::OUString +OUString ScVbaGlobals::getServiceImplName() { - return rtl::OUString("ScVbaGlobals"); + return OUString("ScVbaGlobals"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaGlobals::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.Globals" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Globals" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 1868dc6f5d81..9980d2aed938 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -62,7 +62,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -80,10 +80,10 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc // XMultiServiceFactory - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif // diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index 0c1ce0e618da..cd261d3a0704 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -29,8 +29,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index 85e29678d234..f69e3147f5b1 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.hxx @@ -45,16 +45,16 @@ public: virtual ~ScVbaHyperlink(); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAddress() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAddress( const ::rtl::OUString& rAddress ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException); - virtual void SAL_CALL setSubAddress( const ::rtl::OUString& rSubAddress ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException); - virtual void SAL_CALL setScreenTip( const ::rtl::OUString& rScreenTip ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTextToDisplay( const ::rtl::OUString& rTextToDisplay ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getAddress() throw (css::uno::RuntimeException); + virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException); + virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException); + virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException); + virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException); @@ -63,7 +63,7 @@ public: VBAHELPER_DECL_XHELPERINTERFACE private: - typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > UrlComponents; + typedef ::std::pair< OUString, OUString > UrlComponents; void ensureTextField() throw (css::uno::RuntimeException); UrlComponents getUrlComponents() throw (css::uno::RuntimeException); @@ -72,7 +72,7 @@ private: private: css::uno::Reference< css::table::XCell > mxCell; css::uno::Reference< css::beans::XPropertySet > mxTextField; - ::rtl::OUString maScreenTip; + OUString maScreenTip; long mnType; }; diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 8711ba0a1168..8004e3c9eb6a 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -27,7 +27,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -using ::rtl::OUString; // ============================================================================ @@ -38,7 +37,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan { const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner ); if( rScInner.empty() || rScOuter.empty() ) - throw uno::RuntimeException( ::rtl::OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); for( size_t nIndex = 0, nCount = rScInner.size(); nIndex < nCount; ++nIndex ) if( !rScOuter.In( *rScInner[ nIndex ] ) ) diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 69b80b13d840..3782a100b7ee 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -48,9 +48,9 @@ typedef std::pair< sal_Int32, sal_Int32 > PatternPair; using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlPattern; -static const rtl::OUString BACKCOLOR( "CellBackColor" ); -static const rtl::OUString PATTERN( "Pattern" ); -static const rtl::OUString PATTERNCOLOR( "PatternColor" ); +static const OUString BACKCOLOR( "CellBackColor" ); +static const OUString PATTERN( "Pattern" ); +static const OUString PATTERNCOLOR( "PatternColor" ); static PatternMap lcl_getPatternMap() { @@ -86,7 +86,7 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, m_aPattColor.SetColor( (sal_uInt32)0x0 ); m_nPattern = 0L; if ( !m_xProps.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); + throw lang::IllegalArgumentException( OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); } uno::Any @@ -250,7 +250,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n uno::Reference< container::XNameContainer > ScVbaInterior::GetAttributeContainer() { - return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); + return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); } sal_Int32 ScVbaInterior::GetAttributeData( uno::Any aValue ) @@ -266,12 +266,12 @@ uno::Any ScVbaInterior::SetAttributeData( sal_Int32 nValue ) { xml::AttributeData aAttributeData; - aAttributeData.Type = rtl::OUString( "sal_Int32" ); - aAttributeData.Value = rtl::OUString::valueOf( nValue ); + aAttributeData.Type = OUString( "sal_Int32" ); + aAttributeData.Value = OUString::valueOf( nValue ); return uno::makeAny( aAttributeData ); } uno::Any -ScVbaInterior::GetUserDefinedAttributes( const rtl::OUString& sName ) +ScVbaInterior::GetUserDefinedAttributes( const OUString& sName ) { uno::Reference< container::XNameContainer > xNameContainer( GetAttributeContainer(), uno::UNO_QUERY_THROW ); if( xNameContainer->hasByName( sName ) ) @@ -281,7 +281,7 @@ ScVbaInterior::GetUserDefinedAttributes( const rtl::OUString& sName ) return uno::Any(); } void -ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno::Any& aValue ) +ScVbaInterior::SetUserDefinedAttributes( const OUString& sName, const uno::Any& aValue ) { if( aValue.hasValue() ) { @@ -289,7 +289,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno:: if( xNameContainer->hasByName( sName ) ) xNameContainer->removeByName( sName ); xNameContainer->insertByName( sName, aValue ); - m_xProps->setPropertyValue( rtl::OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); + m_xProps->setPropertyValue( OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); } } // OOo do not support below API @@ -311,7 +311,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); } Color ScVbaInterior::GetBackColor() @@ -359,7 +359,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException) @@ -382,23 +382,23 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) ); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } -rtl::OUString +OUString ScVbaInterior::getServiceImplName() { - return rtl::OUString("ScVbaInterior"); + return OUString("ScVbaInterior"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaInterior::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Interior" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Interior" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index f5cc5b9fb439..93cbd4fc20d2 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -52,8 +52,8 @@ protected: sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) const; css::uno::Any GetIndexColor( const sal_Int32& nColorIndex ); sal_Int32 GetColorIndex( const sal_Int32 nColor ); - css::uno::Any GetUserDefinedAttributes( const rtl::OUString& sName ); - void SetUserDefinedAttributes( const rtl::OUString& sName, const css::uno::Any& aValue ); + css::uno::Any GetUserDefinedAttributes( const OUString& sName ); + void SetUserDefinedAttributes( const OUString& sName, const css::uno::Any& aValue ); void SetMixedColor(); public: ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, @@ -73,8 +73,8 @@ public: virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException); virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index dedb0398d6bb..45dd42c69336 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -36,14 +36,14 @@ ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface > xParent, cons { } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenu::getCaption() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenu::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) +ScVbaMenu::setCaption( const OUString& _caption ) throw (uno::RuntimeException) { m_xCommandBarControl->setCaption( _caption ); } @@ -66,20 +66,20 @@ ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorExceptio return uno::makeAny( xMenuItems ); } -rtl::OUString +OUString ScVbaMenu::getServiceImplName() { - return rtl::OUString("ScVbaMenu"); + return OUString("ScVbaMenu"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenu::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menu" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Menu" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx index 392053929a29..a6946318457b 100644 --- a/sc/source/ui/vba/vbamenu.hxx +++ b/sc/source/ui/vba/vbamenu.hxx @@ -42,15 +42,15 @@ private: public: ScVbaMenu( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENU_HXX diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index 91997c0b1b20..c46c753cbb0e 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -48,20 +48,20 @@ ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException return uno::makeAny( xMenus ); } -rtl::OUString +OUString ScVbaMenuBar::getServiceImplName() { - return rtl::OUString("ScVbaMenuBar"); + return OUString("ScVbaMenuBar"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenuBar::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBar" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuBar" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx index f48956ca1941..c3a81063f6e7 100644 --- a/sc/source/ui/vba/vbamenubar.hxx +++ b/sc/source/ui/vba/vbamenubar.hxx @@ -45,8 +45,8 @@ public: virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUBAR_HXX diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index eb7aead78349..3574b24e112f 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -106,30 +106,30 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw if( nIndex == excel::XlSheetType::xlWorksheet ) { uno::Any aSource; - aSource <<= rtl::OUString( "Worksheet Menu Bar" ); + aSource <<= OUString( "Worksheet Menu Bar" ); uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) ); return uno::makeAny( xMenuBar ); } - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } // XHelperInterface -rtl::OUString +OUString ScVbaMenuBars::getServiceImplName() { - return rtl::OUString("ScVbaMenuBars"); + return OUString("ScVbaMenuBars"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenuBars::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBars" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuBars" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index cc52aa699b44..d6ed15c120d7 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -55,8 +55,8 @@ public: virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUBARS_HXX diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 881ef72fa9cc..12acfbb8a6df 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -34,26 +34,26 @@ ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface > xPare { } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenuItem::getCaption() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenuItem::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) +ScVbaMenuItem::setCaption( const OUString& _caption ) throw (uno::RuntimeException) { m_xCommandBarControl->setCaption( _caption ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenuItem::getOnAction() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getOnAction(); } void SAL_CALL -ScVbaMenuItem::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException) +ScVbaMenuItem::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException) { m_xCommandBarControl->setOnAction( _onaction ); } @@ -64,20 +64,20 @@ ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeExcepti m_xCommandBarControl->Delete(); } -rtl::OUString +OUString ScVbaMenuItem::getServiceImplName() { - return rtl::OUString("ScVbaMenuItem"); + return OUString("ScVbaMenuItem"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenuItem::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItem" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuItem" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx index 4ab24307118f..c74b1f21b714 100644 --- a/sc/source/ui/vba/vbamenuitem.hxx +++ b/sc/source/ui/vba/vbamenuitem.hxx @@ -42,16 +42,16 @@ private: public: ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); - virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); + virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUITEM_HXX diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 90e70b127c18..300e5e012db8 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -117,14 +117,14 @@ ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) thro throw uno::RuntimeException(); } -uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException) +uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { sal_Int32 nType = office::MsoControlType::msoControlButton; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); xCommandBarControl->setCaption( Caption ); if( OnAction.hasValue() ) { - rtl::OUString sAction; + OUString sAction; OnAction >>= sAction; xCommandBarControl->setOnAction( sAction ); } @@ -132,20 +132,20 @@ uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUSt } // XHelperInterface -rtl::OUString +OUString ScVbaMenuItems::getServiceImplName() { - return rtl::OUString("ScVbaMenuItems"); + return OUString("ScVbaMenuItems"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenuItems::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItems" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuItems" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx index 49410804b388..0c6604818fd3 100644 --- a/sc/source/ui/vba/vbamenuitems.hxx +++ b/sc/source/ui/vba/vbamenuitems.hxx @@ -52,10 +52,10 @@ public: // Methods virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUITEMS_HXX diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index f1ab8e120485..27d06e99f5a5 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -109,7 +109,7 @@ ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( u return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) ); } -uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException) +uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { sal_Int32 nType = office::MsoControlType::msoControlPopup; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); @@ -118,20 +118,20 @@ uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Ca } // XHelperInterface -rtl::OUString +OUString ScVbaMenus::getServiceImplName() { - return rtl::OUString("ScVbaMenus"); + return OUString("ScVbaMenus"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenus::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menus" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Menus" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx index 49180037b375..1d8b3c6685c3 100644 --- a/sc/source/ui/vba/vbamenus.hxx +++ b/sc/source/ui/vba/vbamenus.hxx @@ -52,10 +52,10 @@ public: // Methods virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUS_HXX diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index 801d14f42e9e..971c91fb7d7d 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -44,22 +44,22 @@ public: virtual ~ScVbaName(); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); - virtual void SAL_CALL setNameLocal( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); + virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString &rValue ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersTo( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToLocal( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToR1C1( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToR1C1Local( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException); + virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException); virtual void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); @@ -67,8 +67,8 @@ public: virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_NAME_HXX */ diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index a274a0fa1e06..8ee94165a6cb 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -66,8 +66,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ScVbaNames_BASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_NAMES_HXX */ diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index 456629f6b8c1..0210fe1b0c70 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -43,7 +43,7 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference<frame::XModel> xModel( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) ); } @@ -68,14 +68,14 @@ ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) sal_Bool SAL_CALL ScVbaOLEObject::getVisible() throw (uno::RuntimeException) { - OSL_TRACE("OleObject %s returning visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" ); + OSL_TRACE("OleObject %s returning visible %s", OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" ); return m_xControl->getVisible(); } void SAL_CALL ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) { - OSL_TRACE("OleObject %s set visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" ); + OSL_TRACE("OleObject %s set visible %s", OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" ); m_xControl->setVisible( _visible ); } @@ -128,30 +128,30 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException) m_xControl->setWidth( _width ); } -rtl::OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException) +OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException) { return m_xControl->getControlSource(); } -void SAL_CALL ScVbaOLEObject::setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (uno::RuntimeException) +void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException) { m_xControl->setControlSource( _linkedcell ); } -rtl::OUString +OUString ScVbaOLEObject::getServiceImplName() { - return rtl::OUString("ScVbaOLEObject"); + return OUString("ScVbaOLEObject"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOLEObject::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObject" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.OLEObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index 40596383caf2..0f99da573587 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -32,8 +32,8 @@ class ScVbaOLEObject : public OLEObjectImpl_BASE { protected: css::uno::Reference< css::drawing::XControlShape > m_xControlShape; - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); css::uno::Reference< ov::msforms::XControl> m_xControl; public: ScVbaOLEObject( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, @@ -54,8 +54,8 @@ public: virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException); virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException); virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException); }; #endif //SC_VBA_OLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 7b1c44fd94ad..968db0b1cc61 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -126,7 +126,7 @@ ScVbaOLEObjects::createCollectionObject( const css::uno::Any& aSource ) } uno::Any -ScVbaOLEObjects::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException) +ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException) { try { @@ -158,20 +158,20 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) return ooo::vba::excel::XOLEObject::static_type(0); } -rtl::OUString +OUString ScVbaOLEObjects::getServiceImplName() { - return rtl::OUString("ScVbaOLEObjects"); + return OUString("ScVbaOLEObjects"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOLEObjects::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObjects" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.OLEObjects" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index 2583aa01202e..074c572c4155 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -30,9 +30,9 @@ typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE; class ScVbaOLEObjects : public OLEObjectsImpl_BASE { protected: - virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); public: ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index 29cbd0e09434..67ea4a6b9a94 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -37,20 +37,20 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel } } -rtl::OUString +OUString ScVbaOutline::getServiceImplName() { - return rtl::OUString("ScVbaOutline"); + return OUString("ScVbaOutline"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOutline::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Outline" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Outline" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index 48c9a609fbd7..a81aeb937297 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -38,8 +38,8 @@ public: virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 611c568243e6..780ed0e5467a 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -36,7 +36,7 @@ ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& template< typename Ifc1 > sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException) { - uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( "IsStartOfNewPage" )); + uno::Any aValue = mxRowColPropertySet->getPropertyValue( OUString( "IsStartOfNewPage" )); sal_Bool hasPageBreak = false; aValue >>= hasPageBreak; @@ -56,16 +56,16 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) (type != excel::XlPageBreak::xlPageBreakManual) && (type != excel::XlPageBreak::xlPageBreakAutomatic) ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } if( type == excel::XlPageBreak::xlPageBreakNone ) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); return; } - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); if( type == excel::XlPageBreak::xlPageBreakManual ) maTablePageBreakData.ManualBreak = sal_True; else @@ -75,7 +75,7 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) template< typename Ifc1 > void ScVbaPageBreak<Ifc1>::Delete() throw ( script::BasicErrorException, uno::RuntimeException) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); } template< typename Ifc1 > @@ -86,21 +86,21 @@ uno::Reference< excel::XRange> ScVbaPageBreak<Ifc1>::Location() throw ( script:: } template< typename Ifc1 > -rtl::OUString +OUString ScVbaPageBreak<Ifc1>::getServiceImplName() { - return rtl::OUString("ScVbaPageBreak"); + return OUString("ScVbaPageBreak"); } template< typename Ifc1 > -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPageBreak<Ifc1>::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PageBreak" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PageBreak" ); } return aServiceNames; } @@ -108,20 +108,20 @@ ScVbaPageBreak<Ifc1>::getServiceNames() template class ScVbaPageBreak< excel::XHPageBreak >; /* class ScVbaHPageBreak */ -rtl::OUString +OUString ScVbaHPageBreak::getServiceImplName() { - return rtl::OUString("ScVbaHPageBreak"); + return OUString("ScVbaHPageBreak"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaHPageBreak::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreak" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.HPageBreak" ); } return aServiceNames; } @@ -141,20 +141,20 @@ ScVbaVPageBreak::~ScVbaVPageBreak() { } -rtl::OUString +OUString ScVbaVPageBreak::getServiceImplName() { - return rtl::OUString("ScVbaVPageBreak"); + return OUString("ScVbaVPageBreak"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaVPageBreak::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreak" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.VPageBreak" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index 4256c61cf317..aa33b2191469 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -51,8 +51,8 @@ public: virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; @@ -70,8 +70,8 @@ public: virtual ~ScVbaHPageBreak(){} // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; //VPageBreak @@ -88,8 +88,8 @@ public: virtual ~ScVbaVPageBreak(); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 8c6806e1992a..d7ac4a05c336 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -152,7 +152,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI if( nPos >= nUsedStart ) index++; if( nPos > nUsedEnd ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); if( index == nAPIItemIndex ) return aTablePageBreakData; } @@ -166,13 +166,13 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script Before >>= xRange; if( !xRange.is() ) { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } sal_Int32 nAPIRowColIndex = getAPIStartofRange( xRange ); uno::Reference< container::XIndexAccess > xIndexAccess = getRowColContainer(); uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nAPIRowColIndex), uno::UNO_QUERY_THROW ); - xRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); + xRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); sheet::TablePageBreakData aTablePageBreakData; aTablePageBreakData.ManualBreak = sal_True; aTablePageBreakData.Position = nAPIRowColIndex; @@ -237,20 +237,20 @@ ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException) return excel::XHPageBreak::static_type(0); } -rtl::OUString +OUString ScVbaHPageBreaks::getServiceImplName() { - return rtl::OUString("ScVbaHPageBreaks"); + return OUString("ScVbaHPageBreaks"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaHPageBreaks::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreaks" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.HPageBreaks" ); } return aServiceNames; } @@ -297,20 +297,20 @@ ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException ) return excel::XVPageBreak::static_type( 0 ); } -rtl::OUString +OUString ScVbaVPageBreaks::getServiceImplName() { - return rtl::OUString("ScVbaVPageBreaks"); + return OUString("ScVbaVPageBreaks"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaVPageBreaks::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreaks" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.VPageBreaks" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 3e28da557fa3..9fec6397056c 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -55,8 +55,8 @@ public: virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; //VPageBreaks @@ -82,8 +82,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 4df0b92eb4bc..91a23d0fbc2c 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -38,7 +38,7 @@ using namespace ::ooo::vba; #define ZOOM_IN 10 #define ZOOM_MAX 400 -bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ); +bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ); ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, @@ -49,19 +49,19 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent // query for current page style mxModel.set( xModel, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xSheetProps( mxSheet, uno::UNO_QUERY_THROW ); - uno::Any aValue = xSheetProps->getPropertyValue( rtl::OUString( "PageStyle" )); - rtl::OUString aStyleName; + uno::Any aValue = xSheetProps->getPropertyValue( OUString( "PageStyle" )); + OUString aStyleName; aValue >>= aStyleName; uno::Reference< style::XStyleFamiliesSupplier > xStyleFamiliesSup( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xStyleFamilies = xStyleFamiliesSup->getStyleFamilies(); - uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(rtl::OUString( "PageStyles")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(OUString( "PageStyles")), uno::UNO_QUERY_THROW ); mxPageProps.set( xPageStyle->getByName(aStyleName), uno::UNO_QUERY_THROW ); mnOrientLandscape = excel::XlPageOrientation::xlLandscape; mnOrientPortrait = excel::XlPageOrientation::xlPortrait; } -rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException) { String aPrintArea; uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); @@ -86,11 +86,11 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeEx return aPrintArea; } -void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException) { uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); if( rAreas.isEmpty() || - rAreas.equalsIgnoreAsciiCase ( rtl::OUString("FALSE") ) ) + rAreas.equalsIgnoreAsciiCase ( OUString("FALSE") ) ) { // print the whole sheet uno::Sequence< table::CellRangeAddress > aSeq; @@ -137,7 +137,7 @@ void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno:: uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "ScaleToPagesY")); + return mxPageProps->getPropertyValue( OUString( "ScaleToPagesY")); } void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) throw (css::uno::RuntimeException) @@ -151,7 +151,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) fitToPagesTall >>= scaleToPageY; } - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesY"), uno::makeAny( scaleToPageY )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesY"), uno::makeAny( scaleToPageY )); } catch( uno::Exception& ) { @@ -160,7 +160,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "ScaleToPagesX")); + return mxPageProps->getPropertyValue( OUString( "ScaleToPagesX")); } void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) throw (css::uno::RuntimeException) @@ -174,7 +174,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) fitToPagesWide >>= scaleToPageX; } - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesX"), uno::makeAny( scaleToPageX )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesX"), uno::makeAny( scaleToPageX )); } catch( uno::Exception& ) { @@ -183,7 +183,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) uno::Any SAL_CALL ScVbaPageSetup::getZoom() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "PageScale")); + return mxPageProps->getPropertyValue( OUString( "PageScale")); } void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::RuntimeException) @@ -197,7 +197,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru zoom >>= aValue; if( aValue ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } else @@ -205,36 +205,36 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru zoom >>= pageScale; if(( pageScale < ZOOM_IN )||( pageScale > ZOOM_MAX )) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } // these only exist in S08 sal_uInt16 nScale = 0; - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPages"), uno::makeAny( nScale )); - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesX"), uno::makeAny( nScale )); - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesY"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPages"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesX"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesY"), uno::makeAny( nScale )); } catch( beans::UnknownPropertyException& ) { if( pageScale == 0 ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } catch( uno::Exception& ) { } - mxPageProps->setPropertyValue( rtl::OUString( "PageScale"), uno::makeAny( pageScale )); + mxPageProps->setPropertyValue( OUString( "PageScale"), uno::makeAny( pageScale )); } -rtl::OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException) { - rtl::OUString leftHeader; + OUString leftHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getLeftText(); @@ -248,16 +248,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeE return leftHeader; } -void SAL_CALL ScVbaPageSetup::setLeftHeader( const rtl::OUString& leftHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getLeftText(); xText->setString( leftHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -265,12 +265,12 @@ void SAL_CALL ScVbaPageSetup::setLeftHeader( const rtl::OUString& leftHeader) th } } -rtl::OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException) { - rtl::OUString centerHeader; + OUString centerHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getCenterText(); @@ -284,16 +284,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::Runtim return centerHeader; } -void SAL_CALL ScVbaPageSetup::setCenterHeader( const rtl::OUString& centerHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getCenterText(); xText->setString( centerHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -301,12 +301,12 @@ void SAL_CALL ScVbaPageSetup::setCenterHeader( const rtl::OUString& centerHeader } } -rtl::OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException) { - rtl::OUString rightHeader; + OUString rightHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getRightText(); @@ -320,16 +320,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::Runtime return rightHeader; } -void SAL_CALL ScVbaPageSetup::setRightHeader( const rtl::OUString& rightHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getRightText(); xText->setString( rightHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -337,12 +337,12 @@ void SAL_CALL ScVbaPageSetup::setRightHeader( const rtl::OUString& rightHeader) } } -rtl::OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException) { - rtl::OUString leftFooter; + OUString leftFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getLeftText(); @@ -356,16 +356,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeE return leftFooter; } -void SAL_CALL ScVbaPageSetup::setLeftFooter( const rtl::OUString& leftFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getLeftText(); xText->setString( leftFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -373,12 +373,12 @@ void SAL_CALL ScVbaPageSetup::setLeftFooter( const rtl::OUString& leftFooter) th } } -rtl::OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException) { - rtl::OUString centerFooter; + OUString centerFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getCenterText(); @@ -392,16 +392,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::Runtim return centerFooter; } -void SAL_CALL ScVbaPageSetup::setCenterFooter( const rtl::OUString& centerFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getCenterText(); xText->setString( centerFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -410,12 +410,12 @@ void SAL_CALL ScVbaPageSetup::setCenterFooter( const rtl::OUString& centerFooter } -rtl::OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException) { - rtl::OUString rightFooter; + OUString rightFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getRightText(); @@ -429,16 +429,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::Runtime return rightFooter; } -void SAL_CALL ScVbaPageSetup::setRightFooter( const rtl::OUString& rightFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getRightText(); xText->setString( rightFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -451,7 +451,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException) sal_Int32 order = excel::XlOrder::xlDownThenOver; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "PrintDownFirst")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "PrintDownFirst")); sal_Bool bPrintDownFirst = false; aValue >>= bPrintDownFirst; if( !bPrintDownFirst ) @@ -475,12 +475,12 @@ void SAL_CALL ScVbaPageSetup::setOrder( sal_Int32 order) throw (css::uno::Runtim bOrder = false; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } try { - mxPageProps->setPropertyValue( rtl::OUString( "PrintDownFirst"), uno::makeAny( bOrder )); + mxPageProps->setPropertyValue( OUString( "PrintDownFirst"), uno::makeAny( bOrder )); } catch( uno::Exception& ) { @@ -492,7 +492,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime sal_Int16 number = 0; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "FirstPageNumber")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "FirstPageNumber")); aValue >>= number; } catch( uno::Exception& ) @@ -510,7 +510,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException) { if( firstPageNumber < 0 ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); if( firstPageNumber == excel::Constants::xlAutomatic ) firstPageNumber = 0; @@ -518,7 +518,7 @@ void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) thr { uno::Any aValue; aValue <<= (sal_Int16)firstPageNumber; - mxPageProps->setPropertyValue( rtl::OUString( "FirstPageNumber"), aValue ); + mxPageProps->setPropertyValue( OUString( "FirstPageNumber"), aValue ); } catch( uno::Exception& ) { @@ -530,7 +530,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::Runtime sal_Bool centerVertically = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "CenterVertically")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "CenterVertically")); aValue >>= centerVertically; } catch( uno::Exception& ) @@ -543,7 +543,7 @@ void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) th { try { - mxPageProps->setPropertyValue( rtl::OUString( "CenterVertically"), uno::makeAny( centerVertically )); + mxPageProps->setPropertyValue( OUString( "CenterVertically"), uno::makeAny( centerVertically )); } catch( uno::Exception& ) { @@ -555,7 +555,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::Runti sal_Bool centerHorizontally = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "CenterHorizontally")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "CenterHorizontally")); aValue >>= centerHorizontally; } catch( uno::Exception& ) @@ -568,7 +568,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally { try { - mxPageProps->setPropertyValue( rtl::OUString( "CenterHorizontally"), uno::makeAny( centerHorizontally )); + mxPageProps->setPropertyValue( OUString( "CenterHorizontally"), uno::makeAny( centerHorizontally )); } catch( uno::Exception& ) { @@ -580,7 +580,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeExc sal_Bool printHeadings = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "PrintHeaders")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "PrintHeaders")); aValue >>= printHeadings; } catch( uno::Exception& ) @@ -593,27 +593,27 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c { try { - mxPageProps->setPropertyValue( rtl::OUString( "PrintHeaders"), uno::makeAny( printHeadings )); + mxPageProps->setPropertyValue( OUString( "PrintHeaders"), uno::makeAny( printHeadings )); } catch( uno::Exception& ) { } } -rtl::OUString +OUString ScVbaPageSetup::getServiceImplName() { - return rtl::OUString("ScVbaPageSetup"); + return OUString("ScVbaPageSetup"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPageSetup::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.PageSetup" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.PageSetup" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index 38ca4613a6a0..ffa33b5addd1 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -40,8 +40,8 @@ public: virtual ~ScVbaPageSetup(){} // Attribute - virtual rtl::OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException); + virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException); virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException); void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException); double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException); @@ -52,18 +52,18 @@ public: virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException); virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLeftHeader( const rtl::OUString& leftHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCenterHeader( const rtl::OUString& centerHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRightHeader( const rtl::OUString& rightHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLeftFooter( const rtl::OUString& leftFooter ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCenterFooter( const rtl::OUString& centerFooter ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRightFooter( const rtl::OUString& rightFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException); virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException); @@ -76,8 +76,8 @@ public: virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index fc43d9e9300c..b9fa93374473 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -97,8 +97,8 @@ ScVbaPalette::getPalette() const if ( m_pShell ) xProps.set( m_pShell->GetModel(), uno::UNO_QUERY_THROW ); else - throw uno::RuntimeException( rtl::OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); - xIndex.set( xProps->getPropertyValue( rtl::OUString("ColorPalette") ), uno::UNO_QUERY ); + throw uno::RuntimeException( OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); + xIndex.set( xProps->getPropertyValue( OUString("ColorPalette") ), uno::UNO_QUERY ); if ( !xIndex.is() ) return new DefaultPalette(); return xIndex; diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index 3a8bcd856d5a..01734f6649ec 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.cxx @@ -48,7 +48,7 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti { if( _scrollcolumn < 1 ) { - throw uno::RuntimeException( rtl::OUString( "Column number should not less than 1" ), + throw uno::RuntimeException( OUString( "Column number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 ); @@ -65,7 +65,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException) { if( _scrollrow < 1 ) { - throw uno::RuntimeException( rtl::OUString( "Row number should not less than 1" ), + throw uno::RuntimeException( OUString( "Row number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleRow( _scrollrow - 1 ); @@ -88,7 +88,7 @@ ScVbaPane::getVisibleRange() throw (uno::RuntimeException) void SAL_CALL ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { - rtl::OUString messageBuffer; + OUString messageBuffer; sal_Int32 downRows = 0; sal_Int32 rightCols = 0; table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange(); @@ -99,7 +99,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downRows += down; else - messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); + messageBuffer += OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -107,7 +107,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downRows -= up; else - messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); + messageBuffer += OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -115,7 +115,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) rightCols += right; else - messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); + messageBuffer += OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -123,7 +123,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) rightCols -= left; else - messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); + messageBuffer += OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); @@ -141,7 +141,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any void SAL_CALL ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { - rtl::OUString messageBuffer; + OUString messageBuffer; table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange(); sal_Int32 vertPageSize = 1 + visibleRange.EndRow - visibleRange.StartRow; @@ -154,7 +154,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downPages += down; else - messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); + messageBuffer += OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -162,7 +162,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downPages -= up; else - messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); + messageBuffer += OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -170,7 +170,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) acrossPages += right; else - messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); + messageBuffer += OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -178,7 +178,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) acrossPages -= left; else - messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); + messageBuffer += OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index a37473e10349..d03f2ebdef02 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -32,20 +32,20 @@ ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException) m_xTable->refresh(); } -rtl::OUString +OUString ScVbaPivotCache::getServiceImplName() { - return rtl::OUString("ScVbaPivotCache"); + return OUString("ScVbaPivotCache"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPivotCache::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotCache" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PivotCache" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index 6c0653891fd8..66b29c36cb3e 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -35,8 +35,8 @@ public: virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_PIVOTCACHE_HXX diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 97ce5e200ad5..14343b34b795 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -35,20 +35,20 @@ ScVbaPivotTable::PivotCache() throw (uno::RuntimeException) return new ScVbaPivotCache( uno::Reference< XHelperInterface >(), mxContext, m_xTable ); } -rtl::OUString +OUString ScVbaPivotTable::getServiceImplName() { - return rtl::OUString("ScVbaPivotTable"); + return OUString("ScVbaPivotTable"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPivotTable::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotTable" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PivotTable" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index 26bbcdc8b18c..d58ba7a7eb07 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -34,8 +34,8 @@ public: ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_PIVOTTABLE_HXX diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index ffa5e173c385..e013c1a8ad3b 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -66,20 +66,20 @@ ScVbaPivotTables::getElementType() throw (uno::RuntimeException) return excel::XPivotTable::static_type(0); } -rtl::OUString +OUString ScVbaPivotTables::getServiceImplName() { - return rtl::OUString("ScVbaPivotTables"); + return OUString("ScVbaPivotTables"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaPivotTables::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.PivotTables"); + sNames[0] = OUString("ooo.vba.excel.PivotTables"); } return sNames; } diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 43de737d508d..1baa3ef01a76 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -34,7 +34,7 @@ typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE; class ScVbaPivotTables : public ScVbaPivotTables_BASE { - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<OUString> getServiceNames(); public: ScVbaPivotTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); @@ -50,7 +50,7 @@ public: // ScVbaPivotTables_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); + virtual OUString getServiceImplName(); }; diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx index c4c8136a436e..0cdd5fb836a9 100644 --- a/sc/source/ui/vba/vbapropvalue.hxx +++ b/sc/source/ui/vba/vbapropvalue.hxx @@ -43,7 +43,7 @@ public: virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return OUString("Value"); } }; #endif //SC_VBA_PROPVALULE_HXX diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index f3383326329a..85305e52904f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -248,7 +248,7 @@ ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException return ScCellRangesBase::getImplementation( mxRanges ); if( mxRange.is() ) return ScCellRangesBase::getImplementation( mxRange ); - throw uno::RuntimeException( rtl::OUString("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() ); } ScCellRangeObj* ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException ) @@ -260,7 +260,7 @@ SfxItemSet* ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for range" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't access Itemset for range" ), uno::Reference< uno::XInterface >() ); return pDataSet; } @@ -364,9 +364,9 @@ public: virtual uno::Any createCollectionObject( const uno::Any& aSource ); - virtual rtl::OUString getServiceImplName() { return rtl::OUString(); } + virtual OUString getServiceImplName() { return OUString(); } - virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); } + virtual uno::Sequence< OUString > getServiceNames() { return uno::Sequence< OUString >(); } }; @@ -389,7 +389,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R { ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); if ( !pUno ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); return pUno->GetDocShell(); } @@ -427,7 +427,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange ) { ScDocShell* pDocShell = getDocShellFromRange( xRange ); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); ScDocument* pDoc = pDocShell->GetDocument(); return pDoc; } @@ -480,14 +480,14 @@ const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException) { if( ScCellRangesBase* pScRangesBase = getCellRangesBase() ) return pScRangesBase->GetRangeList(); - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain UNO range implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain UNO range implementation object" ), uno::Reference< uno::XInterface >() ); } const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getScRangeList(); - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain VBA range implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain VBA range implementation object" ), uno::Reference< uno::XInterface >() ); } @@ -532,7 +532,7 @@ public: return false; } - rtl::OUString getNumberFormatString() + OUString getNumberFormatString() { uno::Reference< uno::XInterface > xIf( mxRangeProps, uno::UNO_QUERY_THROW ); ScCellRangesBase* pUnoCellRange = ScCellRangesBase::getImplementation( xIf ); @@ -544,12 +544,12 @@ public: // one of the cells in the range is not like the other ;-) // so return a zero length format to indicate that if ( eState == SFX_ITEM_DONTCARE ) - return rtl::OUString(); + return OUString(); } uno::Reference< beans::XPropertySet > xNumberProps( getNumberProps(), uno::UNO_QUERY_THROW ); - ::rtl::OUString aFormatString; + OUString aFormatString; uno::Any aString = xNumberProps->getPropertyValue( "FormatString" ); aString >>= aFormatString; return aFormatString; @@ -563,7 +563,7 @@ public: return nType; } - bool setNumberFormat( const rtl::OUString& rFormat ) + bool setNumberFormat( const OUString& rFormat ) { // #163288# treat "General" as "Standard" format sal_Int32 nNewIndex = 0; @@ -692,19 +692,19 @@ public: }; -const static ::rtl::OUString ISVISIBLE( "IsVisible"); -const static ::rtl::OUString POSITION( "Position"); -const static rtl::OUString EQUALS( "=" ); -const static rtl::OUString NOTEQUALS( "<>" ); -const static rtl::OUString GREATERTHAN( ">" ); -const static rtl::OUString GREATERTHANEQUALS( ">=" ); -const static rtl::OUString LESSTHAN( "<" ); -const static rtl::OUString LESSTHANEQUALS( "<=" ); -const static rtl::OUString CONTS_HEADER( "ContainsHeader" ); -const static rtl::OUString INSERTPAGEBREAKS( "InsertPageBreaks" ); -const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY( "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again" ); -const static rtl::OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND( "No cells were found" ); -const static rtl::OUString CELLSTYLE( "CellStyle" ); +const static OUString ISVISIBLE( "IsVisible"); +const static OUString POSITION( "Position"); +const static OUString EQUALS( "=" ); +const static OUString NOTEQUALS( "<>" ); +const static OUString GREATERTHAN( ">" ); +const static OUString GREATERTHANEQUALS( ">=" ); +const static OUString LESSTHAN( "<" ); +const static OUString LESSTHANEQUALS( "<=" ); +const static OUString CONTS_HEADER( "ContainsHeader" ); +const static OUString INSERTPAGEBREAKS( "InsertPageBreaks" ); +const static OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY( "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again" ); +const static OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND( "No cells were found" ); +const static OUString CELLSTYLE( "CellStyle" ); class CellValueSetter : public ValueSetter { @@ -750,7 +750,7 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab } case uno::TypeClass_STRING: { - rtl::OUString aString; + OUString aString; if ( aValue >>= aString ) { // The required behavior for a string value is: @@ -762,7 +762,7 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab if ( aString.toChar() == '\'' ) // case 1 - handle with XTextRange { - rtl::OUString aRemainder( aString.copy(1) ); // strip the quote + OUString aRemainder( aString.copy(1) ); // strip the quote uno::Reference< text::XTextRange > xTextRange( xCell, uno::UNO_QUERY_THROW ); xTextRange->setString( aRemainder ); } @@ -820,7 +820,7 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< if ( eType == table::CellContentType_FORMULA ) { - rtl::OUString sFormula = xCell->getFormula(); + OUString sFormula = xCell->getFormula(); if ( sFormula == "=TRUE()" ) aValue <<= sal_True; else if ( sFormula == "=FALSE()" ) @@ -872,7 +872,7 @@ public: protected: bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) { - rtl::OUString sFormula; + OUString sFormula; double aDblValue = 0.0; if ( aValue >>= sFormula ) { @@ -923,7 +923,7 @@ public: { uno::Any aValue; aValue <<= xCell->getFormula(); - rtl::OUString sVal; + OUString sVal; aValue >>= sVal; uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW ); ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() ); @@ -978,7 +978,7 @@ public: }; -const static rtl::OUString sNA("#N/A"); +const static OUString sNA("#N/A"); class Dim1ArrayValueSetter : public ArrayVisitor { @@ -1146,7 +1146,7 @@ public: }; bool -ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ) +ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ) { ScDocument* pDoc = NULL; @@ -1163,32 +1163,32 @@ ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& return false; } -bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) +bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) { // see if there is a match with a named range uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xNameAccess( xProps->getPropertyValue( "NamedRanges" ), uno::UNO_QUERY_THROW ); // Strangly enough you can have Range( "namedRange1, namedRange2, etc," ) // loop around each ',' separated name - std::vector< rtl::OUString > vNames; + std::vector< OUString > vNames; sal_Int32 nIndex = 0; do { - rtl::OUString aToken = sName.getToken( 0, ',', nIndex ); + OUString aToken = sName.getToken( 0, ',', nIndex ); vNames.push_back( aToken ); } while ( nIndex >= 0 ); if ( vNames.empty() ) vNames.push_back( sName ); - std::vector< rtl::OUString >::iterator it = vNames.begin(); - std::vector< rtl::OUString >::iterator it_end = vNames.end(); + std::vector< OUString >::iterator it = vNames.begin(); + std::vector< OUString >::iterator it_end = vNames.end(); for ( ; it != it_end; ++it ) { formula::FormulaGrammar::AddressConvention eConv = aConv; // spaces are illegal ( but the user of course can enter them ) - rtl::OUString sAddress = (*it).trim(); + OUString sAddress = (*it).trim(); // if a local name ( on the active sheet ) exists this will // take precedence over a global with the same name bool bLocalName = false; @@ -1241,7 +1241,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S ScVbaRange* -getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) +getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) { ScRangeList aCellRanges; ScRange refRange; @@ -1301,10 +1301,10 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) throw (uno::RuntimeException) { if( !rxCellRanges.is() ) - throw uno::RuntimeException( rtl::OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); sal_Int32 nCount = rxCellRanges->getCount(); if( nCount < 1 ) - throw uno::RuntimeException( rtl::OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); ScRangeList aScRanges; for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex ) @@ -1371,7 +1371,7 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( - const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sRangeName, + const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException ) { table::CellRangeAddress refAddr; @@ -1385,7 +1385,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, { case uno::TypeClass_STRING: { - rtl::OUString rString; + OUString rString; aParam >>= rString; ScRangeList aCellRanges; ScRange refRange; @@ -1408,7 +1408,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, break; } default: - throw uno::RuntimeException( rtl::OUString( "Can't extact CellRangeAddress from type" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't extact CellRangeAddress from type" ), uno::Reference< uno::XInterface >() ); } return lclGetRangeAddress( xRangeParam ); } @@ -1419,7 +1419,7 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); ScDocument* pDoc = getDocumentFromRange(xRange); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); uno::Reference< XCollection > borders( new ScVbaBorders( xParent, xContext, xRange, aPalette ) ); return borders; @@ -1448,9 +1448,9 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const mbIsColumns( bIsColumns ) { if ( !xContext.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "context is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "context is not set " ), uno::Reference< uno::XInterface >() , 1 ); if ( !xRange.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxParent, mxContext, xRange ) ); m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns ); @@ -1562,7 +1562,7 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter, bool bFi catch ( const uno::Exception& e ) { OSL_TRACE("Bahhh, caught exception %s", - rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1851,7 +1851,7 @@ ScVbaRange::FillDown() throw (uno::RuntimeException) sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } -::rtl::OUString +OUString ScVbaRange::getText() throw (uno::RuntimeException) { // #TODO code within the test below "if ( m_Areas.... " can be removed @@ -1983,7 +1983,7 @@ ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeExcepti setFormula( rFormula ); } -::rtl::OUString +OUString ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno::RuntimeException) { // #TODO code within the test below "if ( m_Areas.... " can be removed @@ -1997,7 +1997,7 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno } long nIndex = 0, nCount = 0; - ::rtl::OUString rString; + OUString rString; uno::Reference< text::XTextRange > xTextRange(mxRange, ::uno::UNO_QUERY_THROW ); rString = xTextRange->getString(); if( !( Start >>= nIndex ) && !( Length >>= nCount ) ) @@ -2009,13 +2009,13 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno return rString.copy( --nIndex, nCount ); // Zero value indexing } -::rtl::OUString +OUString ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) { // Multi-Area Range - rtl::OUString sAddress; + OUString sAddress; uno::Reference< XCollection > xCollection( m_Areas, uno::UNO_QUERY_THROW ); uno::Any aExternalCopy = External; for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index ) @@ -2023,7 +2023,7 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW ); if ( index > 1 ) { - sAddress += rtl::OUString( ',' ); + sAddress += OUString( ',' ); // force external to be false // only first address should have the // document and sheet specifications @@ -2096,7 +2096,7 @@ ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException) else if ( mxRanges.is() ) xProps.set(mxRanges, ::uno::UNO_QUERY ); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); ScCellRangeObj* pRangeObj = NULL; @@ -2162,7 +2162,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, if ( bIsColumnIndex ) { // Column index can be a col address e.g Cells( 1, "B" ) etc. - rtl::OUString sCol; + OUString sCol; if ( nColumnIndex >>= sCol ) { ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 ); @@ -2218,7 +2218,7 @@ ScVbaRange::Select() throw (uno::RuntimeException) { ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); if ( !pUnoRangesBase ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); ScDocShell* pShell = pUnoRangesBase->GetDocShell(); if ( pShell ) { @@ -2326,7 +2326,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException) uno::Reference< excel::XRange > ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) { - rtl::OUString sAddress; + OUString sAddress; if ( aIndex.hasValue() ) { @@ -2352,10 +2352,10 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) aRange.aEnd.SetRow( aRange.aStart.Row() + ( nEndRow - nStartRow )); } else - throw uno::RuntimeException( rtl::OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 ) - throw uno::RuntimeException( rtl::OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); // return a normal range ( even for multi-selection uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); return new ScVbaRange( mxParent, mxContext, xRange, true ); @@ -2369,7 +2369,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< excel::XRange > ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException) { - rtl::OUString sAddress; + OUString sAddress; ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); @@ -2396,10 +2396,10 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException) aRange.aEnd.SetCol( aRange.aStart.Col() + ( nEndCol - nStartCol )); } else - throw uno::RuntimeException( rtl::OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 ) - throw uno::RuntimeException( rtl::OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); } // Columns() - no params uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); @@ -2473,7 +2473,7 @@ void ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); if ( Destination.hasValue() ) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -2501,7 +2501,7 @@ void ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); if (Destination.hasValue()) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -2525,7 +2525,7 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException) void ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException) { - rtl::OUString sFormat; + OUString sFormat; aFormat >>= sFormat; if ( m_Areas->getCount() > 1 ) { @@ -2564,7 +2564,7 @@ ScVbaRange::getNumberFormat() throw ( script::BasicErrorException, uno::RuntimeE return aResult; } NumFormatHelper numFormat( mxRange ); - rtl::OUString sFormat = numFormat.getNumberFormatString(); + OUString sFormat = numFormat.getNumberFormatString(); if ( !sFormat.isEmpty() ) return uno::makeAny( sFormat ); return aNULL(); @@ -2680,7 +2680,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI if( !Cell1.hasValue() ) throw uno::RuntimeException( - rtl::OUString( " Invalid Argument " ), + OUString( " Invalid Argument " ), uno::Reference< XInterface >() ); table::CellRangeAddress resultAddress; @@ -2690,7 +2690,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI // Cell1 defined only if ( !Cell2.hasValue() ) { - rtl::OUString sName; + OUString sName; Cell1 >>= sName; RangeHelper referRange( xReferrer ); table::CellRangeAddress referAddress = referRange.getCellRangeAddressable()->getRangeAddress(); @@ -2827,7 +2827,7 @@ void SAL_CALL ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); ScDocShell* pShell = getScDocShell(); uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW ); @@ -2905,11 +2905,11 @@ ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException) throw uno::RuntimeException(); // workaround: Excel allows to create empty comment, Calc does not - ::rtl::OUString aNoteText; + OUString aNoteText; if( Text.hasValue() && !(Text >>= aNoteText) ) throw uno::RuntimeException(); if( aNoteText.isEmpty() ) - aNoteText = ::rtl::OUString( sal_Unicode( ' ' ) ); + aNoteText = OUString( sal_Unicode( ' ' ) ); // try to create a new annotation table::CellRangeAddress aRangePos = lclGetRangeAddress( mxRange ); @@ -2960,7 +2960,7 @@ ScVbaRange::getHidden() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows ); if ( !( xProps->getPropertyValue( ISVISIBLE ) >>= bIsVisible ) ) - throw uno::RuntimeException( rtl::OUString( "Failed to get IsVisible property"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to get IsVisible property"), uno::Reference< uno::XInterface >() ); } catch( const uno::Exception& e ) { @@ -2996,7 +2996,7 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException) } ::sal_Bool SAL_CALL -ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException) +ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) { @@ -3010,8 +3010,8 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace // sanity check required params if ( What.isEmpty() ) - throw uno::RuntimeException( rtl::OUString( "Range::Replace, missing params" ) , uno::Reference< uno::XInterface >() ); - rtl::OUString sWhat = VBAToRegexp( What); + throw uno::RuntimeException( OUString( "Range::Replace, missing params" ) , uno::Reference< uno::XInterface >() ); + OUString sWhat = VBAToRegexp( What); // #TODO #FIXME SearchFormat & ReplacesFormat are not processed // What do we do about MatchByte.. we don't seem to support that const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem(); @@ -3040,7 +3040,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace else if ( nLook == excel::XlLookAt::xlWhole ) bSearchWords = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); // set global search props ( affects the find dialog // and of course the defaults for this method newOptions.SetWordOnly( bSearchWords ); @@ -3056,7 +3056,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace else if ( nSearchOrder == excel::XlSearchOrder::xlByRows ) bSearchByRow = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); newOptions.SetRowDirection( bSearchByRow ); xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( bSearchByRow ) ); @@ -3082,7 +3082,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException) { // return a Range object that represents the first cell where that information is found. - rtl::OUString sWhat; + OUString sWhat; sal_Int32 nWhat = 0; double fWhat = 0.0; @@ -3090,20 +3090,20 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L if( What >>= sWhat ) { if( sWhat.isEmpty() ) - throw uno::RuntimeException( rtl::OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); } else if( What >>= nWhat ) { - sWhat = rtl::OUString::valueOf( nWhat ); + sWhat = OUString::valueOf( nWhat ); } else if( What >>= fWhat ) { - sWhat = rtl::OUString::valueOf( fWhat ); + sWhat = OUString::valueOf( fWhat ); } else - throw uno::RuntimeException( rtl::OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); - rtl::OUString sSearch = VBAToRegexp( sWhat ); + OUString sSearch = VBAToRegexp( sWhat ); const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem(); SvxSearchItem newOptions( globalSearchOptions ); @@ -3124,10 +3124,10 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L { // After must be a single cell in the range if( xAfterRange->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "After must be a single cell." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "After must be a single cell." ) , uno::Reference< uno::XInterface >() ); uno::Reference< excel::XRange > xCell( Cells( uno::makeAny( xAfterRange->getRow() ), uno::makeAny( xAfterRange->getColumn() ) ), uno::UNO_QUERY ); if( !xCell.is() ) - throw uno::RuntimeException( rtl::OUString( "After must be in range." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "After must be in range." ) , uno::Reference< uno::XInterface >() ); xStartCell.set( xAfterRange->getCellRange(), uno::UNO_QUERY_THROW ); } @@ -3150,7 +3150,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L nSearchType = SVX_SEARCHIN_VALUE; break; default: - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookIn." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookIn." ) , uno::Reference< uno::XInterface >() ); } newOptions.SetCellType( nSearchType ); xDescriptor->setPropertyValue( "SearchType", uno::makeAny( nSearchType ) ); @@ -3167,7 +3167,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if ( nLookAt == excel::XlLookAt::xlWhole ) bSearchWords = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); newOptions.SetWordOnly( bSearchWords ); xDescriptor->setPropertyValue( SC_UNO_SRCHWORDS, uno::makeAny( bSearchWords ) ); } @@ -3182,7 +3182,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if ( nSearchOrder == excel::XlSearchOrder::xlByRows ) bSearchByRow = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); newOptions.SetRowDirection( bSearchByRow ); xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( bSearchByRow ) ); @@ -3200,7 +3200,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if( nSearchDirection == excel::XlSearchDirection::xlPrevious ) bSearchBackwards = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchDirection" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchDirection" ) , uno::Reference< uno::XInterface >() ); newOptions.SetBackward( bSearchBackwards ); xDescriptor->setPropertyValue( "SearchBackwards", uno::makeAny( bSearchBackwards ) ); } @@ -3212,7 +3212,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L { // SearchCaseSensitive if( !( MatchCase >>= bMatchCase ) ) - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for MatchCase" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for MatchCase" ) , uno::Reference< uno::XInterface >() ); } xDescriptor->setPropertyValue( SC_UNO_SRCHCASE, uno::makeAny( bMatchCase ) ); @@ -3253,17 +3253,17 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere { xKeyRange.set( Key, uno::UNO_QUERY_THROW ); } - else if ( Key.getValueType() == ::getCppuType( static_cast< const rtl::OUString* >(0) ) ) + else if ( Key.getValueType() == ::getCppuType( static_cast< const OUString* >(0) ) ) { - rtl::OUString sRangeName = ::comphelper::getString( Key ); + OUString sRangeName = ::comphelper::getString( Key ); table::CellRangeAddress aRefAddr; if ( !pDocSh ) - throw uno::RuntimeException( rtl::OUString("Range::Sort no docshell to calculate key param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort no docshell to calculate key param"), uno::Reference< uno::XInterface >() ); xKeyRange = getRangeForName( xContext, sRangeName, pDocSh, aRefAddr ); } else - throw uno::RuntimeException( rtl::OUString("Range::Sort illegal type value for key param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort illegal type value for key param"), uno::Reference< uno::XInterface >() ); uno::Reference< table::XCellRange > xKey; xKey.set( xKeyRange->getCellRange(), uno::UNO_QUERY_THROW ); return xKey; @@ -3271,7 +3271,7 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere // helper method for Sort sal_Int32 findSortPropertyIndex( const uno::Sequence< beans::PropertyValue >& props, -const rtl::OUString& sPropName ) throw( uno::RuntimeException ) +const OUString& sPropName ) throw( uno::RuntimeException ) { const beans::PropertyValue* pProp = props.getConstArray(); sal_Int32 nItems = props.getLength(); @@ -3281,7 +3281,7 @@ const rtl::OUString& sPropName ) throw( uno::RuntimeException ) if ( pProp->Name.equals( sPropName ) ) return count; if ( count == nItems ) - throw uno::RuntimeException( rtl::OUString("Range::Sort unknown sort property"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort unknown sort property"), uno::Reference< uno::XInterface >() ); return -1; //should never reach here ( satisfy compiler ) } @@ -3317,7 +3317,7 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan aTableField.IsAscending = false; } else - throw uno::RuntimeException( rtl::OUString( "Illegal Key param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal Key param" ), uno::Reference< uno::XInterface >() ); } @@ -3327,7 +3327,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& { // #TODO# #FIXME# can we do something with Type if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); sal_Int16 nDataOption1 = excel::XlSortDataOption::xlSortNormal; sal_Int16 nDataOption2 = excel::XlSortDataOption::xlSortNormal; @@ -3335,7 +3335,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& ScDocument* pDoc = getScDocument(); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); RangeHelper thisRange( mxRange ); table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); @@ -3459,7 +3459,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& ScDocShell* pDocShell = getScDocShell(); xKey1 = processKey( Key1, mxContext, pDocShell ); if ( !xKey1.is() ) - throw uno::RuntimeException( rtl::OUString("Range::Sort needs a key1 param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort needs a key1 param"), uno::Reference< uno::XInterface >() ); if ( Key2.hasValue() ) xKey2 = processKey( Key2, mxContext, pDocShell ); @@ -3468,7 +3468,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& uno::Reference< util::XSortable > xSort( mxRange, uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > sortDescriptor = xSort->createSortDescriptor(); - sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString( "SortFields" ) ); + sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, OUString( "SortFields" ) ); uno::Sequence< table::TableSortField > sTableFields(1); sal_Int32 nTableIndex = 0; @@ -3486,7 +3486,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& } sortDescriptor[ nTableSortFieldIndex ].Value <<= sTableFields; - sal_Int32 nIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString("IsSortColumns") ); + sal_Int32 nIndex = findSortPropertyIndex( sortDescriptor, OUString("IsSortColumns") ); sortDescriptor[ nIndex ].Value <<= bIsSortColumns; nIndex = findSortPropertyIndex( sortDescriptor, CONTS_HEADER ); @@ -3520,7 +3520,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) // Save ActiveCell pos ( to restore later ) uno::Any aDft; uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); - rtl::OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); + OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); // position current cell upper left of this range Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select(); @@ -3554,7 +3554,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) nSID = SID_CURSORBLKRIGHT; break; default: - throw uno::RuntimeException( ::rtl::OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); } if ( pDispatcher ) { @@ -3563,7 +3563,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) } // result is the ActiveCell - rtl::OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); + OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); // restore old ActiveCell uno::Any aVoid; @@ -3594,11 +3594,11 @@ uno::Reference< excel::XCharacters > SAL_CALL ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException) { if ( !isSingleCellRange() ) - throw uno::RuntimeException( rtl::OUString( "Can't create Characters property for multicell range " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't create Characters property for multicell range " ), uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple(mxRange->getCellByPosition(0,0) , uno::UNO_QUERY_THROW ); ScDocument* pDoc = getDocumentFromRange(mxRange); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); return new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length ); @@ -3633,7 +3633,7 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException) mode = sheet::CellDeleteMode_LEFT; break; default: - throw uno::RuntimeException( rtl::OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); } } else @@ -3682,10 +3682,10 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException) return new CellsEnumeration( mxParent, mxContext, m_Areas ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException) { - const static rtl::OUString sName( "Item" ); + const static OUString sName( "Item" ); return sName; } @@ -3828,7 +3828,7 @@ uno::Reference< excel::XRange > ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ) { if ( !m_Areas.is() ) - throw uno::RuntimeException( rtl::OUString("No areas available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No areas available"), uno::Reference< uno::XInterface >() ); uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( ++nIndex ), uno::Any() ), uno::UNO_QUERY_THROW ); return xRange; } @@ -4119,11 +4119,11 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC // msgbox Application.Range("test").Address ' works // Single param Range - rtl::OUString sRangeName; + OUString sRangeName; Cell1 >>= sRangeName; if ( Cell1.hasValue() && !Cell2.hasValue() && !sRangeName.isEmpty() ) { - const static rtl::OUString sNamedRanges( "NamedRanges"); + const static OUString sNamedRanges( "NamedRanges"); uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(xContext), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW ); @@ -4197,7 +4197,7 @@ static void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal } // Modifies sCriteria, and nOp depending on the value of sCriteria -static void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField ) +static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField ) { // #TODO make this more efficient and cycle through // sCriteria1 character by character to pick up <,<>,=, * etc. @@ -4314,7 +4314,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const if ( pRange ) { if ( pRange->isSingleCellRange() ) - throw uno::RuntimeException( rtl::OUString( "Can't create AutoFilter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't create AutoFilter" ), uno::Reference< uno::XInterface >() ); RangeHelper currentRegion( pRange->mxRange ); autoFiltAddress = currentRegion.getCellRangeAddressable()->getRangeAddress(); } @@ -4349,7 +4349,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const xDataBaseRange.set( xDBRanges->getByTable(nSheet ), uno::UNO_QUERY_THROW ); } if ( !xDataBaseRange.is() ) - throw uno::RuntimeException( rtl::OUString( "Failed to find the autofilter placeholder range" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to find the autofilter placeholder range" ), uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW ); // set autofilt @@ -4365,7 +4365,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const sal_Int32 nField = 0; // *IS* 1 based - rtl::OUString sCriteria1; + OUString sCriteria1; sal_Int32 nOperator = excel::XlAutoFilterOperator::xlAnd; sal_Bool bVisible = sal_True; @@ -4449,7 +4449,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const nConn = sheet::FilterConnection_AND; break; default: - throw uno::RuntimeException( rtl::OUString( "UnknownOption" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "UnknownOption" ), uno::Reference< uno::XInterface >() ); } @@ -4459,7 +4459,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const sTabFilts[0].Connection = sheet::FilterConnection_AND; sTabFilts[0].Field = (nField - 1); - rtl::OUString sCriteria2; + OUString sCriteria2; if ( Criteria2.hasValue() ) // there is a Criteria2 { sTabFilts.realloc(2); @@ -4544,7 +4544,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) thro mode = sheet::CellInsertMode_DOWN; break; default: - throw uno::RuntimeException( rtl::OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); } } else @@ -4589,7 +4589,7 @@ ScVbaRange::Autofit() throw (uno::RuntimeException) // throw an error if ( !( mbIsColumns || mbIsRows ) ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); ScDocShell* pDocShell = getDocShellFromRange( mxRange ); if ( pDocShell ) { @@ -4623,7 +4623,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< excel::XHyperlinks > xSheetHlinks( xWorksheet->Hyperlinks( uno::Any() ), uno::UNO_QUERY_THROW ); ScVbaHyperlinksRef xScSheetHlinks( dynamic_cast< ScVbaHyperlinks* >( xSheetHlinks.get() ) ); if( !xScSheetHlinks.is() ) - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain hyperlinks implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain hyperlinks implementation object" ), uno::Reference< uno::XInterface >() ); // create a new local hyperlinks object based on the sheet hyperlinks ScVbaHyperlinksRef xHlinks( new ScVbaHyperlinks( getParent(), mxContext, xScSheetHlinks, getScRangeList() ) ); @@ -4701,7 +4701,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContai inline uno::Any lclGetPrefixVariant( sal_Unicode cPrefixChar ) { - return uno::Any( (cPrefixChar == 0) ? ::rtl::OUString() : ::rtl::OUString( cPrefixChar ) ); + return uno::Any( (cPrefixChar == 0) ? OUString() : OUString( cPrefixChar ) ); } } // namespace @@ -4728,7 +4728,7 @@ uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException) return lclGetPrefixVariant( lclGetPrefixChar( mxRange ) ); if( mxRanges.is() ) return lclGetPrefixVariant( lclGetPrefixChar( mxRanges ) ); - throw uno::RuntimeException( ::rtl::OUString( "Unexpected empty Range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Unexpected empty Range object" ), uno::Reference< uno::XInterface >() ); } uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) @@ -4737,7 +4737,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) // In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception if( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "Can not get Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not get Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); sal_Bool bShowDetail = false; @@ -4769,7 +4769,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) } else { - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); } return aNULL(); } @@ -4780,7 +4780,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru // In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception if( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); bool bShowDetail = extractBoolFromAny( aShowDetail ); @@ -4805,7 +4805,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru } else { - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); } } @@ -4970,7 +4970,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const eCmd = FILL_GROWTH; break; case excel::XlAutoFillType::xlFillFormats: - throw uno::RuntimeException( rtl::OUString( "xlFillFormat not supported for AutoFill" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "xlFillFormat not supported for AutoFill" ), uno::Reference< uno::XInterface >() ); case excel::XlAutoFillType::xlFillValues: case excel::XlAutoFillType::xlFillSeries: case excel::XlAutoFillType::xlLinearTrend: @@ -5000,7 +5000,7 @@ ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); RangeHelper changingCellRange( pRange->mxRange ); table::CellRangeAddress changingCellAddr = changingCellRange.getCellRangeAddressable()->getRangeAddress(); - rtl::OUString sGoal = getAnyAsString( Goal ); + OUString sGoal = getAnyAsString( Goal ); table::CellAddress thisCell( thisAddress.Sheet, thisAddress.StartColumn, thisAddress.StartRow ); table::CellAddress changingCell( changingCellAddr.Sheet, changingCellAddr.StartColumn, changingCellAddr.StartRow ); sheet::GoalResult res = xGoalSeek->seekGoal( thisCell, changingCell, sGoal ); @@ -5029,7 +5029,7 @@ ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::B if ( mbIsRows || mbIsColumns ) { if ( column.hasValue() ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); uno::Reference< excel::XRange > xRange; if ( mbIsColumns ) xRange = Columns( row ); @@ -5061,7 +5061,7 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce xSheetOutline->autoOutline( thisAddress ); } else - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } void SAL_CALL @@ -5169,7 +5169,7 @@ ScVbaRange::getStyle() throw (uno::RuntimeException) return xRange->getStyle(); } uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW ); - rtl::OUString sStyleName; + OUString sStyleName; xProps->getPropertyValue( CELLSTYLE ) >>= sStyleName; ScDocShell* pShell = getScDocShell(); uno::Reference< frame::XModel > xModel( pShell->GetModel() ); @@ -5251,13 +5251,13 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw uno::Reference< excel::XRange > xUsedRange( getWorksheet()->getUsedRange() ); sal_Int32 nType = 0; if ( !( _oType >>= nType ) ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); switch(nType) { case excel::XlCellType::xlCellTypeSameFormatConditions: case excel::XlCellType::xlCellTypeAllValidation: case excel::XlCellType::xlCellTypeSameValidation: - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; case excel::XlCellType::xlCellTypeBlanks: case excel::XlCellType::xlCellTypeComments: @@ -5315,11 +5315,11 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw break; } default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); break; } if ( !pRangeToUse ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return pRangeToUse->SpecialCellsImpl( nType, _oValue ); } @@ -5345,7 +5345,7 @@ static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script nRes = sheet::FormulaResult::STRING; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } return nRes; } @@ -5367,7 +5367,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( case excel::XlCellType::xlCellTypeSameValidation: // Shouldn't get here ( should be filtered out by // ScVbaRange::SpecialCells() - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; case excel::XlCellType::xlCellTypeBlanks: xLocSheetCellRanges = xQuery->queryEmptyCells(); @@ -5390,7 +5390,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( xLocSheetCellRanges = xQuery->queryVisibleCells(); break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); break; } if (xLocSheetCellRanges.is()) @@ -5470,7 +5470,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno:: aColumns[i].Function = sheet::GeneralFunction_VARP; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString()) ; + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString()) ; return; } } @@ -5479,24 +5479,24 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno:: } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaRange::getServiceImplName() { - return rtl::OUString("ScVbaRange"); + return OUString("ScVbaRange"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaRange::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.Range" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Range" ); } return aServiceNames; } @@ -5508,7 +5508,7 @@ ScVbaRange::hasError() throw (uno::RuntimeException) uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); uno::Reference< script::XInvocation > xInvoc( xApplication->WorksheetFunction(), uno::UNO_QUERY_THROW ); - static rtl::OUString FunctionName( "IsError" ); + static OUString FunctionName( "IsError" ); uno::Sequence< uno::Any > Params(1); uno::Reference< excel::XRange > aRange( this ); Params[0] = uno::makeAny( aRange ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 26c583eb7de4..3459f52f6647 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -140,7 +140,7 @@ public: static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, - const rtl::OUString& sRangeName, ScDocShell* pDocSh, + const OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( css::uno::RuntimeException ); static css::uno::Reference< ov::excel::XRange > CellsHelper( @@ -161,7 +161,7 @@ public: virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); using ScVbaRange_BASE::setNumberFormat; virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException); @@ -207,10 +207,10 @@ public: throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) + virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) throw (css::uno::RuntimeException); @@ -229,7 +229,7 @@ public: virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException); static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) throw (css::uno::RuntimeException); virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) throw (css::uno::RuntimeException); @@ -272,9 +272,9 @@ public: } virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException); // XDefaultMethod - ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException); + OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException); // XDefaultProperty - ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } // #TODO completely rewrite ScVbaRange, its become a hackfest @@ -285,14 +285,14 @@ public: // * object should be a lightweight as possible // * we shouldn't need hacks like this below static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException); - static bool getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); + static bool getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException ); // XErrorQuery virtual ::sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_RANGE_HXX */ diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 256d3659eb42..cf6adaf1b02b 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -33,7 +33,6 @@ #include "vbafont.hxx" #include "drwlayer.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::ooo::vba; @@ -283,7 +282,7 @@ void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) throw (uno::RuntimeException) { - OUString aName = ::rtl::OUStringBuffer( implGetBaseName() ).append( sal_Unicode( ' ' ) ).append( nIndex + 1 ).makeStringAndClear(); + OUString aName = OUStringBuffer( implGetBaseName() ).append( sal_Unicode( ' ' ) ).append( nIndex + 1 ).makeStringAndClear(); setName( aName ); implSetDefaultProperties(); } diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index c565c9660a14..87ba3776d85c 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -50,24 +50,24 @@ public: virtual ~ScVbaButtonCharacters(); // XCharacters attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& rCaption ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException); // XCharacters methods - virtual void SAL_CALL Insert( const ::rtl::OUString& rString ) throw (css::uno::RuntimeException); + virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE private: - ::rtl::OUString getFullString() const throw (css::uno::RuntimeException); - void setFullString( const ::rtl::OUString& rString ) throw (css::uno::RuntimeException); + OUString getFullString() const throw (css::uno::RuntimeException); + void setFullString( const OUString& rString ) throw (css::uno::RuntimeException); private: ScVbaPalette maPalette; @@ -99,8 +99,8 @@ public: virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException); virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException); virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException); @@ -111,7 +111,7 @@ public: protected: /** Derived classes return the base name used for new objects. */ - virtual ::rtl::OUString implGetBaseName() const = 0; + virtual OUString implGetBaseName() const = 0; /** Derived classes set default properties for new drawing objects. */ virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); @@ -148,10 +148,10 @@ public: ListenerType eListenerType ) throw (css::uno::RuntimeException); // XSheetObject attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); - virtual void SAL_CALL setOnAction( const ::rtl::OUString& rMacroName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); + virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException); virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException); @@ -165,8 +165,8 @@ protected: protected: css::uno::Reference< css::container::XIndexContainer > mxFormIC; css::uno::Reference< css::beans::XPropertySet > mxControlProps; - ::rtl::OUString maListenerType; - ::rtl::OUString maEventMethod; + OUString maListenerType; + OUString maEventMethod; }; // ============================================================================ @@ -184,8 +184,8 @@ public: const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ) throw (css::uno::RuntimeException); // XButton attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& rCaption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException); @@ -203,7 +203,7 @@ public: VBAHELPER_DECL_XHELPERINTERFACE protected: - virtual ::rtl::OUString implGetBaseName() const; + virtual OUString implGetBaseName() const; virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); }; diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 74f656f2001d..b542a666b1c9 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/form/XFormsSupplier.hpp> #include "vbasheetobject.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index 466c7ff377ec..0f96a1d41990 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -59,7 +59,7 @@ public: // ScVbaCollectionBase virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ); - virtual css::uno::Any getItemByStringIndex( const ::rtl::OUString& rIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException); protected: ScVbaObjectContainerRef mxContainer; diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 427a70410722..03196a46ba5f 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString DISPLAYNAME("DisplayName"); +static OUString DISPLAYNAME("DisplayName"); @@ -31,12 +31,12 @@ uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( rtl::OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); return xStylesAccess; } static uno::Reference< beans::XPropertySet > -lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) +lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW ); @@ -47,11 +47,11 @@ lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame: void ScVbaStyle::initialise() throw ( uno::RuntimeException ) { if (!mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") ); uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW ); - if ( !xServiceInfo->supportsService( rtl::OUString( "com.sun.star.style.CellStyle" ) ) ) + if ( !xServiceInfo->supportsService( OUString( "com.sun.star.style.CellStyle" ) ) ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } mxStyle.set( mxPropertySet, uno::UNO_QUERY_THROW ); @@ -60,7 +60,7 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException ) } -ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel ) +ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel ) { try { @@ -68,7 +68,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, c } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -80,7 +80,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -92,19 +92,19 @@ ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException) } void SAL_CALL -ScVbaStyle::setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException) { mxStyle->setName(Name); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaStyle::getName() throw (script::BasicErrorException, uno::RuntimeException) { return mxStyle->getName(); } void SAL_CALL -ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException) { try { @@ -116,17 +116,17 @@ ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::Basi } } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeException) { - rtl::OUString sName; + OUString sName; try { mxPropertySet->getPropertyValue(DISPLAYNAME) >>= sName; } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return sName; } @@ -140,37 +140,37 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException) } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } void SAL_CALL ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } uno::Any SAL_CALL ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return uno::Any(); } -rtl::OUString +OUString ScVbaStyle::getServiceImplName() { - return rtl::OUString("ScVbaStyle"); + return OUString("ScVbaStyle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XStyle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index cd0e0a72628d..70d4e2824739 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -35,24 +35,24 @@ protected: css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer; void initialise() throw ( css::uno::RuntimeException ); public: - ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); virtual ~ScVbaStyle(){} static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() { return this; }; // XStyle Methods virtual ::sal_Bool SAL_CALL BuiltIn() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void SAL_CALL setNameLocal( const ::rtl::OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException); // XFormat virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_AXIS_HXX diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 2706440c972c..df854d17d593 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString SDEFAULTCELLSTYLENAME("Default"); +static OUString SDEFAULTCELLSTYLENAME("Default"); static css::uno::Any lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) { @@ -42,11 +42,11 @@ ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, con } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyles::getStyleNames() throw ( uno::RuntimeException ) { return mxNameContainerCellStyles->getElementNames(); @@ -94,12 +94,12 @@ ScVbaStyles::createEnumeration() throw (uno::RuntimeException) } uno::Reference< excel::XStyle > SAL_CALL -ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< excel::XStyle > aRet; try { - rtl::OUString sParentCellStyleName("Default"); + OUString sParentCellStyleName("Default"); if ( _aBasedOn.hasValue() ) { uno::Reference< excel::XRange > oRange; @@ -112,16 +112,16 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr } else { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString() ); } } else { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } } - uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( rtl::OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); if (!mxNameContainerCellStyles->hasByName(_sName)) { @@ -135,13 +135,13 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aRet; } void -ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorException ) +ScVbaStyles::Delete(const OUString _sStyleName) throw ( script::BasicErrorException ) { try { @@ -150,24 +150,24 @@ ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorE } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaStyles::getServiceImplName() { - return rtl::OUString("ScVbaStyles"); + return OUString("ScVbaStyles"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyles::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyles" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XStyles" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index 4161f073cf6b..aff8d859cedc 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -33,17 +33,17 @@ class ScVbaStyles: public ScVbaStyles_BASE css::uno::Reference< css::container::XNameContainer > mxNameContainerCellStyles; public: ScVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException ); - css::uno::Sequence< rtl::OUString > getStyleNames() throw ( css::uno::RuntimeException ); - void Delete(const rtl::OUString _sStyleName) throw ( css::script::BasicErrorException ); + css::uno::Sequence< OUString > getStyleNames() throw ( css::uno::RuntimeException ); + void Delete(const OUString _sStyleName) throw ( css::script::BasicErrorException ); // XStyles - virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const ::rtl::OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index ca7cc7270613..994ca2971f73 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.cxx @@ -31,14 +31,14 @@ ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentConte m_xModel.set( xModel ); } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaTextBoxShape::getText() throw (css::uno::RuntimeException) { return m_xTextRange->getString(); } void SAL_CALL -ScVbaTextBoxShape::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException) +ScVbaTextBoxShape::setText( const OUString& _text ) throw (css::uno::RuntimeException) { m_xTextRange->setString( _text ); } @@ -50,7 +50,7 @@ ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) t ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL; if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple( m_xTextRange, uno::UNO_QUERY_THROW ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index 53c1df383172..533df3a3b50b 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.hxx @@ -35,8 +35,8 @@ public: ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); // Attributes - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException); }; #endif //SC_VBA_TEXTBOX_HXX diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 306f71318ee7..854594faafb9 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -40,20 +40,20 @@ ScVbaTextFrame::Characters() throw (uno::RuntimeException) return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) ) ); } -rtl::OUString +OUString ScVbaTextFrame::getServiceImplName() { - return rtl::OUString("ScVbaTextFrame"); + return OUString("ScVbaTextFrame"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaTextFrame::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.TextFrame" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.TextFrame" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index 32fc8642ca1e..3bad6ba0c5a7 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -33,8 +33,8 @@ public: // Methods virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index d3c84ac95198..3f4d105c3808 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -64,27 +64,27 @@ public: return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet ); } - void SAL_CALL setText( const ::rtl::OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) + void SAL_CALL setText( const OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { try { - xShapePropertySet->setPropertyValue( rtl::OUString("String"), css::uno::makeAny( Text )); + xShapePropertySet->setPropertyValue( OUString("String"), css::uno::makeAny( Text )); } catch ( css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } - ::rtl::OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) + OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { - ::rtl::OUString sText; + OUString sText; try { - xShapePropertySet->getPropertyValue( rtl::OUString("String") ) >>= sText; + xShapePropertySet->getPropertyValue( OUString("String") ) >>= sText; } catch ( css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return sText; } @@ -117,11 +117,11 @@ public: { try { - xShapePropertySet->setPropertyValue(rtl::OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); + xShapePropertySet->setPropertyValue(OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); } catch (css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } ::sal_Int32 SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) @@ -129,26 +129,26 @@ public: sal_Int32 nSOOrientation = 0; try { - xShapePropertySet->getPropertyValue( rtl::OUString("TextRotation")) >>= nSOOrientation; + xShapePropertySet->getPropertyValue( OUString("TextRotation")) >>= nSOOrientation; } catch (css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return static_cast< sal_Int32 >(nSOOrientation / 100) ; } // XHelperInterface - rtl::OUString getServiceImplName() + OUString getServiceImplName() { - return rtl::OUString("TitleImpl"); + return OUString("TitleImpl"); } - css::uno::Sequence< rtl::OUString > getServiceNames() + css::uno::Sequence< OUString > getServiceNames() { - static css::uno::Sequence< rtl::OUString > aServiceNames; + static css::uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XTitle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XTitle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index cdd02499bca0..da9f0bb6b633 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -35,17 +35,17 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -const static rtl::OUString VALIDATION( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VALIDAT ) ); -const static rtl::OUString IGNOREBLANK( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_IGNOREBL ) ); -const static rtl::OUString SHOWINPUT( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWINP ) ); -const static rtl::OUString SHOWERROR( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWERR ) ); -const static rtl::OUString ERRORTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRTITLE ) ); -const static rtl::OUString INPUTTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPTITLE ) ); -const static rtl::OUString INPUTMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPMESS ) ); -const static rtl::OUString ERRORMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRMESS ) ); -const static rtl::OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE ) ); -const static rtl::OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); -const static rtl::OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); +const static OUString VALIDATION( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VALIDAT ) ); +const static OUString IGNOREBLANK( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_IGNOREBL ) ); +const static OUString SHOWINPUT( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWINP ) ); +const static OUString SHOWERROR( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWERR ) ); +const static OUString ERRORTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRTITLE ) ); +const static OUString INPUTTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPTITLE ) ); +const static OUString INPUTMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPMESS ) ); +const static OUString ERRORMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRMESS ) ); +const static OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE ) ); +const static OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); +const static OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); static void lcl_setValidationProps( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< beans::XPropertySet >& xProps ) @@ -134,68 +134,68 @@ ScVbaValidation::setShowError( ::sal_Bool _showerror ) throw (uno::RuntimeExcept lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getErrorTitle() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sErrorTitle; + OUString sErrorTitle; xProps->getPropertyValue( ERRORTITLE ) >>= sErrorTitle; return sErrorTitle; } void -ScVbaValidation::setErrorTitle( const rtl::OUString& _errormessage ) throw (uno::RuntimeException) +ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( ERRORTITLE, uno::makeAny( _errormessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getInputMessage() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sMsg; + OUString sMsg; xProps->getPropertyValue( INPUTMESS ) >>= sMsg; return sMsg; } void SAL_CALL -ScVbaValidation::setInputMessage( const ::rtl::OUString& _inputmessage ) throw (uno::RuntimeException) +ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( INPUTMESS, uno::makeAny( _inputmessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getInputTitle() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sString; + OUString sString; xProps->getPropertyValue( INPUTTITLE ) >>= sString; return sString; } void SAL_CALL -ScVbaValidation::setInputTitle( const ::rtl::OUString& _inputtitle ) throw (uno::RuntimeException) +ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( INPUTTITLE, uno::makeAny( _inputtitle ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getErrorMessage() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sString; + OUString sString; xProps->getPropertyValue( ERRORMESS ) >>= sString; return sString; } void SAL_CALL -ScVbaValidation::setErrorMessage( const ::rtl::OUString& _errormessage ) throw (uno::RuntimeException) +ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( ERRORMESS, uno::makeAny( _errormessage ) ); @@ -206,7 +206,7 @@ ScVbaValidation::setErrorMessage( const ::rtl::OUString& _errormessage ) throw ( void SAL_CALL ScVbaValidation::Delete( ) throw (uno::RuntimeException) { - rtl::OUString sBlank; + OUString sBlank; uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW ); xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( sal_True ) ); @@ -233,15 +233,15 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un sheet::ValidationType nValType = sheet::ValidationType_ANY; xProps->getPropertyValue( STYPE ) >>= nValType; if ( nValType != sheet::ValidationType_ANY ) - throw uno::RuntimeException( rtl::OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); sal_Int32 nType = -1; if ( !Type.hasValue() || !( Type >>= nType ) ) - throw uno::RuntimeException( rtl::OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); Delete(); // set up defaults - rtl::OUString sFormula1; + OUString sFormula1; Formula1 >>= sFormula1; - rtl::OUString sFormula2; + OUString sFormula2; Formula2 >>= sFormula2; switch ( nType ) { @@ -250,7 +250,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un // for validate list // at least formula1 is required if ( !Formula1.hasValue() ) - throw uno::RuntimeException( rtl::OUString( "missing param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "missing param" ), uno::Reference< uno::XInterface >() ); nValType = sheet::ValidationType_LIST; xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); // #TODO validate required params @@ -262,7 +262,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); break; default: - throw uno::RuntimeException( rtl::OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); } sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; @@ -283,7 +283,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un eStyle = sheet::ValidationAlertStyle_INFO; break; default: - throw uno::RuntimeException( rtl::OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); } } @@ -306,11 +306,11 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getFormula1() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); - rtl::OUString sString = xCond->getFormula1(); + OUString sString = xCond->getFormula1(); sal_uInt16 nFlags = 0; ScRangeList aCellRanges; @@ -327,7 +327,7 @@ ScVbaValidation::getFormula1() throw (uno::RuntimeException) return sString; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getFormula2() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); @@ -377,20 +377,20 @@ ScVbaValidation::getType() throw (uno::RuntimeException) return nExcelType; } -rtl::OUString +OUString ScVbaValidation::getServiceImplName() { - return rtl::OUString("ScVbaValidation"); + return OUString("ScVbaValidation"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaValidation::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Validation" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Validation" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index ea236a31c085..baa96d730555 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -41,23 +41,23 @@ public: virtual void SAL_CALL setShowInput( ::sal_Bool _showinput ) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException); virtual void SAL_CALL setShowError( ::sal_Bool _showerror ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setInputTitle( const ::rtl::OUString& _inputtitle ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setErrorTitle( const ::rtl::OUString& _errortitle ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException); - virtual void SAL_CALL setInputMessage( const ::rtl::OUString& _inputmessage ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException); - virtual void SAL_CALL setErrorMessage( const ::rtl::OUString& _errormessage ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException); + virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException); + virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException); + virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException); + virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException) ; + virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); // Methods virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException); virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 2ac13621ae32..dab52fa8b631 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlWindowState; -typedef boost::unordered_map< rtl::OUString, -SCTAB, ::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > NameIndexHash; +typedef boost::unordered_map< OUString, +SCTAB, OUStringHash, +::std::equal_to< OUString > > NameIndexHash; typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; @@ -103,13 +103,13 @@ public: { ScModelObj* pModel = static_cast< ScModelObj* >( m_xModel.get() ); if ( !pModel ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); uno::Sequence<sal_Int32> aSheets( nTabCount ); @@ -160,7 +160,7 @@ public: } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -169,10 +169,10 @@ public: } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); - ::rtl::OUString* pString = names.getArray(); + uno::Sequence< OUString > names( namesToIndices.size() ); + OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) @@ -180,7 +180,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -290,7 +290,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P /* sal_Int32 nSheets = 0; sal_Int32 nPosition = 0; - throw uno::RuntimeException( rtl::OUString("No Implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No Implemented"), uno::Reference< uno::XInterface >() ); sal_Bool bSheets = ( Sheets >>= nSheets ); sal_Bool bPosition = ( Position >>= nPosition ); if ( bSheets || bPosition ) // at least one param specified @@ -305,11 +305,11 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P uno::Any SAL_CALL ScVbaWindow::getCaption() throw (uno::RuntimeException) { - static rtl::OUString sCrud(" - OpenOffice.org Calc" ); + static OUString sCrud(" - OpenOffice.org Calc" ); static sal_Int32 nCrudLen = sCrud.getLength(); - rtl::OUString sTitle; - getFrameProps()->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; + OUString sTitle; + getFrameProps()->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; sal_Int32 nCrudIndex = sTitle.indexOf( sCrud ); // adjust title ( by removing crud ) // sCrud string present @@ -320,7 +320,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) { sTitle = sTitle.copy( 0, nCrudIndex ); ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ); - rtl::OUString sName = workbook.getName(); + OUString sName = workbook.getName(); // rather bizare hack to make sure the name behavior // is like XL // if the adjusted title == workbook name, use name @@ -330,7 +330,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) if ( !sTitle.equals( sName ) ) { - static rtl::OUString sDot("."); + static OUString sDot("."); // starts with title if ( sName.indexOf( sTitle ) == 0 ) // extention starts immediately after @@ -345,7 +345,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException) { - getFrameProps()->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TITLE ) ), _caption ); + getFrameProps()->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TITLE ) ), _caption ); } uno::Any SAL_CALL @@ -444,7 +444,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == xlNormal) pWork -> Restore(); else - throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); } } @@ -495,7 +495,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx ::sal_Bool SAL_CALL ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); sal_Bool bGrid = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bGrid; return bGrid; @@ -505,14 +505,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); sal_Bool bHeading = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHeading; return bHeading; @@ -521,14 +521,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); sal_Bool bHorizontalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHorizontalScrollBar; return bHorizontalScrollBar; @@ -537,14 +537,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); sal_Bool bOutline = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bOutline; return bOutline; @@ -553,14 +553,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); sal_Bool bVerticalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bVerticalScrollBar; return bVerticalScrollBar; @@ -569,14 +569,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); sal_Bool bWorkbookTabs = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bWorkbookTabs; return bWorkbookTabs; @@ -585,7 +585,7 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs )); } @@ -731,7 +731,7 @@ uno::Any SAL_CALL ScVbaWindow::getZoom() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getControllerProps(); - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH; xProps->getPropertyValue( sName ) >>= nZoomType; if( nZoomType == view::DocumentZoomType::PAGE_WIDTH ) @@ -740,7 +740,7 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException) } else if( nZoomType == view::DocumentZoomType::BY_VALUE ) { - sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ZOOMVALUE)); + sName = OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ZOOMVALUE)); sal_Int16 nZoom = 100; xProps->getPropertyValue( sName ) >>= nZoom; return uno::makeAny( nZoom ); @@ -793,7 +793,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException) nSlot = FID_PAGEBREAKMODE; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } // !! TODO !! get view shell from controller ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); @@ -864,20 +864,20 @@ void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::Runtime } } -rtl::OUString +OUString ScVbaWindow::getServiceImplName() { - return rtl::OUString("ScVbaWindow"); + return OUString("ScVbaWindow"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWindow::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Window" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Window" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index fe5725340ca3..c637fdf736a9 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -120,8 +120,8 @@ public: virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 0c090516961d..5f4bf1098ffe 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -30,9 +30,9 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -typedef boost::unordered_map< rtl::OUString, -sal_Int32, ::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > NameIndexHash; +typedef boost::unordered_map< OUString, +sal_Int32, OUStringHash, +::std::equal_to< OUString > > NameIndexHash; static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) @@ -130,7 +130,7 @@ public: uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW ); uno::Reference< XHelperInterface > xTemp; // temporary needed for g++ 3.3.5 ScVbaWindow window( xTemp, m_xContext, xModel, xController ); - rtl::OUString sCaption; + OUString sCaption; window.getCaption() >>= sCaption; namesToIndices[ sCaption ] = nIndex++; } @@ -168,7 +168,7 @@ public: } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -177,10 +177,10 @@ public: } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); - ::rtl::OUString* pString = names.getArray(); + uno::Sequence< OUString > names( namesToIndices.size() ); + OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) @@ -188,7 +188,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -225,20 +225,20 @@ ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWor } -rtl::OUString +OUString ScVbaWindows::getServiceImplName() { - return rtl::OUString("ScVbaWindows"); + return OUString("ScVbaWindows"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaWindows::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Windows"); + sNames[0] = OUString("ooo.vba.excel.Windows"); } return sNames; } diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 0cd2186fc4e7..59a32790f28d 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -47,8 +47,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_WINDOWS_HXX diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 6062b9e3bde5..96aa20574b0b 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -97,7 +97,7 @@ ScVbaWorkbook::Colors( const ::uno::Any& Index ) throw (::script::BasicErrorExce ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException) { sal_Int32 aFileFormat = 0; - rtl::OUString aFilterName; + OUString aFilterName; uno::Sequence< beans::PropertyValue > aArgs = getModel()->getArgs(); // #FIXME - seems suspect should we not walk through the properties @@ -251,14 +251,14 @@ void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDispl } void -ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::RuntimeException) +ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeException) { - rtl::OUString aURL; + OUString aURL; osl::FileBase::getFileURLFromSystemPath( sFileName, aURL ); uno::Reference< frame::XStorable > xStor( getModel(), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > storeProps(1); - storeProps[0].Name = rtl::OUString( "FilterName" ); - storeProps[0].Value <<= rtl::OUString( "MS Excel 97" ); + storeProps[0].Name = OUString( "FilterName" ); + storeProps[0].Value <<= OUString( "MS Excel 97" ); xStor->storeToURL( aURL, storeProps ); } @@ -279,36 +279,36 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, xModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); return uno::Any( xNames ); } -rtl::OUString +OUString ScVbaWorkbook::getServiceImplName() { - return rtl::OUString("ScVbaWorkbook"); + return OUString("ScVbaWorkbook"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWorkbook::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Workbook" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Workbook" ); } return aServiceNames; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW ); - return xModelProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); + return xModelProp->getPropertyValue( OUString( "CodeName" ) ).get< OUString >(); } sal_Int64 diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 6a8f02c596ce..7288d2aa1d1b 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -56,14 +56,14 @@ public: virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL SaveCopyAs( const rtl::OUString& Filename ) throw ( css::uno::RuntimeException); + virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException); // code name - virtual ::rtl::OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException); + virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // XUnoTunnel virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index a9357fae6194..5f191ac70425 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -88,7 +88,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -99,20 +99,20 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& pDoc->SetCodeName( sCodeName ); } - std::vector< rtl::OUString > sDocModuleNames; + std::vector< OUString > sDocModuleNames; sDocModuleNames.push_back( sCodeName ); uno::Reference<container::XNameAccess > xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > sSheets( xSheets->getElementNames() ); + uno::Sequence< OUString > sSheets( xSheets->getElementNames() ); for ( sal_Int32 index=0; index < sSheets.getLength() ; ++index ) { sDocModuleNames.push_back( sSheets[ index ] ); } - std::vector<rtl::OUString>::iterator it_end = sDocModuleNames.end(); + std::vector<OUString>::iterator it_end = sDocModuleNames.end(); - for ( std::vector<rtl::OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) + for ( std::vector<OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) { script::ModuleInfo sModuleInfo; @@ -120,9 +120,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); + xLib->replaceByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); + xLib->insertByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n" ) ) ); } } } @@ -195,7 +195,7 @@ ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException) { uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc; sal_Int32 nWorkbookType = 0; - ::rtl::OUString aTemplateFileName; + OUString aTemplateFileName; if( Template >>= nWorkbookType ) { // nWorkbookType is a constant from XlWBATemplate (added in Excel 2007) @@ -241,19 +241,19 @@ ScVbaWorkbooks::Close() throw (uno::RuntimeException) } bool -ScVbaWorkbooks::isTextFile( const rtl::OUString& sType ) +ScVbaWorkbooks::isTextFile( const OUString& sType ) { // will return true if the file is // a) a variant of a text file // b) a csv file // c) unknown // returning true basically means treat this like a csv file - const static rtl::OUString txtType("generic_Text"); + const static OUString txtType("generic_Text"); return sType.equals( txtType ) || sType.isEmpty(); } bool -ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) +ScVbaWorkbooks::isSpreadSheetFile( const OUString& sType ) { // include calc_QPro etc. ? ( not for the moment anyway ) if ( sType.indexOf( "calc_MS" ) == 0 @@ -263,23 +263,23 @@ ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) return false; } -rtl::OUString -ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName ) +OUString +ScVbaWorkbooks::getFileFilterType( const OUString& rFileName ) { - uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); + uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aMediaDesc(1); - aMediaDesc[ 0 ].Name = rtl::OUString("URL" ); + aMediaDesc[ 0 ].Name = OUString("URL" ); aMediaDesc[ 0 ].Value <<= rFileName; - rtl::OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); + OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); return sType; } // #TODO# #FIXME# can any of the unused params below be used? uno::Any SAL_CALL -ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException) +ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException) { // we need to detect if this is a URL, if not then assume its a file path - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( rFileName ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -290,7 +290,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi uno::Sequence< beans::PropertyValue > sProps(0); - rtl::OUString sType = getFileFilterType( aURL ); + OUString sType = getFileFilterType( aURL ); // A text file means it needs to be processed as a csv file if ( isTextFile( sType ) ) { @@ -304,11 +304,11 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi // 6 Custom character (see the Delimiter argument // no format means use the current delimiter sProps.realloc( 3 ); - sProps[ nIndex ].Name = rtl::OUString("FilterOptions" ); + sProps[ nIndex ].Name = OUString("FilterOptions" ); sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; - static rtl::OUString sRestOfFormat(",34,0,1" ); + static OUString sRestOfFormat(",34,0,1" ); - rtl::OUString sFormat; + OUString sFormat; sal_Int16 nFormat = 0; // default indicator @@ -317,7 +317,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi Format >>= nFormat; // val of nFormat overwritten if extracted // validate param if ( nFormat < 1 || nFormat > 6 ) - throw uno::RuntimeException( rtl::OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); } sal_Int16 nDelim = getCurrentDelim(); @@ -330,29 +330,29 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi { // Need to check Delimiter param if ( !Delimiter.hasValue() ) - throw uno::RuntimeException( rtl::OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); - rtl::OUString sStr; + throw uno::RuntimeException( OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); + OUString sStr; Delimiter >>= sStr; String aUniStr( sStr ); if ( aUniStr.Len() ) nDelim = aUniStr.GetChar(0); else - throw uno::RuntimeException( rtl::OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); } getCurrentDelim() = nDelim; //set new current - sFormat = rtl::OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; + sFormat = OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; - sProps[ nIndex ].Name = rtl::OUString("FilterName"); - sProps[ nIndex++ ].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); + sProps[ nIndex ].Name = OUString("FilterName"); + sProps[ nIndex++ ].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); // Ensure WORKAROUND_CSV_TXT_BUG_i60158 gets called in typedetection.cxx so // csv is forced for deep detected 'writerxxx' types - sProps[ nIndex ].Name = rtl::OUString("DocumentService"); - sProps[ nIndex ].Value <<= rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"); + sProps[ nIndex ].Name = OUString("DocumentService"); + sProps[ nIndex ].Value <<= OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( !isSpreadSheetFile( sType ) ) - throw uno::RuntimeException( rtl::OUString("Bad Format"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Bad Format"), uno::Reference< uno::XInterface >() ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( openDocument( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent ); @@ -362,20 +362,20 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi return aRet; } -rtl::OUString +OUString ScVbaWorkbooks::getServiceImplName() { - return rtl::OUString("ScVbaWorkbooks"); + return OUString("ScVbaWorkbooks"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaWorkbooks::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Workbooks"); + sNames[0] = OUString("ooo.vba.excel.Workbooks"); } return sNames; } diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index 8191006d52a4..b7e7068529db 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -32,9 +32,9 @@ typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > class ScVbaWorkbooks : public ScVbaWorkbooks_BASE { private: - rtl::OUString getFileFilterType( const rtl::OUString& rString ); - bool isTextFile( const rtl::OUString& rString ); - bool isSpreadSheetFile( const rtl::OUString& rString ); + OUString getFileFilterType( const OUString& rString ); + bool isTextFile( const OUString& rString ); + bool isSpreadSheetFile( const OUString& rString ); static sal_Int16& getCurrentDelim(){ static sal_Int16 nDelim = 44; return nDelim; } public: ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); @@ -46,13 +46,13 @@ public: // ScVbaWorkbooks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // XWorkbooks virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) throw (css::uno::RuntimeException); virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException); }; #endif /* SC_VBA_WORKBOOKS_HXX */ diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 7377ef8726ba..d481cee78a90 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -108,10 +108,10 @@ using namespace com::sun::star; using namespace ooo::vba; -static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldName, uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc ) +static void getNewSpreadsheetName (OUString &aNewName, OUString aOldName, uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); static OUString aUnderScore( "_" ); int currentNum =2; aNewName = aOldName + aUnderScore + OUString::number(currentNum) ; @@ -122,10 +122,10 @@ static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldNa } } -static void removeAllSheets( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, rtl::OUString aSheetName) +static void removeAllSheets( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, OUString aSheetName) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "removeAllSheets() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "removeAllSheets() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference<sheet::XSpreadsheets> xSheets = xSpreadDoc->getSheets(); uno::Reference <container::XIndexAccess> xIndex( xSheets, uno::UNO_QUERY ); @@ -152,7 +152,7 @@ static void removeAllSheets( uno::Reference <sheet::XSpreadsheetDocument>& xSpre } static uno::Reference<frame::XModel> -openNewDoc(rtl::OUString aSheetName ) +openNewDoc(OUString aSheetName ) { uno::Reference<frame::XModel> xModel; try @@ -163,8 +163,8 @@ openNewDoc(rtl::OUString aSheetName ) uno::Reference <frame::XDesktop2 > xComponentLoader = frame::Desktop::create(xContext); uno::Reference<lang::XComponent > xComponent( xComponentLoader->loadComponentFromURL( - rtl::OUString( "private:factory/scalc" ), - rtl::OUString( "_blank" ), 0, + OUString( "private:factory/scalc" ), + OUString( "_blank" ), 0, uno::Sequence < ::com::sun::star::beans::PropertyValue >() ) ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW ); if ( xSpreadDoc.is() ) @@ -191,7 +191,7 @@ ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args, if ( args.getLength() < 3 ) throw lang::IllegalArgumentException(); - rtl::OUString sSheetName; + OUString sSheetName; args[2] >>= sSheetName; uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc( mxModel, uno::UNO_QUERY_THROW ); @@ -214,7 +214,7 @@ const uno::Sequence<sal_Int8>& ScVbaWorksheet::getUnoTunnelId() } uno::Reference< ov::excel::XWorksheet > -ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) +ScVbaWorksheet::createSheetCopyInNewDoc(OUString aCurrSheetName) { uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = getSheet()->createCursor( ); uno::Reference<sheet::XUsedAreaCursor> xUsedCursor(xSheetCellCursor,uno::UNO_QUERY_THROW); @@ -235,7 +235,7 @@ ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); ScDocShell* pShell = excel::getDocShell( xModel ); - rtl::OUString aCodeName; + OUString aCodeName; pShell->GetDocument()->GetCodeName( 0, aCodeName ); return uno::Reference< excel::XWorksheet >( getUnoDocModule( aCodeName, pShell ), uno::UNO_QUERY_THROW ); } @@ -243,7 +243,7 @@ ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) css::uno::Reference< ov::excel::XWorksheet > ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> xSheet, bool bAfter) { - rtl::OUString aCurrSheetName = getName(); + OUString aCurrSheetName = getName(); ScVbaWorksheet* pDestSheet = excel::getImplFromDocModuleWrapper<ScVbaWorksheet>( xSheet ); uno::Reference <sheet::XSpreadsheetDocument> xDestDoc( pDestSheet->getModel(), uno::UNO_QUERY ); @@ -251,7 +251,7 @@ ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> xSheet, bool b SCTAB nDest = 0; SCTAB nSrc = 0; - rtl::OUString aSheetName = xSheet->getName(); + OUString aSheetName = xSheet->getName(); bool bSameDoc = ( pDestSheet->getModel() == getModel() ); bool bDestSheetExists = ScVbaWorksheets::nameExists (xDestDoc, aSheetName, nDest ); bool bSheetExists = ScVbaWorksheets::nameExists (xSrcDoc, aCurrSheetName, nSrc ); @@ -282,7 +282,7 @@ ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> xSheet, bool b return xNewSheet; } -::rtl::OUString +OUString ScVbaWorksheet::getName() throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); @@ -290,7 +290,7 @@ ScVbaWorksheet::getName() throw (uno::RuntimeException) } void -ScVbaWorksheet::setName(const ::rtl::OUString &rName ) throw (uno::RuntimeException) +ScVbaWorksheet::setName(const OUString &rName ) throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); xNamed->setName( rName ); @@ -362,7 +362,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException) return excel::XlEnableSelection::xlNoSelection; } else - throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), + throw uno::RuntimeException(OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -374,7 +374,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx (nSelection != excel::XlEnableSelection::xlUnlockedCells) && (nSelection != excel::XlEnableSelection::xlNoSelection) ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); @@ -403,7 +403,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx } } else - throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), + throw uno::RuntimeException(OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -517,7 +517,7 @@ sal_Bool ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException) { SCTAB nTab = 0; - rtl::OUString aSheetName = getName(); + OUString aSheetName = getName(); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); bool bSheetExists = ScVbaWorksheets::nameExists (xSpreadDoc, aSheetName, nTab); if ( bSheetExists ) @@ -555,7 +555,7 @@ void ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException) { uno::Reference<excel::XWorksheet> xSheet; - rtl::OUString aCurrSheetName = getName(); + OUString aCurrSheetName = getName(); if (!(Before >>= xSheet) && !(After >>=xSheet)&& !(Before.hasValue()) && !(After.hasValue())) { @@ -617,7 +617,7 @@ void ScVbaWorksheet::Delete() throw (uno::RuntimeException) { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); - rtl::OUString aSheetName = getName(); + OUString aSheetName = getName(); if ( xSpreadDoc.is() ) { SCTAB nTab = 0; @@ -667,7 +667,7 @@ ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObje // #TODO# #FIXME# is there anything we can do witht the unused param // can the implementation use anything else here uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW); - ::rtl::OUString aPasswd; + OUString aPasswd; Password >>= aPasswd; xProtectable->protect( aPasswd ); } @@ -676,7 +676,7 @@ void ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeException) { uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW); - ::rtl::OUString aPasswd; + OUString aPasswd; Password >>= aPasswd; xProtectable->unprotect( aPasswd ); } @@ -700,7 +700,7 @@ void ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException) { // #TODO# #FIXME# unused params above, can we do anything with those - rtl::OUString url = rtl::OUString( ".uno:SpellDialog"); + OUString url = OUString( ".uno:SpellDialog"); uno::Reference< frame::XModel > xModel( getModel() ); dispatchRequests(xModel,url); } @@ -802,7 +802,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio // #163498# initialize Names object with correct parent (this worksheet) // TODO: real sheet-local names... uno::Reference< beans::XPropertySet > xProps( mxModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, mxModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -913,7 +913,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWorksheet::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -930,32 +930,32 @@ ScVbaWorksheet::getIntrospection( ) throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWorksheet::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWorksheet::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { OSL_TRACE("** ScVbaWorksheet::invoke( %s ), will barf", - rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); throw uno::RuntimeException(); // unsupported operation } void SAL_CALL -ScVbaWorksheet::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { setDefaultPropByIntrospection( uno::makeAny( getValue( aPropertyName ) ), aValue ); } uno::Any SAL_CALL -ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) +ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } ::sal_Bool SAL_CALL -ScVbaWorksheet::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException) +ScVbaWorksheet::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException) { return false; } @@ -984,7 +984,7 @@ ScVbaWorksheet::getFormControls() } ::sal_Bool SAL_CALL -ScVbaWorksheet::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) +ScVbaWorksheet::hasProperty( const OUString& aName ) throw (uno::RuntimeException) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) @@ -993,7 +993,7 @@ ScVbaWorksheet::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeE } uno::Any -ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) +ScVbaWorksheet::getControlShape( const OUString& sName ) { // ideally we would get an XControl object but it appears an XControl // implementation only exists for a Control implementation optained from the @@ -1026,10 +1026,10 @@ ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) } -rtl::OUString +OUString ScVbaWorksheet::getServiceImplName() { - return rtl::OUString("ScVbaWorksheet"); + return OUString("ScVbaWorksheet"); } void SAL_CALL @@ -1045,23 +1045,23 @@ ScVbaWorksheet::getEnableCalculation( ) throw (css::script::BasicErrorException return xCalculatable->isAutomaticCalculationEnabled(); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWorksheet::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Worksheet" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Worksheet" ); } return aServiceNames; } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW ); - return xSheetProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); + return xSheetProp->getPropertyValue( OUString( "CodeName" ) ).get< OUString >(); } sal_Int16 diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 53efc595db1f..c3e40110dfdb 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -61,7 +61,7 @@ class ScVbaWorksheet : public WorksheetImpl_BASE css::uno::Reference< ov::excel::XRange > getSheetRange() throw (css::uno::RuntimeException); css::uno::Reference< css::container::XNameAccess > getFormControls(); - css::uno::Any getControlShape( const rtl::OUString& sName ); + css::uno::Any getControlShape( const OUString& sName ); public: ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, @@ -77,12 +77,12 @@ public: virtual css::uno::Reference< css::sheet::XSpreadsheet > getSheet() { return mxSheet; } static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); - css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( rtl::OUString); + css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( OUString); css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> xSheet, bool bAfter); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException); @@ -123,7 +123,7 @@ public: virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -147,19 +147,19 @@ public: virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException); // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException); // CodeName - virtual rtl::OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException); sal_Int16 getSheetID() throw (css::uno::RuntimeException); virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // XUnoTunnel virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException); }; diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 3986dcab2700..581f14f030e3 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -93,16 +93,16 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return sheet::XSpreadsheet::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( !mSheetMap.empty() ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( *cachePos ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > sNames( mSheetMap.size() ); - rtl::OUString* pString = sNames.getArray(); + uno::Sequence< OUString > sNames( mSheetMap.size() ); + OUString* pString = sNames.getArray(); SheetMap::iterator it = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -113,7 +113,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { cachePos = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -221,7 +221,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, if ( isSelectedSheets() ) return uno::Any(); // or should we throw? - rtl::OUString aStringSheet; + OUString aStringSheet; sal_Bool bBefore(sal_True); SCTAB nSheetIndex = 0; SCTAB nNewSheets = 1, nType = 0; @@ -361,7 +361,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } } else - throw uno::RuntimeException( rtl::OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL @@ -369,7 +369,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); ScMarkData& rMarkData = pViewShell->GetViewData()->GetMarkData(); sal_Bool bReplace = sal_True; @@ -465,33 +465,33 @@ ScVbaWorksheets::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (u } uno::Any -ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException) +ScVbaWorksheets::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException) { return ScVbaWorksheets_BASE::getItemByStringIndex( sIndex ); } -rtl::OUString +OUString ScVbaWorksheets::getServiceImplName() { - return rtl::OUString("ScVbaWorksheets"); + return OUString("ScVbaWorksheets"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaWorksheets::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Worksheets"); + sNames[0] = OUString("ooo.vba.excel.Worksheets"); } return sNames; } -bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) +bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference <container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY ); if ( xIndex.is() ) { diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index e011c43ff67e..61e6a52bfa6e 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -40,7 +40,7 @@ class ScVbaWorksheets : public ScVbaWorksheets_BASE css::uno::Reference< css::sheet::XSpreadsheets > m_xSheets; protected: // ScVbaWorksheets_BASE - virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException); public: ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xSheets, const css::uno::Reference< css::frame::XModel >& xModel ); ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XEnumerationAccess >& xEnum, const css::uno::Reference< css::frame::XModel >& xModel ); @@ -66,10 +66,10 @@ public: // ScVbaWorksheets_BASE virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); - static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); + static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); }; #endif /* SC_VBA_WORKSHEETS_HXX */ diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 4f507edfd91e..e629922fe88f 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -78,7 +78,7 @@ ScVbaWSFunction::getIntrospection(void) throw(uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { // create copy of parameters, replace Excel range objects with UNO range objects uno::Sequence< uno::Any > aParamTemp( Params ); @@ -122,9 +122,9 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< (*pArray) >>= aTmp[ 0 ]; (*pArray) <<= aTmp; } - else if ( aType.equals( getCppuType( (uno::Sequence<rtl::OUString>*)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence<OUString>*)0 ) ) ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aTmp(1); + uno::Sequence< uno::Sequence< OUString > > aTmp(1); (*pArray) >>= aTmp[ 0 ]; (*pArray) <<= aTmp; } @@ -139,7 +139,7 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< default: break; } - OSL_TRACE("Param[%d] is %s", (int)(pArray - aParamTemp.getConstArray()), rtl::OUStringToOString( comphelper::anyToString( *pArray ), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Param[%d] is %s", (int)(pArray - aParamTemp.getConstArray()), OUStringToOString( comphelper::anyToString( *pArray ), RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -179,10 +179,10 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< { uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XFunctionAccess > xFunctionAccess( xSMgr->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), + OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xFunctionAccess, uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue( ::rtl::OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); + xPropSet->setPropertyValue( OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); aRet = xFunctionAccess->callFunction( FunctionName, aParamTemp ); } @@ -245,19 +245,19 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< } void SAL_CALL -ScVbaWSFunction::setValue(const rtl::OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } uno::Any SAL_CALL -ScVbaWSFunction::getValue(const rtl::OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException) +ScVbaWSFunction::getValue(const OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } sal_Bool SAL_CALL -ScVbaWSFunction::hasMethod(const rtl::OUString& Name) throw(uno::RuntimeException) +ScVbaWSFunction::hasMethod(const OUString& Name) throw(uno::RuntimeException) { sal_Bool bIsFound = false; try @@ -277,34 +277,34 @@ ScVbaWSFunction::hasMethod(const rtl::OUString& Name) throw(uno::RuntimeExcepti } sal_Bool SAL_CALL -ScVbaWSFunction::hasProperty(const rtl::OUString& /*Name*/) throw(uno::RuntimeException) +ScVbaWSFunction::hasProperty(const OUString& /*Name*/) throw(uno::RuntimeException) { return false; } -::rtl::OUString SAL_CALL -ScVbaWSFunction::getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException) +OUString SAL_CALL +ScVbaWSFunction::getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException) { - rtl::OUString sName = aApproximateName.toAsciiUpperCase(); + OUString sName = aApproximateName.toAsciiUpperCase(); if ( !hasMethod( sName ) ) - return rtl::OUString(); + return OUString(); return sName; } -rtl::OUString +OUString ScVbaWSFunction::getServiceImplName() { - return rtl::OUString("ScVbaWSFunction"); + return OUString("ScVbaWSFunction"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWSFunction::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.WorksheetFunction" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.WorksheetFunction" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index cf6b439bd844..ce0f3cd87a91 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -35,15 +35,15 @@ public: virtual ~ScVbaWSFunction(){} virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke(const rtl::OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue(const rtl::OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue(const rtl::OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMethod(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index bdabddc92b9b..ea6d75cda660 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -60,7 +60,7 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId( HID_SCSHELL_AUDIT ); - SetName(rtl::OUString("Auditing")); + SetName(OUString("Auditing")); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index e1258f460e45..47dc5ed61128 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -78,7 +78,7 @@ ScCellShell::ScCellShell(ScViewData* pData) : bPastePossible(false) { SetHelpId(HID_SCSHELL_CELLSH); - SetName(rtl::OUString("Cell")); + SetName(OUString("Cell")); } ScCellShell::~ScCellShell() @@ -674,7 +674,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) // In interpreter may happen via rescheduled Basic if ( pDoc->IsInInterpreter() ) - rSet.Put( SfxStringItem( nWhich, rtl::OUString("...") ) ); + rSet.Put( SfxStringItem( nWhich, OUString("...") ) ); else { sal_uInt16 nErrCode = 0; @@ -764,7 +764,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) if ( !pDoc->IsScenario(nTab) ) { - rtl::OUString aStr; + OUString aStr; sal_uInt16 nFlags; SCTAB nScTab = nTab + 1; String aProtect; @@ -784,7 +784,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) } else { - rtl::OUString aComment; + OUString aComment; sal_uInt16 nDummyFlags; pDoc->GetScenarioData( nTab, aComment, aDummyCol, nDummyFlags ); OSL_ENSURE( aList.empty(), "List not empty!" ); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 93353d610729..4377c8012e88 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -93,7 +93,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) @@ -326,7 +325,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { const SfxPoolItem* pItem; - String aFlags = rtl::OUString('A'); + String aFlags = OUString('A'); if( pReqArgs->HasItem( SID_DELETE, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); @@ -440,7 +439,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { const SfxPoolItem* pItem; - String aFlags = rtl::OUString('A'); + String aFlags = OUString('A'); if( pReqArgs->HasItem( FID_FILL_TAB, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); @@ -937,7 +936,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) { - rtl::OUString aNewDimName( pDlg->GetDimensionName() ); + OUString aNewDimName( pDlg->GetDimensionName() ); pTabViewShell->SetDataPilotDetails( true, &aNewDimName ); } } @@ -1041,7 +1040,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - rtl::OUString aCol = bColumns ? rtl::OUString('C') : rtl::OUString('R'); + OUString aCol = bColumns ? OUString('C') : OUString('R'); rReq.AppendItem( SfxStringItem( SID_OUTLINE_MAKE, aCol ) ); rReq.Done(); } @@ -1107,7 +1106,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - rtl::OUString aCol = bColumns ? rtl::OUString('C') : rtl::OUString('R'); + OUString aCol = bColumns ? OUString('C') : OUString('R'); rReq.AppendItem( SfxStringItem( SID_OUTLINE_REMOVE, aCol ) ); rReq.Done(); } @@ -1204,7 +1203,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { const SfxPoolItem* pItem; - String aFlags = rtl::OUString('A'); + String aFlags = OUString('A'); if( pReqArgs->HasItem( FID_INS_CELL_CONTENTS, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); @@ -1387,7 +1386,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( ScTransferObj::GetOwnClipboard( pWin ) ) // own cell data { rReq.SetSlot( FID_INS_CELL_CONTENTS ); - rtl::OUString aFlags; + OUString aFlags; if ( nSlot == SID_PASTE_ONLY_VALUE ) aFlags = "V"; else if ( nSlot == SID_PASTE_ONLY_TEXT ) @@ -1606,7 +1605,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") + OUString("com.sun.star.linguistic2.ChineseTranslationDialog") , xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -1616,7 +1615,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = rtl::OUString("ParentWindow"); + aParam.Name = OUString("ParentWindow"); aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); @@ -1634,9 +1633,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { try { - xProp->getPropertyValue( rtl::OUString("IsDirectionToSimplified") ) >>= bToSimplified; - xProp->getPropertyValue( rtl::OUString("IsUseCharacterVariants") ) >>= bUseVariants; - xProp->getPropertyValue( rtl::OUString("IsTranslateCommonTerms") ) >>= bCommonTerms; + xProp->getPropertyValue( OUString("IsDirectionToSimplified") ) >>= bToSimplified; + xProp->getPropertyValue( OUString("IsUseCharacterVariants") ) >>= bUseVariants; + xProp->getPropertyValue( OUString("IsTranslateCommonTerms") ) >>= bCommonTerms; } catch( Exception& ) { @@ -2010,11 +2009,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // "=" in KeyEvent, switches to input-mode pScMod->InputKeyEvent( KeyEvent('=',KeyCode()) ); - std::vector<rtl::OUString> aNames = pDlg->GetSelectedNames(); + std::vector<OUString> aNames = pDlg->GetSelectedNames(); if (!aNames.empty()) { - rtl::OUStringBuffer aBuffer; - for (std::vector<rtl::OUString>::const_iterator itr = aNames.begin(); + OUStringBuffer aBuffer; + for (std::vector<OUString>::const_iterator itr = aNames.begin(); itr != aNames.end(); ++itr) { aBuffer.append(*itr).append(' '); @@ -2497,7 +2496,7 @@ void ScCellShell::ExecuteDataPilotDialog() { if ( pTypeDlg->IsExternal() ) { - uno::Sequence<rtl::OUString> aSources = ScDPObject::GetRegisteredSources(); + uno::Sequence<OUString> aSources = ScDPObject::GetRegisteredSources(); ::boost::scoped_ptr<AbstractScDataPilotServiceDlg> pServDlg( pFact->CreateScDataPilotServiceDlg( pTabViewShell->GetDialogParent(), aSources, RID_SCDLG_DAPISERVICE)); diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 75c9ddbd896e..45c94903bfb7 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -209,7 +209,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface(); uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame( - rtl::OUString("_beamer"), + OUString("_beamer"), frame::FrameSearchFlag::CHILDREN); if ( xBeamerFrame.is() ) bWasOpen = sal_True; diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 6a17bdd2626b..cd829dca0680 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -422,12 +422,12 @@ void ScCellShell::Execute( SfxRequest& rReq ) { SCTAB i=1; String aBaseName; - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); aBaseName = aTmp; aBaseName += '_'; diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 3a4bd17ca0b5..0bfc31209c83 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -52,7 +52,7 @@ ScDBFunc::~ScDBFunc() // auxiliary functions // -void ScDBFunc::GotoDBArea( const ::rtl::OUString& rDBName ) +void ScDBFunc::GotoDBArea( const OUString& rDBName ) { ScDocument* pDoc = GetViewData()->GetDocument(); ScDBCollection* pDBCol = pDoc->GetDBCollection(); diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index a0d9baa098c3..6338805a6617 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -81,9 +81,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::container::XNameAccess; using ::com::sun::star::sheet::XDimensionsSupplier; -using ::rtl::OUString; -using ::rtl::OUStringHash; -using ::rtl::OUStringBuffer; using ::std::auto_ptr; using ::std::list; using ::std::vector; @@ -587,7 +584,7 @@ bool ScDBFunc::MakePivotTable( SCTAB nSrcTab = GetViewData()->GetTabNo(); String aName( ScGlobal::GetRscString(STR_PIVOT_TABLE) ); - rtl::OUString aStr; + OUString aStr; pDoc->GetName( nSrcTab, aStr ); aName += '_'; @@ -946,7 +943,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar if (aEntries.empty()) return; - std::vector<rtl::OUString> aDeletedNames; + std::vector<OUString> aDeletedNames; bool bIsDataLayout; OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout ); @@ -954,7 +951,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar ScDPDimensionSaveData* pDimData = aData.GetDimensionData(); // created if not there // find the source dimension name. - rtl::OUString aBaseDimName = aDimName; + OUString aBaseDimName = aDimName; if( const ScDPSaveGroupDimension* pBaseGroupDim = pDimData->GetNamedGroupDim( aDimName ) ) aBaseDimName = pBaseGroupDim->GetSourceDimName(); @@ -1002,7 +999,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar else { // additional parts: create GroupDimension (shown as additional dimensions) - rtl::OUString aGroupDimName = + OUString aGroupDimName = pDimData->CreateDateGroupDimName(nMask, *pDPObj, true, &aDeletedNames); ScDPSaveGroupDimension aGroupDim( aBaseDimName, aGroupDimName ); aGroupDim.SetDateInfo( rInfo, nMask ); @@ -1095,7 +1092,7 @@ void ScDBFunc::GroupDataPilot() ScDPDimensionSaveData* pDimData = aData.GetDimensionData(); // created if not there // find original base - rtl::OUString aBaseDimName = aDimName; + OUString aBaseDimName = aDimName; const ScDPSaveGroupDimension* pBaseGroupDim = pDimData->GetNamedGroupDim( aDimName ); if ( pBaseGroupDim ) { @@ -1114,7 +1111,7 @@ void ScDBFunc::GroupDataPilot() ScDPUniqueStringSet::const_iterator it = aEntries.begin(), itEnd = aEntries.end(); for (; it != itEnd; ++it) { - const rtl::OUString& aEntryName = *it; + const OUString& aEntryName = *it; if ( pBaseGroupDim ) { // for each selected (intermediate) group, remove all its items @@ -1134,7 +1131,7 @@ void ScDBFunc::GroupDataPilot() if ( !pGroupDimension ) { // create a new group dimension - rtl::OUString aGroupDimName = + OUString aGroupDimName = pDimData->CreateGroupDimName(aBaseDimName, *pDPObj, false, NULL); pNewGroupDim = new ScDPSaveGroupDimension( aBaseDimName, aGroupDimName ); @@ -1164,14 +1161,14 @@ void ScDBFunc::GroupDataPilot() } } } - rtl::OUString aGroupDimName = pGroupDimension->GetGroupDimName(); + OUString aGroupDimName = pGroupDimension->GetGroupDimName(); - rtl::OUString aGroupName = pGroupDimension->CreateGroupName(ScGlobal::GetRscString(STR_PIVOT_GROUP)); + OUString aGroupName = pGroupDimension->CreateGroupName(ScGlobal::GetRscString(STR_PIVOT_GROUP)); ScDPSaveGroupItem aGroup( aGroupName ); ScDPUniqueStringSet::const_iterator it = aEntries.begin(), itEnd = aEntries.end(); for (; it != itEnd; ++it) { - const rtl::OUString& aEntryName = *it; + const OUString& aEntryName = *it; if ( pBaseGroupDim ) { // for each selected (intermediate) group, add all its items @@ -1335,7 +1332,7 @@ static OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, const return aBuf.makeStringAndClear(); } -void ScDBFunc::DataPilotInput( const ScAddress& rPos, const rtl::OUString& rString ) +void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) { using namespace ::com::sun::star::sheet; @@ -1624,7 +1621,7 @@ struct ScOUStringCollate ScOUStringCollate(CollatorWrapper* pColl) : mpCollator(pColl) {} - bool operator()(const rtl::OUString& rStr1, const rtl::OUString& rStr2) const + bool operator()(const OUString& rStr1, const OUString& rStr2) const { return ( mpCollator->compareString(rStr1, rStr2) < 0 ); } @@ -1664,7 +1661,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 typedef ScDPSaveDimension::MemberList MemList; const MemList& rDimMembers = pSaveDim->GetMembers(); list<OUString> aMembers; - boost::unordered_set<OUString, ::rtl::OUStringHash> aMemberSet; + boost::unordered_set<OUString, OUStringHash> aMemberSet; size_t nMemberCount = 0; for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end(); itr != itrEnd; ++itr) @@ -1785,8 +1782,8 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest bool bValid = ( aDestData.Dimension >= 0 ); // dropping onto a field // look through the source range - boost::unordered_set< rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString> > aMembersSet; // for lookup - std::vector< rtl::OUString > aMembersVector; // members in original order, for inserting + boost::unordered_set< OUString, OUStringHash, std::equal_to<OUString> > aMembersSet; // for lookup + std::vector< OUString > aMembersVector; // members in original order, for inserting aMembersVector.reserve( std::max( static_cast<SCSIZE>( rSource.aEnd.Col() - rSource.aStart.Col() + 1 ), static_cast<SCSIZE>( rSource.aEnd.Row() - rSource.aStart.Row() + 1 ) ) ); for (SCROW nRow = rSource.aStart.Row(); bValid && nRow <= rSource.aEnd.Row(); ++nRow ) @@ -1817,7 +1814,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest ScDPSaveDimension* pDim = aData.GetDimensionByName( aDimName ); // get all member names in source order - uno::Sequence<rtl::OUString> aMemberNames; + uno::Sequence<OUString> aMemberNames; pDPObj->GetMemberNames( aDestData.Dimension, aMemberNames ); bool bInserted = false; @@ -1830,7 +1827,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest if ( !bInserted && aMemberNames[nMemberPos] == aDestData.MemberName ) { // insert dragged items before this item - for ( std::vector<rtl::OUString>::const_iterator aIter = aMembersVector.begin(); + for ( std::vector<OUString>::const_iterator aIter = aMembersVector.begin(); aIter != aMembersVector.end(); ++aIter ) lcl_MoveToEnd( *pDim, *aIter ); bInserted = true; @@ -1841,7 +1838,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest } // insert dragged item at end if dest wasn't found (for example, empty) if ( !bInserted ) - for ( std::vector<rtl::OUString>::const_iterator aIter = aMembersVector.begin(); + for ( std::vector<OUString>::const_iterator aIter = aMembersVector.begin(); aIter != aMembersVector.end(); ++aIter ) lcl_MoveToEnd( *pDim, *aIter ); @@ -1906,7 +1903,7 @@ bool ScDBFunc::HasSelectionForDrillDown( sal_uInt16& rOrientation ) return bRet; } -void ScDBFunc::SetDataPilotDetails(bool bShow, const rtl::OUString* pNewDimensionName) +void ScDBFunc::SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName) { ScDPObject* pDPObj = GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); @@ -1968,7 +1965,7 @@ void ScDBFunc::SetDataPilotDetails(bool bShow, const rtl::OUString* pNewDimensio ScDPUniqueStringSet::const_iterator it = aVisibleEntries.begin(), itEnd = aVisibleEntries.end(); for (; it != itEnd; ++it) { - const rtl::OUString& aVisName = *it; + const OUString& aVisName = *it; ScDPSaveMember* pMember = pDim->GetMemberByName( aVisName ); pMember->SetShowDetails( false ); } @@ -2027,7 +2024,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet for (SCCOL nCol = 0; nCol < nColSize; ++nCol) { const Any& rAny = aTabData[nRow][nCol]; - rtl::OUString aStr; + OUString aStr; double fVal; if (rAny >>= aStr) { @@ -2043,7 +2040,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet // set number format (important for dates) for (SCCOL nCol = 0; nCol < nColSize; ++nCol) { - rtl::OUString aStr; + OUString aStr; if (!(aTabData[0][nCol] >>= aStr)) continue; @@ -2051,7 +2048,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet if (!xPropSet.is()) continue; - Any any = xPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_NUMBERFO)) ); + Any any = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_NUMBERFO)) ); sal_Int32 nNumFmt = 0; if (!(any >>= nNumFmt)) continue; @@ -2070,7 +2067,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet String aUndo = ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ); pMgr->EnterListAction( aUndo, aUndo ); - rtl::OUString aNewTabName; + OUString aNewTabName; pDoc->CreateValidTabName(aNewTabName); if ( InsertTable(aNewTabName, nNewTab) ) PasteFromClip( IDF_ALL, pInsDoc.get() ); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 20c33cef5111..787f55f6cbe5 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -95,7 +95,7 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) : { SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() ); SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() ); - SetName(rtl::OUString("EditCell")); + SetName(OUString("EditCell")); } ScEditShell::~ScEditShell() @@ -145,7 +145,7 @@ static void lcl_RemoveAttribs( EditView& rEditView ) void lclInsertCharacter( EditView* pTableView, EditView* pTopView, sal_Unicode cChar ) { - rtl::OUString aString( cChar ); + OUString aString( cChar ); if( pTableView ) pTableView->InsertText( aString ); if( pTopView ) @@ -413,11 +413,11 @@ void ScEditShell::Execute( SfxRequest& rReq ) if ( nRet == BTN_PASTE_NAME ) { - std::vector<rtl::OUString> aNames = pDlg->GetSelectedNames(); + std::vector<OUString> aNames = pDlg->GetSelectedNames(); if (!aNames.empty()) { - rtl::OUStringBuffer aBuffer; - for (std::vector<rtl::OUString>::const_iterator itr = aNames.begin(); + OUStringBuffer aBuffer; + for (std::vector<OUString>::const_iterator itr = aNames.begin(); itr != aNames.end(); ++itr) { aBuffer.append(*itr).append(' '); @@ -1087,7 +1087,7 @@ String ScEditShell::GetSelectionText( sal_Bool bWholeWord ) ESelection aSel = pEditView->GetSelection(); String aStrCurrentDelimiters = pEngine->GetWordDelimiters(); - pEngine->SetWordDelimiters(rtl::OUString(" .,;\"'")); + pEngine->SetWordDelimiters(OUString(" .,;\"'")); aStrSelection = pEngine->GetWord( aSel.nEndPara, aSel.nEndPos ); pEngine->SetWordDelimiters( aStrCurrentDelimiters ); } diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 8a0908155cc7..20b0c99e4998 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -140,7 +140,7 @@ ScFormatShell::ScFormatShell(ScViewData* pData) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId(HID_SCSHELL_FORMATSH); - SetName(rtl::OUString("Format")); + SetName(OUString("Format")); } ScFormatShell::~ScFormatShell() @@ -342,8 +342,8 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) xCont->getByName(pFamilyItem->GetValue()) >>= xStyles; com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xInfo; xStyles->getByName( pNameItem->GetValue() ) >>= xInfo; - ::rtl::OUString aUIName; - xInfo->getPropertyValue( ::rtl::OUString("DisplayName") ) >>= aUIName; + OUString aUIName; + xInfo->getPropertyValue( OUString("DisplayName") ) >>= aUIName; if ( !aUIName.isEmpty() ) rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) ); } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 4f5774c2b9ce..145b887eb2ed 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -132,7 +132,6 @@ using namespace com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; const sal_uInt8 SC_NESTEDBUTTON_NONE = 0; const sal_uInt8 SC_NESTEDBUTTON_DOWN = 1; @@ -576,7 +575,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSel if ( bHasSelection ) { - const ::rtl::OUString aName = rStr; + const OUString aName = rStr; pDim->SetCurrentPage( &aName ); } else @@ -626,12 +625,12 @@ public: } }; -class AddItemToEntry : public std::unary_function<rtl::OUString, void> +class AddItemToEntry : public std::unary_function<OUString, void> { ScQueryEntry::QueryItemsType& mrItems; public: AddItemToEntry(ScQueryEntry::QueryItemsType& rItems) : mrItems(rItems) {} - void operator() (const rtl::OUString& rSelected) + void operator() (const OUString& rSelected) { ScQueryEntry::Item aNew; aNew.maString = rSelected; @@ -643,9 +642,9 @@ public: class AddSelectedItemString : public std::unary_function<ScQueryEntry::Item, void> { - boost::unordered_set<rtl::OUString, rtl::OUStringHash>& mrSet; + boost::unordered_set<OUString, OUStringHash>& mrSet; public: - AddSelectedItemString(boost::unordered_set<rtl::OUString, rtl::OUStringHash>& r) : + AddSelectedItemString(boost::unordered_set<OUString, OUStringHash>& r) : mrSet(r) {} void operator() (const ScQueryEntry::Item& rItem) @@ -684,7 +683,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) ScQueryParam aParam; pDBData->GetQueryParam(aParam); ScQueryEntry* pEntry = aParam.FindEntryByField(nCol, false); - boost::unordered_set<rtl::OUString, rtl::OUStringHash> aSelected; + boost::unordered_set<OUString, OUStringHash> aSelected; if (pEntry && pEntry->bDoQuery) { if (pEntry->eOp == SC_EQUAL) @@ -703,7 +702,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) std::vector<ScTypedStrData>::const_iterator it = aStrings.begin(), itEnd = aStrings.end(); for (; it != itEnd; ++it) { - const rtl::OUString& aVal = it->GetString(); + const OUString& aVal = it->GetString(); bool bSelected = true; if (!aSelected.empty()) bSelected = aSelected.count(aVal) > 0; @@ -836,7 +835,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode) ScCheckListMenuWindow::ResultType aResult; mpAutoFilterPopup->getResult(aResult); - std::vector<rtl::OUString> aSelected; + std::vector<OUString> aSelected; ScCheckListMenuWindow::ResultType::const_iterator itr = aResult.begin(), itrEnd = aResult.end(); for (; itr != itrEnd; ++itr) { @@ -852,7 +851,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode) case Top10: pEntry->eOp = SC_TOPVAL; pEntry->GetQueryItem().meType = ScQueryEntry::ByString; - pEntry->GetQueryItem().maString = rtl::OUString("10"); + pEntry->GetQueryItem().maString = OUString("10"); break; case Empty: pEntry->SetQueryByEmpty(); @@ -980,8 +979,8 @@ void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange ) // Listbox fuellen long nMaxText = 0; - rtl::OUString aCurrent; - rtl::OUString aTabName; + OUString aCurrent; + OUString aTabName; SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nEntryCount = 0; for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++) @@ -1210,7 +1209,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec bValid = false; if (rEntry.nField == nCol) { - const rtl::OUString& rQueryStr = rEntry.GetQueryItem().maString; + const OUString& rQueryStr = rEntry.GetQueryItem().maString; if (rEntry.eOp == SC_EQUAL) { if (!rQueryStr.isEmpty()) @@ -1434,7 +1433,7 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, if ( nSel == SC_AUTOFILTER_TOP10 ) { rNewEntry.eOp = SC_TOPVAL; - rItem.maString = rtl::OUString("10"); + rItem.maString = OUString("10"); } else if (nSel == SC_AUTOFILTER_EMPTY) { @@ -3437,7 +3436,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) ScDocument* pThisDoc = pViewData->GetDocument(); if (pSourceDoc == pThisDoc) { - rtl::OUString aName; + OUString aName; if ( pThisDoc->HasChartAtPoint(pViewData->GetTabNo(), PixelToLogic(aPos), aName )) { if (bDragRect) // Rechteck loeschen @@ -3654,7 +3653,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { if ( !rData.aLinkDoc.isEmpty() ) { - rtl::OUString aThisName; + OUString aThisName; ScDocShell* pDocSh = pViewData->GetDocShell(); if (pDocSh && pDocSh->HasName()) aThisName = pDocSh->GetMedium()->GetName(); @@ -3988,7 +3987,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos } else // move/copy block { - rtl::OUString aChartName; + OUString aChartName; if (pThisDoc->HasChartAtPoint( nThisTab, rLogicPos, aChartName )) { String aRangeName; @@ -4178,9 +4177,9 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos aSource.Format( aItem, SCA_VALID | SCA_TAB_3D, pSourceDoc ); // TODO: we could define ocQuote for " - const rtl::OUString aQuote('"'); + const OUString aQuote('"'); const String& sSep = ScCompiler::GetNativeSymbol( ocSep); - rtl::OUStringBuffer aFormula; + OUStringBuffer aFormula; aFormula.append('='); aFormula.append(ScCompiler::GetNativeSymbol(ocDde)); aFormula.append(ScCompiler::GetNativeSymbol(ocOpen)); @@ -4270,7 +4269,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) // try to insert a link bool bOk = true; - rtl::OUString aThisName; + OUString aThisName; ScDocShell* pDocSh = pViewData->GetDocShell(); if (pDocSh && pDocSh->HasName()) aThisName = pDocSh->GetMedium()->GetName(); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 150d3858392b..7edc66a4240a 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -52,8 +52,6 @@ using ::com::sun::star::sheet::DataPilotFieldOrientation; using ::std::vector; using ::std::auto_ptr; using ::boost::unordered_map; -using ::rtl::OUString; -using ::rtl::OUStringHash; // STATIC DATA ----------------------------------------------------------- @@ -476,7 +474,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu( for (size_t i = 0; i < n; ++i) { const ScDPLabelData::Member& rMem = rLabelData.maMembers[i]; - rtl::OUString aName = rMem.getDisplayName(); + OUString aName = rMem.getDisplayName(); if (aName.isEmpty()) // Use special string for an empty name. mpDPFieldPopup->addMember(ScGlobal::GetRscString(STR_EMPTYDATA), rMem.mbVisible); @@ -573,10 +571,10 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu() if (itrNameMap == aMemNameMap.end()) { // This is an original member name. Use it as-is. - rtl::OUString aName = itr->first; + OUString aName = itr->first; if (aName.equals(ScGlobal::GetRscString(STR_EMPTYDATA))) // Translate the special empty name into an empty string. - aName = rtl::OUString(); + aName = OUString(); aResult.insert( ScCheckListMenuWindow::ResultType::value_type( diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 767dfd2ef8dd..bf6124787b84 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -226,12 +226,12 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S sal_Bool bTextBelow = ( aRange.aStart.Row() == 0 ); - rtl::OUString aCurrent; + OUString aCurrent; Color aColor( COL_LIGHTGRAY ); for (SCTAB nAct=nTab+1; nAct<nTabCount && pDoc->IsScenario(nAct); nAct++) if ( pDoc->IsActiveScenario(nAct) && pDoc->HasScenarioRange(nAct,aRange) ) { - rtl::OUString aDummyComment; + OUString aDummyComment; sal_uInt16 nDummyFlags; pDoc->GetName( nAct, aCurrent ); pDoc->GetScenarioData( nAct, aDummyComment, aColor, nDummyFlags ); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 9789a24ba8d1..7055c223d9e3 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -150,7 +150,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) aTrackText += aComStr; aTrackText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "\n( " )); } - rtl::OUString aTmp; + OUString aTmp; pFound->GetDescription(aTmp, pDoc); aTrackText += String(aTmp); if(aComStr.Len()>0) diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 3a826749a48c..aceb806b888e 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -75,14 +75,14 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn bBoldSet = sal_True; Size aSize = LogicToPixel( Size( - GetTextWidth(rtl::OUString("8888")), + GetTextWidth(OUString("8888")), GetTextHeight() ) ); aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung aSize.Height() += 3; SetSizePixel( aSize ); nWidth = nSmallWidth = aSize.Width(); - nBigWidth = LogicToPixel( Size( GetTextWidth(rtl::OUString("8888888")), 0 ) ).Width() + 5; + nBigWidth = LogicToPixel( Size( GetTextWidth(OUString("8888888")), 0 ) ).Width() + 5; SetBackground(); // sonst Probleme auf OS/2 !?!?! } diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index fa5fd662f9f5..1eef35b0f5a7 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -91,8 +91,8 @@ class ScActionColorChanger { private: const ScAppOptions& rOpt; - const std::set<rtl::OUString>& rUsers; - rtl::OUString aLastUserName; + const std::set<OUString>& rUsers; + OUString aLastUserName; size_t nLastUserIndex; ColorData nColor; @@ -143,7 +143,7 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction ) if (!aLastUserName.equals(rAction.GetUser())) { aLastUserName = rAction.GetUser(); - std::set<rtl::OUString>::const_iterator it = rUsers.find(aLastUserName); + std::set<OUString>::const_iterator it = rUsers.find(aLastUserName); if (it == rUsers.end()) { // empty string is possible if a name wasn't found while saving a 5.0 file diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index c1bf7ebc5c3b..b04a0d01c0e4 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -542,7 +542,7 @@ bool ScDrawStringsVars::SetText( ScRefCellValue& rCell ) void ScDrawStringsVars::SetHashText() { - SetAutoText(rtl::OUString("###")); + SetAutoText(OUString("###")); } void ScDrawStringsVars::RepeatToFill( long colWidth ) @@ -550,7 +550,7 @@ void ScDrawStringsVars::RepeatToFill( long colWidth ) if ( nPos == STRING_NOTFOUND || nPos > aString.Len() ) return; - long charWidth = pOutput->pFmtDevice->GetTextWidth(rtl::OUString(nChar)); + long charWidth = pOutput->pFmtDevice->GetTextWidth(OUString(nChar)); if ( charWidth < 1) return; if (bPixelToLogic) colWidth = pOutput->mpRefDevice->PixelToLogic(Size(colWidth,0)).Width(); @@ -717,7 +717,7 @@ long ScDrawStringsVars::GetMaxDigitWidth() for (sal_Char i = 0; i < 10; ++i) { sal_Char cDigit = cZero + i; - long n = pOutput->pFmtDevice->GetTextWidth(rtl::OUString(cDigit)); + long n = pOutput->pFmtDevice->GetTextWidth(OUString(cDigit)); nMaxDigitWidth = ::std::max(nMaxDigitWidth, n); } return nMaxDigitWidth; @@ -728,7 +728,7 @@ long ScDrawStringsVars::GetSignWidth() if (nSignWidth > 0) return nSignWidth; - nSignWidth = pOutput->pFmtDevice->GetTextWidth(rtl::OUString('-')); + nSignWidth = pOutput->pFmtDevice->GetTextWidth(OUString('-')); return nSignWidth; } @@ -737,7 +737,7 @@ long ScDrawStringsVars::GetDotWidth() if (nDotWidth > 0) return nDotWidth; - const ::rtl::OUString& sep = ScGlobal::GetpLocaleData()->getLocaleItem().decimalSeparator; + const OUString& sep = ScGlobal::GetpLocaleData()->getLocaleItem().decimalSeparator; nDotWidth = pOutput->pFmtDevice->GetTextWidth(sep); return nDotWidth; } @@ -747,7 +747,7 @@ long ScDrawStringsVars::GetExpWidth() if (nExpWidth > 0) return nExpWidth; - nExpWidth = pOutput->pFmtDevice->GetTextWidth(rtl::OUString('E')); + nExpWidth = pOutput->pFmtDevice->GetTextWidth(OUString('E')); return nExpWidth; } @@ -1371,7 +1371,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY namespace { -bool beginsWithRTLCharacter(const rtl::OUString& rStr) +bool beginsWithRTLCharacter(const OUString& rStr) { if (rStr.isEmpty()) return false; @@ -2796,7 +2796,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -3178,7 +3178,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -3548,7 +3548,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -3930,7 +3930,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -4339,7 +4339,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -4641,7 +4641,7 @@ void ScOutputData::DrawEdit(sal_Bool bPixelToLogic) lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(sal_False) // fdo#32530: Check if the first character is RTL. - rtl::OUString aStr = mpDoc->GetString(nCellX, nCellY, nTab); + OUString aStr = mpDoc->GetString(nCellX, nCellY, nTab); DrawEditParam aParam(pPattern, pCondSet, lcl_SafeIsValue(aCell)); aParam.mbPixelToLogic = bPixelToLogic; @@ -4966,7 +4966,7 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic) { sal_uLong nFormat = pPattern->GetNumberFormat( mpDoc->GetFormatTable(), pCondSet ); - rtl::OUString aString; + OUString aString; Color* pColor; ScCellFormat::GetString( aCell, nFormat,aString, &pColor, diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 3186eac69d64..e5b2c33f6e25 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -59,7 +59,7 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId( HID_SCSHELL_PAGEBREAK ); - SetName(rtl::OUString("PageBreak")); + SetName(OUString("PageBreak")); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index f4607a18adb3..57a7b56ad33d 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -67,7 +67,7 @@ ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId( HID_SCSHELL_PIVOTSH ); - SetName(rtl::OUString("Pivot")); + SetName(OUString("Pivot")); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 5358705cd3d8..1ad8f0f06259 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -139,7 +139,7 @@ void ScPreviewShell::Construct( Window* pParent ) pVerScroll->Show( false ); pCorner->Show(); SetHelpId( HID_SCSHELL_PREVWSH ); - SetName(rtl::OUString("Preview")); + SetName(OUString("Preview")); } ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, @@ -208,7 +208,7 @@ void ScPreviewShell::InitStartTable(SCTAB nTab) String ScPreviewShell::GetDescription() const { - return rtl::OUString(" ** Test ** "); + return OUString(" ** Test ** "); } void ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) @@ -896,7 +896,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) { ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab = pPreview->GetTab(); - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); rData.aTabName = aTmp; @@ -951,14 +951,14 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue if(pSeq) { sal_uInt16 nViewID(GetViewFrame()->GetCurViewId()); - pSeq[0].Name = rtl::OUString(SC_VIEWID); - rtl::OUStringBuffer sBuffer(rtl::OUString(SC_VIEW)); + pSeq[0].Name = OUString(SC_VIEWID); + OUStringBuffer sBuffer(OUString(SC_VIEW)); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nViewID)); pSeq[0].Value <<= sBuffer.makeStringAndClear(); - pSeq[1].Name = rtl::OUString(SC_ZOOMVALUE); + pSeq[1].Name = OUString(SC_ZOOMVALUE); pSeq[1].Value <<= sal_Int32 (pPreview->GetZoom()); - pSeq[2].Name = rtl::OUString("PageNumber"); + pSeq[2].Name = OUString("PageNumber"); pSeq[2].Value <<= pPreview->GetPageNo(); } } @@ -973,7 +973,7 @@ void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyV { for(sal_Int32 i = 0; i < nCount; i++, pSeq++) { - rtl::OUString sName(pSeq->Name); + OUString sName(pSeq->Name); if(sName.compareToAscii(SC_ZOOMVALUE) == 0) { sal_Int32 nTemp = 0; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 6214fa22f0b4..15fea31959dc 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1646,7 +1646,7 @@ sal_Bool ScPrintFunc::IsLeft( long nPageNo ) // left foot notes? void ScPrintFunc::MakeTableString() { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nPrintTab, aTmp); aFieldData.aTabName = aTmp; } @@ -1841,7 +1841,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, sal_Bool bDoPrint, ScPreviewLocation ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT; ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont( aMarkFont, eColorMode ); pDev->SetFont( aMarkFont ); - long nMarkLen = pDev->GetTextWidth(rtl::OUString("GW99999:")); + long nMarkLen = pDev->GetTextWidth(OUString("GW99999:")); // without Space-Char, because it rarle arrives there Size aDataSize = aPageRect.GetSize(); @@ -2377,7 +2377,7 @@ sal_Bool ScPrintFunc::UpdatePages() nZoom = ZOOM_MIN; } - rtl::OUString aName = pDoc->GetPageStyle( nPrintTab ); + OUString aName = pDoc->GetPageStyle( nPrintTab ); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) if ( nTab==nPrintTab || pDoc->GetPageStyle(nTab)==aName ) diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index d1fe9d40058f..a0394a4169b0 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -51,7 +51,7 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) : { ScDocument* pDoc = pViewData->GetDocument(); - rtl::OUString aString; + OUString aString; Color aTabBgColor; SCTAB nCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nCount; i++) @@ -170,7 +170,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt ) ScModule* pScMod = SC_MOD(); if (!pDoc->IsDocEditable() || pScMod->IsTableLocked()) return; - rtl::OUString aName; + OUString aName; pDoc->CreateValidTabName(aName); SCTAB nTabCount = pDoc->GetTableCount(); pViewData->GetViewShell()->InsertTable(aName, nTabCount); @@ -299,7 +299,7 @@ void ScTabControl::UpdateStatus() SCTAB nCount = pDoc->GetTableCount(); SCTAB i; - rtl::OUString aString; + OUString aString; SCTAB nMaxCnt = Max( nCount, static_cast<SCTAB>(GetMaxId()) ); Color aTabBgColor; @@ -313,7 +313,7 @@ void ScTabControl::UpdateStatus() } else { - aString = rtl::OUString(); + aString = OUString(); } if ( !aString.equals(GetPageText(static_cast<sal_uInt16>(i)+1)) || (GetTabBgColor(static_cast<sal_uInt16>(i)+1) != aTabBgColor) ) diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index da817a124d7d..e1041b1964d5 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -803,7 +803,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) GetStaticInterface()->GetSlot(SID_SELECT_TABLES)->GetCommand(), HID_SELECTTABLES ); // fill all table names with selection state - rtl::OUString aTabName; + OUString aTabName; for( nTab = 0; nTab < nTabCount; ++nTab ) { rDoc.GetName( nTab, aTabName ); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 04af91d985d6..ecc73952b53a 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1474,7 +1474,7 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) bReadOnly = pDocSh->IsReadOnly(); - SetName(rtl::OUString("View")); // fuer SBX + SetName(OUString("View")); // fuer SBX Color aColBlack( COL_BLACK ); SetPool( &SC_MOD()->GetPool() ); SetWindow( GetActiveWin() ); @@ -1777,7 +1777,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) ScDocShell* pDocShell = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab = GetViewData()->GetTabNo(); - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); rData.aTabName = aTmp; diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 7436c3c8e526..24b61924041a 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -143,7 +143,7 @@ ScInputHandler* ScTabViewShell::GetInputHandler() const String ScTabViewShell::GetDescription() const { - return rtl::OUString(" ** Test ** "); + return OUString(" ** Test ** "); } void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index b1fc8d378b0d..2b31d63f95d4 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -565,7 +565,7 @@ void ScTabViewShell::GetUndoState(SfxItemSet &rSet) size_t nCount = bIsUndo ? pUndoManager->GetUndoActionCount() : pUndoManager->GetRedoActionCount(); for (size_t i=0; i<nCount; ++i) { - aList.push_back( rtl::OUString( bIsUndo ? pUndoManager->GetUndoActionComment(i) : + aList.push_back( OUString( bIsUndo ? pUndoManager->GetUndoActionComment(i) : pUndoManager->GetRedoActionComment(i) ) ); } } diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 3652415e2290..6c70b2a10cf8 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -150,7 +150,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( { if (!mbInSwitch) { - std::map<rtl::OUString, ScRangeName*> aRangeMap; + std::map<OUString, ScRangeName*> aRangeMap; pDoc->GetRangeNameMap(aRangeMap); pResult = new ScNameDefDlg( pB, pCW, pParent, GetViewData(), aRangeMap, ScAddress( GetViewData()->GetCurX(), @@ -159,11 +159,11 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( } else { - std::map<rtl::OUString, ScRangeName*> aRangeMap; - for (boost::ptr_map<rtl::OUString, ScRangeName>::iterator itr = maRangeMap.begin(); + std::map<OUString, ScRangeName*> aRangeMap; + for (boost::ptr_map<OUString, ScRangeName>::iterator itr = maRangeMap.begin(); itr != maRangeMap.end(); ++itr) { - aRangeMap.insert(std::pair<rtl::OUString, ScRangeName*>(itr->first, itr->second)); + aRangeMap.insert(std::pair<OUString, ScRangeName*>(itr->first, itr->second)); } pResult = new ScNameDefDlg( pB, pCW, pParent, GetViewData(), aRangeMap, ScAddress( GetViewData()->GetCurX(), diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index ee01c6bde6e7..8a64214c1176 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -96,7 +96,7 @@ String ScTabViewShell::GetSelectionText( sal_Bool bWholeWord ) ScImportExport aObj( pDoc, aRange ); aObj.SetFormulas( GetViewData()->GetOptions().GetOption( VOPT_FORMULAS ) ); - rtl::OUString aExportOUString; + OUString aExportOUString; aObj.ExportString( aExportOUString ); aStrSelection = convertLineEnd(aExportOUString, LINEEND_CR); diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index d26c22aae5b1..f3db8bc07b28 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -71,7 +71,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { case FID_TABLE_VISIBLE: { - rtl::OUString aName; + OUString aName; pDoc->GetName( nCurrentTab, aName ); sal_Bool bVisible=sal_True; @@ -134,7 +134,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) AbstractScShowTabDlg* pDlg = pFact->CreateScShowTabDlg( GetDialogParent(), RID_SCDLG_SHOW_TAB); OSL_ENSURE(pDlg, "Dialog create fail!"); - rtl::OUString aTabName; + OUString aTabName; sal_Bool bFirst = sal_True; for ( SCTAB i=0; i != nTabCount; i++ ) { @@ -256,7 +256,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - std::vector<rtl::OUString> aNames(0); + std::vector<OUString> aNames(0); InsertTables( aNames, nTabNr,nCount ); } } @@ -286,7 +286,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - std::vector<rtl::OUString> aNames(0); + std::vector<OUString> aNames(0); InsertTables( aNames, nTabAfter,nCount); } } @@ -352,7 +352,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) sal_uInt16 nRet = RET_OK; sal_Bool bDone = false; String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); - rtl::OUString aName; + OUString aName; String aDlgTitle; const sal_Char* pHelpId = 0; @@ -437,8 +437,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) sal_uInt16 nDoc = 0; SCTAB nTab = pViewData->GetTabNo(); sal_Bool bCpy = false; - rtl::OUString aDocName; - rtl::OUString aTabName; + OUString aDocName; + OUString aTabName; if( pReqArgs != NULL ) { @@ -496,7 +496,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - rtl::OUString aDefaultName; + OUString aDefaultName; pDoc->GetName( pViewData->GetTabNo(), aDefaultName ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -878,7 +878,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_TAB_RENAME: { - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( nTab, aTabName ); rSet.Put( SfxStringItem( nWhich, aTabName )); diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index 4fafbe90f011..b477f0d1dba3 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -71,27 +71,27 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Any aAny; - aAny <<= rtl::OUString(rName); - xPropSet->setPropertyValue( rtl::OUString( "Label" ), aAny ); + aAny <<= OUString(rName); + xPropSet->setPropertyValue( OUString( "Label" ), aAny ); - ::rtl::OUString aTmp = INetURLObject::GetAbsURL( pDoc->GetDocumentShell()->GetMedium()->GetBaseURL(), rURL ); + OUString aTmp = INetURLObject::GetAbsURL( pDoc->GetDocumentShell()->GetMedium()->GetBaseURL(), rURL ); aAny <<= aTmp; - xPropSet->setPropertyValue( rtl::OUString( "TargetURL" ), aAny ); + xPropSet->setPropertyValue( OUString( "TargetURL" ), aAny ); if( rTarget.Len() ) { - aAny <<= rtl::OUString(rTarget); - xPropSet->setPropertyValue( rtl::OUString( "TargetFrame" ), aAny ); + aAny <<= OUString(rTarget); + xPropSet->setPropertyValue( OUString( "TargetFrame" ), aAny ); } form::FormButtonType eButtonType = form::FormButtonType_URL; aAny <<= eButtonType; - xPropSet->setPropertyValue( rtl::OUString( "ButtonType" ), aAny ); + xPropSet->setPropertyValue( OUString( "ButtonType" ), aAny ); if ( ::avmedia::MediaWindow::isMediaURL( rURL ) ) { aAny <<= sal_True; - xPropSet->setPropertyValue( rtl::OUString( "DispatchURLInternal" ), aAny ); + xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), aAny ); } Point aPos; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 2f50245d4760..0068209e7a46 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -112,45 +112,45 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue> beans::PropertyValue* pSettings = rSettings.getArray(); if (pSettings) { - pSettings[SC_CURSOR_X].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONX)); + pSettings[SC_CURSOR_X].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONX)); pSettings[SC_CURSOR_X].Value <<= sal_Int32(nCurX); - pSettings[SC_CURSOR_Y].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONY)); + pSettings[SC_CURSOR_Y].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONY)); pSettings[SC_CURSOR_Y].Value <<= sal_Int32(nCurY); - pSettings[SC_HORIZONTAL_SPLIT_MODE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITMODE)); + pSettings[SC_HORIZONTAL_SPLIT_MODE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITMODE)); pSettings[SC_HORIZONTAL_SPLIT_MODE].Value <<= sal_Int16(eHSplitMode); - pSettings[SC_VERTICAL_SPLIT_MODE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITMODE)); + pSettings[SC_VERTICAL_SPLIT_MODE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITMODE)); pSettings[SC_VERTICAL_SPLIT_MODE].Value <<= sal_Int16(eVSplitMode); - pSettings[SC_HORIZONTAL_SPLIT_POSITION].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITPOSITION)); + pSettings[SC_HORIZONTAL_SPLIT_POSITION].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITPOSITION)); if (eHSplitMode == SC_SPLIT_FIX) pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosX); else pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nHSplitPos); - pSettings[SC_VERTICAL_SPLIT_POSITION].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITPOSITION)); + pSettings[SC_VERTICAL_SPLIT_POSITION].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITPOSITION)); if (eVSplitMode == SC_SPLIT_FIX) pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosY); else pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nVSplitPos); - pSettings[SC_ACTIVE_SPLIT_RANGE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVESPLITRANGE)); + pSettings[SC_ACTIVE_SPLIT_RANGE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVESPLITRANGE)); pSettings[SC_ACTIVE_SPLIT_RANGE].Value <<= sal_Int16(eWhichActive); - pSettings[SC_POSITION_LEFT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONLEFT)); + pSettings[SC_POSITION_LEFT].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONLEFT)); pSettings[SC_POSITION_LEFT].Value <<= sal_Int32(nPosX[SC_SPLIT_LEFT]); - pSettings[SC_POSITION_RIGHT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONRIGHT)); + pSettings[SC_POSITION_RIGHT].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONRIGHT)); pSettings[SC_POSITION_RIGHT].Value <<= sal_Int32(nPosX[SC_SPLIT_RIGHT]); - pSettings[SC_POSITION_TOP].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONTOP)); + pSettings[SC_POSITION_TOP].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONTOP)); pSettings[SC_POSITION_TOP].Value <<= sal_Int32(nPosY[SC_SPLIT_TOP]); - pSettings[SC_POSITION_BOTTOM].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONBOTTOM)); + pSettings[SC_POSITION_BOTTOM].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONBOTTOM)); pSettings[SC_POSITION_BOTTOM].Value <<= sal_Int32(nPosY[SC_SPLIT_BOTTOM]); sal_Int32 nZoomValue ((aZoomY.GetNumerator() * 100) / aZoomY.GetDenominator()); sal_Int32 nPageZoomValue ((aPageZoomY.GetNumerator() * 100) / aPageZoomY.GetDenominator()); - pSettings[SC_TABLE_ZOOM_TYPE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); + pSettings[SC_TABLE_ZOOM_TYPE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); pSettings[SC_TABLE_ZOOM_TYPE].Value <<= sal_Int16(eZoomType); - pSettings[SC_TABLE_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); + pSettings[SC_TABLE_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); pSettings[SC_TABLE_ZOOM_VALUE].Value <<= nZoomValue; - pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); + pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; - pSettings[SC_TABLE_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); + pSettings[SC_TABLE_SHOWGRID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(bShowGrid); } } @@ -170,7 +170,7 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV bool bHasHSplitInTwips = false; for (sal_Int32 i = 0; i < nCount; i++) { - rtl::OUString sName(aSettings[i].Name); + OUString sName(aSettings[i].Name); if (sName.compareToAscii(SC_CURSORPOSITIONX) == 0) { aSettings[i].Value >>= nTemp32; @@ -2613,8 +2613,8 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe if (pSettings) { sal_uInt16 nViewID(pViewShell->GetViewFrame()->GetCurViewId()); - pSettings[SC_VIEW_ID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEWID)); - rtl::OUStringBuffer sBuffer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEW))); + pSettings[SC_VIEW_ID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEWID)); + OUStringBuffer sBuffer(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEW))); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nViewID)); pSettings[SC_VIEW_ID].Value <<= sBuffer.makeStringAndClear(); @@ -2627,7 +2627,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe { uno::Sequence <beans::PropertyValue> aTableViewSettings; maTabData[nTab]->WriteUserDataSequence(aTableViewSettings, *this, nTab); - rtl::OUString sTabName; + OUString sTabName; GetDocument()->GetName( nTab, sTabName ); uno::Any aAny; aAny <<= aTableViewSettings; @@ -2646,61 +2646,61 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe } } } - pSettings[SC_TABLE_VIEWSETTINGS].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLES)); + pSettings[SC_TABLE_VIEWSETTINGS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLES)); pSettings[SC_TABLE_VIEWSETTINGS].Value <<= xNameContainer; - rtl::OUString sName; + OUString sName; GetDocument()->GetName( nTabNo, sName ); - pSettings[SC_ACTIVE_TABLE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + pSettings[SC_ACTIVE_TABLE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); pSettings[SC_ACTIVE_TABLE].Value <<= sName; - pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSCROLLBARWIDTH)); + pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSCROLLBARWIDTH)); pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Value <<= sal_Int32(pView->GetTabBarWidth()); sal_Int32 nZoomValue ((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); sal_Int32 nPageZoomValue ((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator()); - pSettings[SC_ZOOM_TYPE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); + pSettings[SC_ZOOM_TYPE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); pSettings[SC_ZOOM_TYPE].Value <<= sal_Int16(pThisTab->eZoomType); - pSettings[SC_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); + pSettings[SC_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); pSettings[SC_ZOOM_VALUE].Value <<= nZoomValue; - pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); + pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; - pSettings[SC_PAGE_BREAK_PREVIEW].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SHOWPAGEBREAKPREVIEW)); + pSettings[SC_PAGE_BREAK_PREVIEW].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SHOWPAGEBREAKPREVIEW)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_PAGE_BREAK_PREVIEW].Value, bPagebreak); if (pOptions) { - pSettings[SC_SHOWZERO].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWZERO)); + pSettings[SC_SHOWZERO].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWZERO)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWZERO].Value, pOptions->GetOption( VOPT_NULLVALS ) ); - pSettings[SC_SHOWNOTES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWNOTES)); + pSettings[SC_SHOWNOTES].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWNOTES)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWNOTES].Value, pOptions->GetOption( VOPT_NOTES ) ); - pSettings[SC_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); + pSettings[SC_SHOWGRID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWGRID].Value, pOptions->GetOption( VOPT_GRID ) ); - pSettings[SC_GRIDCOLOR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_GRIDCOLOR)); + pSettings[SC_GRIDCOLOR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_GRIDCOLOR)); String aColorName; Color aColor = pOptions->GetGridColor(&aColorName); pSettings[SC_GRIDCOLOR].Value <<= static_cast<sal_Int64>(aColor.GetColor()); - pSettings[SC_SHOWPAGEBR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWPAGEBR)); + pSettings[SC_SHOWPAGEBR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWPAGEBR)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWPAGEBR].Value, pOptions->GetOption( VOPT_PAGEBREAKS ) ); - pSettings[SC_COLROWHDR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLROWHDR)); + pSettings[SC_COLROWHDR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLROWHDR)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_COLROWHDR].Value, pOptions->GetOption( VOPT_HEADER ) ); - pSettings[SC_SHEETTABS].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETTABS)); + pSettings[SC_SHEETTABS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETTABS)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHEETTABS].Value, pOptions->GetOption( VOPT_TABCONTROLS ) ); - pSettings[SC_OUTLSYMB].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB)); + pSettings[SC_OUTLSYMB].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_OUTLSYMB].Value, pOptions->GetOption( VOPT_OUTLINER ) ); const ScGridOptions& aGridOpt = pOptions->GetGridOptions(); - pSettings[SC_SNAPTORASTER].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER)); + pSettings[SC_SNAPTORASTER].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SNAPTORASTER].Value, aGridOpt.GetUseGridSnap() ); - pSettings[SC_RASTERVIS].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERVIS)); + pSettings[SC_RASTERVIS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERVIS)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() ); - pSettings[SC_RASTERRESX].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESX)); + pSettings[SC_RASTERRESX].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESX)); pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() ); - pSettings[SC_RASTERRESY].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESY)); + pSettings[SC_RASTERRESY].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESY)); pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() ); - pSettings[SC_RASTERSUBX].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBX)); + pSettings[SC_RASTERSUBX].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBX)); pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() ); - pSettings[SC_RASTERSUBY].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBY)); + pSettings[SC_RASTERSUBY].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBY)); pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() ); - pSettings[SC_RASTERSYNC].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSYNC)); + pSettings[SC_RASTERSYNC].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSYNC)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() ); } } @@ -2720,13 +2720,13 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> for (sal_Int32 i = 0; i < nCount; i++) { // SC_VIEWID has to parse and use by mba - rtl::OUString sName(rSettings[i].Name); + OUString sName(rSettings[i].Name); if (sName.compareToAscii(SC_TABLES) == 0) { uno::Reference<container::XNameContainer> xNameContainer; if ((rSettings[i].Value >>= xNameContainer) && xNameContainer->hasElements()) { - uno::Sequence< rtl::OUString > aNames(xNameContainer->getElementNames()); + uno::Sequence< OUString > aNames(xNameContainer->getElementNames()); for (sal_Int32 nTabPos = 0; nTabPos < aNames.getLength(); nTabPos++) { String sTabName(aNames[nTabPos]); @@ -2751,7 +2751,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> } else if (sName.compareToAscii(SC_ACTIVETABLE) == 0) { - rtl::OUString sValue; + OUString sValue; if(rSettings[i].Value >>= sValue) { String sTabName(sValue); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 22a25ec3adb7..cb881d2882b1 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -85,15 +85,13 @@ #include <memory> using namespace com::sun::star; -using ::rtl::OUStringBuffer; -using ::rtl::OUString; using ::editeng::SvxBorderLine; using ::std::vector; using ::std::auto_ptr; // helper func defined in docfunc.cxx -void VBA_DeleteModule( ScDocShell& rDocSh, const rtl::OUString& sModuleName ); +void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ); // STATIC DATA --------------------------------------------------------------- @@ -1290,7 +1288,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } } @@ -1351,7 +1349,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, break; } aChangeRanges.Append( aChangeRange ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } } @@ -1609,7 +1607,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, std::auto_ptr<ScDocument> pUndoDoc; std::auto_ptr<ScMarkData> pUndoMark; SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OUString aUndoStr; + OUString aUndoStr; if (bAddUndo) { pUndoMark.reset(new ScMarkData(rMark)); // Mark is being modified @@ -1950,7 +1948,7 @@ sal_Bool ScViewFunc::InsertTable( const String& rName, SCTAB nTab, sal_Bool bRec //---------------------------------------------------------------------------- // Insert tables -sal_Bool ScViewFunc::InsertTables(std::vector<rtl::OUString>& aNames, SCTAB nTab, +sal_Bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2069,7 +2067,7 @@ bool ScViewFunc::DeleteTables( const SCTAB nTab, SCTAB nSheets ) { for (SCTAB aTab = 0; aTab < nSheets; ++aTab) { - rtl::OUString sCodeName; + OUString sCodeName; bool bHasCodeName = pDoc->GetCodeName( nTab + aTab, sCodeName ); if ( bHasCodeName ) VBA_DeleteModule( *pDocSh, sCodeName ); @@ -2116,7 +2114,7 @@ sal_Bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, sal_Bool bRecord pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString aOldName; + OUString aOldName; for(unsigned int i=0; i<TheTabs.size(); ++i) { SCTAB nTab = TheTabs[i]; @@ -2139,7 +2137,7 @@ sal_Bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, sal_Bool bRecord if ( pDoc->IsScenario(nTab) ) { pUndoDoc->SetScenario( nTab, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags ); @@ -2169,7 +2167,7 @@ sal_Bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, sal_Bool bRecord for(int i=TheTabs.size()-1; i>=0; --i) { - rtl::OUString sCodeName; + OUString sCodeName; sal_Bool bHasCodeName = pDoc->GetCodeName( TheTabs[i], sCodeName ); if (pDoc->DeleteTab( TheTabs[i], pUndoDoc )) { @@ -2283,9 +2281,9 @@ void ScViewFunc::InsertTableLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rTabName ) { - rtl::OUString aFilterName = rFilter; - rtl::OUString aOpt = rOptions; - rtl::OUString aURL = rFile; + OUString aFilterName = rFilter; + OUString aOpt = rOptions; + OUString aURL = rFile; ScDocumentLoader aLoader( aURL, aFilterName, aOpt ); if (!aLoader.IsError()) { @@ -2296,7 +2294,7 @@ void ScViewFunc::InsertTableLink( const String& rFile, nTab = 0; else { - rtl::OUString aTemp; + OUString aTemp; SCTAB nCount = pSrcDoc->GetTableCount(); for (SCTAB i=0; i<nCount; i++) { @@ -2339,7 +2337,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, SCTAB i; for( i=0; i<nCount; i++ ) { // insert sheets first and update all references - rtl::OUString aName; + OUString aName; pSrcDoc->GetName( pSrcTabs[i], aName ); pDoc->CreateValidTabName( aName ); if ( !pDoc->InsertTab( nTab+i, aName ) ) @@ -2388,7 +2386,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, sal_Bool bWasThere = pDoc->HasLink( aFileName, aFilterName, aOptions ); sal_uLong nRefresh = 0; - rtl::OUString aTabStr; + OUString aTabStr; for (i=0; i<nInsCount; i++) { pSrcDoc->GetName( pSrcTabs[i], aTabStr ); @@ -2441,7 +2439,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, // Move/Copy table to another document void ScViewFunc::MoveTable( - sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const rtl::OUString* pNewTabName ) + sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const OUString* pNewTabName ) { ScDocument* pDoc = GetViewData()->GetDocument(); ScDocShell* pDocShell = GetViewData()->GetDocShell(); @@ -2458,10 +2456,10 @@ void ScViewFunc::MoveTable( // execute without SFX_CALLMODE_RECORD, because already contained in move command - String aUrl = rtl::OUString("private:factory/"); + String aUrl = OUString("private:factory/"); aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc" SfxStringItem aItem( SID_FILE_NAME, aUrl ); - SfxStringItem aTarget( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aTarget( SID_TARGETNAME, OUString("_blank") ); const SfxPoolItem* pRetItem = GetViewData()->GetDispatcher().Execute( SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aItem, &aTarget, 0L ); @@ -2506,7 +2504,7 @@ void ScViewFunc::MoveTable( { while (pDestDoc->GetTableCount() > 1) pDestDoc->DeleteTab(0); - pDestDoc->RenameTab( 0, rtl::OUString("______42_____"), + pDestDoc->RenameTab( 0, OUString("______42_____"), false ); } @@ -2519,7 +2517,7 @@ void ScViewFunc::MoveTable( { if(rMark.GetTableSelect(i)) { - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( i, aTabName); TheTabs.push_back(i); for(SCTAB j=i+1;j<nTabCount;j++) @@ -2550,7 +2548,7 @@ void ScViewFunc::MoveTable( ScClipParam aParam; for( sal_uInt16 j=0; j<TheTabs.size(); ++j, ++nDestTab1 ) { // insert sheets first and update all references - rtl::OUString aName; + OUString aName; if (bRename) aName = *pNewTabName; else @@ -2575,7 +2573,7 @@ void ScViewFunc::MoveTable( nDestTab1++; } } - rtl::OUString sName; + OUString sName; if (!bNewDoc && bUndo) { pDestDoc->GetName(nDestTab, sName); @@ -2671,13 +2669,13 @@ void ScViewFunc::MoveTable( pSrcTabs->reserve(nTabCount); pDestTabs->reserve(nTabCount); pTabNames->reserve(nTabCount); - rtl::OUString aDestName; + OUString aDestName; for(SCTAB i=0;i<nTabCount;i++) { if(rMark.GetTableSelect(i)) { - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( i, aTabName); pTabNames->push_back(aTabName); @@ -2716,7 +2714,7 @@ void ScViewFunc::MoveTable( if(bCopy && pDoc->IsScenario(nMovTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; @@ -2751,7 +2749,7 @@ void ScViewFunc::MoveTable( for (size_t j = 0; j < n; ++j) { SCTAB nRenameTab = (*pDestTabs)[j]; - rtl::OUString aTabName = *pNewTabName; + OUString aTabName = *pNewTabName; pDoc->CreateValidTabName( aTabName ); pDestNames->push_back(aTabName); pDoc->RenameTab(nRenameTab, aTabName); @@ -2803,7 +2801,7 @@ void ScViewFunc::ShowTable( const std::vector<String>& rNames ) sal_Bool bUndo(pDoc->IsUndoEnabled()); std::vector<SCTAB> undoTabs; - rtl::OUString aName; + OUString aName; SCTAB nPos = 0; bool bFound(false); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index ac26088950e1..cd37a7b38f11 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -478,8 +478,8 @@ void ScViewFunc::PasteFromSystem() TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); { - sal_uLong nBiff8 = SotExchange::RegisterFormatName(rtl::OUString("Biff8")); - sal_uLong nBiff5 = SotExchange::RegisterFormatName(rtl::OUString("Biff5")); + sal_uLong nBiff8 = SotExchange::RegisterFormatName(OUString("Biff8")); + sal_uLong nBiff5 = SotExchange::RegisterFormatName(OUString("Biff5")); // als erstes SvDraw-Model, dann Grafik // (Grafik darf nur bei einzelner Grafik drinstehen) @@ -594,8 +594,8 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran { TransferableDataHelper aDataHelper( rxTransferable ); { - sal_uLong nBiff8 = SotExchange::RegisterFormatName(rtl::OUString("Biff8")); - sal_uLong nBiff5 = SotExchange::RegisterFormatName(rtl::OUString("Biff5")); + sal_uLong nBiff8 = SotExchange::RegisterFormatName(OUString("Biff8")); + sal_uLong nBiff5 = SotExchange::RegisterFormatName(OUString("Biff5")); sal_uLong nFormatId = 0; // als erstes SvDraw-Model, dann Grafik // (Grafik darf nur bei einzelner Grafik drinstehen) @@ -1249,7 +1249,7 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, AdjustBlockHeight(); // update row heights before pasting objects - ::std::vector< ::rtl::OUString > aExcludedChartNames; + ::std::vector< OUString > aExcludedChartNames; SdrPage* pPage = NULL; if ( nFlags & IDF_OBJECTS ) @@ -1720,7 +1720,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark aChangeRanges.Append(aChangeRange); } } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index b73110582998..9606212ba573 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -162,7 +162,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, ScImportExport aImpEx( pDocSh->GetDocument(), ScAddress( nStartCol, nStartRow, GetViewData()->GetTabNo() ) ); - ::rtl::OUString aStr; + OUString aStr; SotStorageStreamRef xStream; if ( aDataHelper.GetSotStorageStream( SOT_FORMAT_RTF, xStream ) && xStream.Is() ) // mba: clipboard always must contain absolute URLs (could be from alien source) @@ -613,7 +613,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool SfxStringItem aFileNameItem( SID_FILE_NAME, aStrURL ); SfxStringItem aFilterItem( SID_FILTER_NAME, pFlt->GetName() ); // #i69524# add target, as in SfxApplication when the Open dialog is used - SfxStringItem aTargetItem( SID_TARGETNAME, rtl::OUString("_default") ); + SfxStringItem aTargetItem( SID_TARGETNAME, OUString("_default") ); // Asynchron oeffnen, kann naemlich auch aus D&D heraus passieren // und das bekommt dem MAC nicht so gut ... @@ -665,11 +665,11 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool //TODO/LATER: what about "bLink"? uno::Sequence < beans::PropertyValue > aMedium(1); - aMedium[0].Name = ::rtl::OUString( "URL" ); - aMedium[0].Value <<= ::rtl::OUString( aStrURL ); + aMedium[0].Name = OUString( "URL" ); + aMedium[0].Value <<= OUString( aStrURL ); comphelper::EmbeddedObjectContainer aCnt( xStorage ); - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = aCnt.InsertEmbeddedObject( aMedium, aName ); if( xObj.is() ) return PasteObject( rPos, xObj ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 9fd5be01d827..ecd015242c4e 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -171,7 +171,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, } else { - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = GetViewData()->GetViewShell()->GetObjectShell()-> GetEmbeddedObjectContainer().InsertEmbeddedObject( xStm, aName ); if ( xObj.is() ) @@ -202,7 +202,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, { if ( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE, aObjDesc ) ) { - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj; if ( aDataHelper.GetInputStream( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, xStm ) @@ -216,12 +216,12 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, { uno::Reference< embed::XStorage > xTmpStor = ::comphelper::OStorageHelper::GetTemporaryStorage(); uno::Reference < embed::XEmbedObjectClipboardCreator > xClipboardCreator( - ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), + ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), uno::UNO_QUERY_THROW ); embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - ::rtl::OUString( "DummyName" ), + OUString( "DummyName" ), uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information @@ -289,7 +289,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, ScAddress aCellPos( nPosX, nPosY, GetViewData()->GetTabNo() ); ScImportExport aObj( GetViewData()->GetDocument(), aCellPos ); - ::rtl::OUString aStr; + OUString aStr; SotStorageStreamRef xStream; if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.Is() ) { @@ -667,7 +667,7 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r // char array delimited by \0. // app \0 topic \0 item \0 (extra \0) where the extra is optional. - ::std::vector<rtl::OUString> aStrs; + ::std::vector<OUString> aStrs; const char* pStart = p; sal_Int32 nStart = 0; for (sal_Int32 i = 0; i < nSeqLen; ++i, ++p) @@ -675,7 +675,7 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r if (*p == '\0') { sal_Int32 nLen = i - nStart; - aStrs.push_back(rtl::OUString(pStart, nLen, eSysEnc)); + aStrs.push_back(OUString(pStart, nLen, eSysEnc)); nStart = ++i; pStart = ++p; } @@ -684,10 +684,10 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r if (aStrs.size() < 3) return false; - const rtl::OUString* pApp = &aStrs[0]; - const rtl::OUString* pTopic = &aStrs[1]; - const rtl::OUString* pItem = &aStrs[2]; - const rtl::OUString* pExtra = NULL; + const OUString* pApp = &aStrs[0]; + const OUString* pTopic = &aStrs[1]; + const OUString* pItem = &aStrs[2]; + const OUString* pExtra = NULL; if (aStrs.size() > 3) pExtra = &aStrs[3]; @@ -696,9 +696,9 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r // Paste this as an external reference. Note that paste link always // uses Calc A1 syntax even when another formula syntax is specified // in the UI. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.appendAscii("='"); - rtl::OUString aPath = ScGlobal::GetAbsDocName( + OUString aPath = ScGlobal::GetAbsDocName( *pTopic, GetViewData()->GetDocument()->GetDocumentShell()); aBuf.append(aPath); aBuf.appendAscii("'#"); @@ -711,7 +711,7 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r // DDE in all other cases. // TODO: we could define ocQuote for " - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(sal_Unicode('=')); aBuf.append(ScCompiler::GetNativeSymbol(ocDde)); aBuf.append(ScCompiler::GetNativeSymbol(ocOpen)); diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index ad04cb7b77ef..37376e4aed23 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -46,8 +46,6 @@ #include <vector> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::vector; #define D_TIMEFACTOR 86400.0 diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index a93edc6707cb..922c781a7603 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -139,7 +139,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, SdrPage* pDestPage = pDrawModel->GetPage( static_cast< sal_uInt16 >( nTab ) ); OSL_ENSURE(pDestPage,"who is this, Page?"); - ::std::vector< ::rtl::OUString > aExcludedChartNames; + ::std::vector< OUString > aExcludedChartNames; if ( pDestPage ) { ScChartHelper::GetChartNames( aExcludedChartNames, pDestPage ); @@ -205,7 +205,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, if ( pClient && pClient->IsObjectInPlaceActive() ) nOptions |= SDRINSERT_DONTMARK; - ::std::vector< ::rtl::OUString > aExcludedChartNames; + ::std::vector< OUString > aExcludedChartNames; SCTAB nTab = GetViewData()->GetTabNo(); SdrPage* pPage = pScDrawView->GetModel()->GetPage( static_cast< sal_uInt16 >( nTab ) ); OSL_ENSURE( pPage, "Page?" ); @@ -277,12 +277,12 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, } sal_Bool ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::XEmbeddedObject >& xObj, - const Size* pDescSize, const Graphic* pReplGraph, const ::rtl::OUString& aMediaType, sal_Int64 nAspect ) + const Size* pDescSize, const Graphic* pReplGraph, const OUString& aMediaType, sal_Int64 nAspect ) { MakeDrawLayer(); if ( xObj.is() ) { - ::rtl::OUString aName; + OUString aName; //TODO/MBA: is that OK? comphelper::EmbeddedObjectContainer& aCnt = GetViewData()->GetViewShell()->GetObjectShell()->GetEmbeddedObjectContainer(); if ( !aCnt.HasEmbeddedObject( xObj ) ) diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 4bb63bcbd4f8..8a67e463dece 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -560,7 +560,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, for (; itr != itrEnd; ++itr) aChangeRanges.Append( ScRange( nCol, nRow, *itr ) ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } if ( bRecord ) @@ -738,7 +738,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, { aChangeRanges.Append( ScRange( nCol, nRow, *itr ) ); } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } aModificator.SetDocumentModified(); @@ -1285,7 +1285,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, } } } - pModelObj->NotifyChanges( ::rtl::OUString( "attribute" ), aChangeRanges, aProperties ); + pModelObj->NotifyChanges( OUString( "attribute" ), aChangeRanges, aProperties ); } StartFormatArea(); @@ -1507,9 +1507,9 @@ sal_Bool ScViewFunc::InsertCells( InsCellCmd eCmd, sal_Bool bRecord, sal_Bool bP { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - ::rtl::OUString aOperation = ( eCmd == INS_INSROWS ? - ::rtl::OUString( "insert-rows" ) : - ::rtl::OUString( "insert-columns" ) ); + OUString aOperation = ( eCmd == INS_INSROWS ? + OUString( "insert-rows" ) : + OUString( "insert-columns" ) ); pModelObj->NotifyChanges( aOperation, aChangeRanges ); } } @@ -1570,9 +1570,9 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, sal_Bool bRecord ) { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - ::rtl::OUString aOperation = ( eCmd == DEL_DELROWS ? - ::rtl::OUString( "delete-rows" ) : - ::rtl::OUString( "delete-columns" ) ); + OUString aOperation = ( eCmd == DEL_DELROWS ? + OUString( "delete-rows" ) : + OUString( "delete-columns" ) ); pModelObj->NotifyChanges( aOperation, aChangeRanges ); } } @@ -1943,7 +1943,7 @@ void ScViewFunc::DeleteContents( sal_uInt16 nFlags, sal_Bool bRecord ) { aFuncMark.FillRangeListWithMarks( &aChangeRanges, false ); } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } aModificator.SetDocumentModified(); @@ -2247,7 +2247,7 @@ void ScViewFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW } } } - pModelObj->NotifyChanges( ::rtl::OUString( "column-resize" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "column-resize" ), aChangeRanges ); } } } diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index d055ced4b64b..4fb088c1fb13 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -161,13 +161,13 @@ sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction, if ( rSettings.HasComment() ) { - rtl::OUStringBuffer aBuf(rAction.GetComment()); + OUStringBuffer aBuf(rAction.GetComment()); aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")); - rtl::OUString aTmp; + OUString aTmp; rAction.GetDescription(aTmp, &rDocument); aBuf.append(aTmp); aBuf.append(sal_Unicode(')')); - rtl::OUString aComStr = aBuf.makeStringAndClear(); + OUString aComStr = aBuf.makeStringAndClear(); if(!rSettings.IsValidComment(&aComStr)) return false; diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 64d617362847..4263a34ed3ad 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -541,7 +541,7 @@ void getFieldLinks( { if (!aPath.isEmpty()) // XPath should never be empty anyway, but it won't hurt to check... - rRangeLink.maFieldPaths.push_back(rtl::OUStringToOString(aPath, RTL_TEXTENCODING_UTF8)); + rRangeLink.maFieldPaths.push_back(OUStringToOString(aPath, RTL_TEXTENCODING_UTF8)); } // Walk recursively. @@ -578,7 +578,7 @@ void ScXMLSourceDlg::OkPressed() aParam.maCellLinks.push_back( ScOrcusImportXMLParam::CellLink( - pUserData->maLinkedPos, rtl::OUStringToOString(aPath, RTL_TEXTENCODING_UTF8))); + pUserData->maLinkedPos, OUStringToOString(aPath, RTL_TEXTENCODING_UTF8))); } } diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index d15b95f51a74..dbc538b6165f 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -68,8 +68,8 @@ sal_Bool SAL_CALL component_writeInfo( uno::Reference<registry::XRegistryKey> xNewKey( reinterpret_cast<registry::XRegistryKey*>(pRegistryKey)->createKey(aImpl) ); - uno::Sequence <rtl::OUString> aSequ = ScTestAddIn::getSupportedServiceNames_Static(); - const rtl::OUString * pArray = aSequ.getConstArray(); + uno::Sequence <OUString> aSequ = ScTestAddIn::getSupportedServiceNames_Static(); + const OUString * pArray = aSequ.getConstArray(); for( INT32 i = 0; i < aSequ.getLength(); i++ ) xNewKey->createKey( pArray[i] ); @@ -123,10 +123,10 @@ UString ScTestAddIn::getImplementationName_Static() return L"stardiv.StarCalc.ScTestAddIn"; } -::com::sun::star::uno::Sequence< ::rtl::OUString > ScTestAddIn::getSupportedServiceNames_Static() +::com::sun::star::uno::Sequence< OUString > ScTestAddIn::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aRet(2); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence< OUString > aRet(2); + OUString* pArray = aRet.getArray(); pArray[0] = SCADDIN_SERVICE; pArray[1] = SCTESTADDIN_SERVICE; return aRet; @@ -344,7 +344,7 @@ double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno return fValue + 1.0; } -::rtl::OUString SAL_CALL ScTestAddIn::repeatStr( const ::rtl::OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException) { String aRet; String aStrStr = OUStringToString( aStr, CHARSET_SYSTEM ); @@ -354,7 +354,7 @@ double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno return StringToOUString( aRet, CHARSET_SYSTEM ); } -::rtl::OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException) { uno::Any aDateAny = xCaller->getPropertyValue( L"NullDate" ); { @@ -459,14 +459,14 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, return aRet; } -::rtl::OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException) { String aSeparator; if ( !aFirst.hasValue() ) // not specified aSeparator = ';'; else { - rtl::OUString aUStr; + OUString aUStr; aFirst >>= aUStr; aSeparator = OUStringToString( aUStr, CHARSET_SYSTEM ); } @@ -478,7 +478,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, { if ( nPos > 0 ) aContent += ' '; - rtl::OUString aUStr; + OUString aUStr; pArr[nPos] >>= aUStr; aContent += OUStringToString( aUStr, CHARSET_SYSTEM ); } @@ -502,11 +502,11 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, //! Test if ( nFlag == 42 ) { - uno::Sequence<rtl::OUString> aInner(3); + uno::Sequence<OUString> aInner(3); aInner.getArray()[0] = L"Bla"; aInner.getArray()[1] = L"Fasel"; aInner.getArray()[2] = L"Suelz"; - uno::Sequence< uno::Sequence<rtl::OUString> > aOuter( &aInner, 1 ); + uno::Sequence< uno::Sequence<OUString> > aOuter( &aInner, 1 ); aRet <<= aOuter; return aRet; @@ -521,7 +521,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, return aRet; } -::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException) { String aStr = OUStringToString( aString, CHARSET_SYSTEM ); char c = (char) aStr; @@ -542,25 +542,25 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, // XServiceName -::rtl::OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) { return SCTESTADDIN_SERVICE; // name of specific AddIn service } // XServiceInfo -::rtl::OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ScTestAddIn::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ScTestAddIn::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { return ServiceName == SCADDIN_SERVICE || ServiceName == SCTESTADDIN_SERVICE; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { return getSupportedServiceNames_Static(); } diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx index c0e946cc5d70..4d54de38921b 100644 --- a/sc/workben/addin.hxx +++ b/sc/workben/addin.hxx @@ -53,16 +53,16 @@ public: // virtual XIdlClassRef getIdlClass(void); static UString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XAddIn - virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); // XLocalizable virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) throw(::com::sun::star::uno::RuntimeException); @@ -71,22 +71,22 @@ public: // XTestAddIn virtual sal_Int32 SAL_CALL countParams( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) throw(::com::sun::star::uno::RuntimeException); virtual double SAL_CALL addOne( double fValue ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL repeatStr( const ::rtl::OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColorValue( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& xRange ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL transpose( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > > SAL_CALL transposeInt( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL callAsync( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getStrOrVal( sal_Int32 nFlag ) throw(::com::sun::star::uno::RuntimeException); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 727b9e7b0b48..c11d74b6d106 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -49,7 +49,7 @@ void ScAddInResult::NewValue() uno::Any aAny; String aRet = aArg; aRet += nTickCount; - rtl::OUString aUStr = StringToOUString( aRet, CHARSET_SYSTEM ); + OUString aUStr = StringToOUString( aRet, CHARSET_SYSTEM ); aAny <<= aUStr; sheet::ResultEvent aEvent( (cppu::OWeakObject*)this, aAny ); |