diff options
Diffstat (limited to 'connectivity/inc')
45 files changed, 418 insertions, 418 deletions
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx index a2c4e60f149f..c13b97dc7050 100644 --- a/connectivity/inc/connectivity/CommonTools.hxx +++ b/connectivity/inc/connectivity/CommonTools.hxx @@ -49,20 +49,20 @@ namespace connectivity { //------------------------------------------------------------------------------ OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); - inline sal_Bool match(const ::rtl::OUString &rWild, const ::rtl::OUString &rStr, const sal_Unicode cEscape) + inline sal_Bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape) { return match(rWild.getStr(), rStr.getStr(), cEscape); } //------------------------------------------------------------------------------ - OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate); - OOO_DLLPUBLIC_DBTOOLS rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime); - OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime); + OOO_DLLPUBLIC_DBTOOLS OUString toDateString(const ::com::sun::star::util::Date& rDate); + OOO_DLLPUBLIC_DBTOOLS OUString toTimeString(const ::com::sun::star::util::Time& rTime); + OOO_DLLPUBLIC_DBTOOLS OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime); // typedefs typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable; - DECLARE_STL_MAP(::rtl::OUString,OSQLTable,comphelper::UStringMixLess, OSQLTables); + DECLARE_STL_MAP(OUString,OSQLTable,comphelper::UStringMixLess, OSQLTables); // ------------------------------------------------------------------------- // class ORefVector allows reference counting on a std::vector @@ -135,7 +135,7 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rVal, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); // ======================================================================================= // search from __first to __last the column with the realname _rVal @@ -143,7 +143,7 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rVal, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); // ======================================================================================= @@ -154,8 +154,8 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rProp, - const ::rtl::OUString& _rVal, + const OUString& _rProp, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); @@ -175,33 +175,33 @@ namespace connectivity @param _sClassName The class name to look for. */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName ); + OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ); #endif } //================================================================================== #define DECLARE_SERVICE_INFO() \ - 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) \ #define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ + return OUString::createFromAscii(implasciiname); \ } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(1); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname); \ return aSupported; \ } \ - sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ + sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ { \ - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \ + Sequence< OUString > aSupported(getSupportedServiceNames()); \ + const OUString* pSupported = aSupported.getConstArray(); \ + const OUString* pEnd = pSupported + aSupported.getLength(); \ for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \ ; \ \ diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx index df89160d5c0d..84a828800a9c 100644 --- a/connectivity/inc/connectivity/ConnectionWrapper.hxx +++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx @@ -80,11 +80,11 @@ namespace connectivity @param _rPassword The password. */ - static void createUniqueId( const ::rtl::OUString& _rURL + static void createUniqueId( const OUString& _rURL ,::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ,sal_uInt8* _pBuffer - ,const ::rtl::OUString& _rUserName = ::rtl::OUString() - ,const ::rtl::OUString& _rPassword = ::rtl::OUString()); + ,const OUString& _rUserName = OUString() + ,const OUString& _rPassword = OUString()); }; } #endif // _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_ diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx index 72b22386e57a..69c28cacbb02 100644 --- a/connectivity/inc/connectivity/DriversConfig.hxx +++ b/connectivity/inc/connectivity/DriversConfig.hxx @@ -34,8 +34,8 @@ namespace connectivity ::comphelper::NamedValueCollection aProperties; ::comphelper::NamedValueCollection aFeatures; ::comphelper::NamedValueCollection aMetaData; - ::rtl::OUString sDriverFactory; - ::rtl::OUString sDriverTypeDisplayName; + OUString sDriverFactory; + OUString sDriverTypeDisplayName; } TInstalledDriver; DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers); @@ -56,7 +56,7 @@ namespace connectivity { typedef salhelper::SingletonRef<DriversConfigImpl> OSharedConfigNode; - const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const; + const ::comphelper::NamedValueCollection& impl_get(const OUString& _sURL,sal_Int32 _nProps) const; public: DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); ~DriversConfig(); @@ -64,12 +64,12 @@ namespace connectivity DriversConfig( const DriversConfig& ); DriversConfig& operator=( const DriversConfig& ); - ::rtl::OUString getDriverFactoryName(const ::rtl::OUString& _sUrl) const; - ::rtl::OUString getDriverTypeDisplayName(const ::rtl::OUString& _sUrl) const; - const ::comphelper::NamedValueCollection& getProperties(const ::rtl::OUString& _sURL) const; - const ::comphelper::NamedValueCollection& getFeatures(const ::rtl::OUString& _sURL) const; - const ::comphelper::NamedValueCollection& getMetaData(const ::rtl::OUString& _sURL) const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const; + OUString getDriverFactoryName(const OUString& _sUrl) const; + OUString getDriverTypeDisplayName(const OUString& _sUrl) const; + const ::comphelper::NamedValueCollection& getProperties(const OUString& _sURL) const; + const ::comphelper::NamedValueCollection& getFeatures(const OUString& _sURL) const; + const ::comphelper::NamedValueCollection& getMetaData(const OUString& _sURL) const; + ::com::sun::star::uno::Sequence< OUString > getURLs() const; private: OSharedConfigNode m_aNode; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB; diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx index b425fe079f3b..34e73612bfa1 100644 --- a/connectivity/inc/connectivity/FValue.hxx +++ b/connectivity/inc/connectivity/FValue.hxx @@ -99,7 +99,7 @@ namespace connectivity operator=(_rRH); } - ORowSetValue(const ::rtl::OUString& _rRH) + ORowSetValue(const OUString& _rRH) :m_eTypeKind(::com::sun::star::sdbc::DataType::VARCHAR) ,m_bNull(true) ,m_bBound(true) @@ -308,7 +308,7 @@ namespace connectivity ORowSetValue& operator=(const ::com::sun::star::util::Time& _rRH); ORowSetValue& operator=(const ::com::sun::star::util::DateTime& _rRH); - ORowSetValue& operator=(const ::rtl::OUString& _rRH); + ORowSetValue& operator=(const OUString& _rRH); // the type isn't set it will be set to VARCHAR if the type is different change it ORowSetValue& operator=(const ::com::sun::star::uno::Sequence<sal_Int8>& _rRH); // we the possiblity to save a any for bookmarks @@ -330,9 +330,9 @@ namespace connectivity operator float() const { return isNull() ? (float)0.0: getFloat(); } operator double() const { return isNull() ? 0.0 : getDouble(); } - operator ::rtl::OUString() const + operator OUString() const { - return isNull() ? ::rtl::OUString() : getString(); + return isNull() ? OUString() : getString(); } operator ::com::sun::star::util::Date() const @@ -403,7 +403,7 @@ namespace connectivity double getDouble() const; float getFloat() const; - ::rtl::OUString getString() const; // makes a automatic conversion if type isn't a string + OUString getString() const; // makes a automatic conversion if type isn't a string ::com::sun::star::util::Date getDate() const; ::com::sun::star::util::Time getTime() const; ::com::sun::star::util::DateTime getDateTime() const; diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx index 794996b7ad07..0352ed8ec39f 100644 --- a/connectivity/inc/connectivity/IParseContext.hxx +++ b/connectivity/inc/connectivity/IParseContext.hxx @@ -81,13 +81,13 @@ namespace connectivity public: // retrieves language specific error messages - virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const = 0; + virtual OUString getErrorMessage(ErrorCode _eCodes) const = 0; // retrieves language specific keyword strings (only ASCII allowed) - virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const = 0; + virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const = 0; // finds out, if we have an international keyword (only ASCII allowed) - virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const = 0; + virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const = 0; /** get's a locale instance which should be used when parsing in the context specified by this instance <p>if this is not overridden by derived classes, it returns the static default locale.</p> diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx index 7da2c0691769..a54cb809ca29 100644 --- a/connectivity/inc/connectivity/PColumn.hxx +++ b/connectivity/inc/connectivity/PColumn.hxx @@ -40,8 +40,8 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OParseColumn : public OParseColumn_BASE, public OParseColumn_PROP { - ::rtl::OUString m_aRealName; - ::rtl::OUString m_sLabel; + OUString m_aRealName; + OUString m_sLabel; sal_Bool m_bFunction; sal_Bool m_bDbasePrecisionChanged; sal_Bool m_bAggregateFunction; @@ -54,10 +54,10 @@ namespace connectivity virtual ~OParseColumn(); public: OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase); - OParseColumn(const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, - const ::rtl::OUString& _Description, + OParseColumn(const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, + const OUString& _Description, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -65,23 +65,23 @@ namespace connectivity sal_Bool _IsAutoIncrement, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName); + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName); virtual void construct(); - void setRealName(const ::rtl::OUString& _rName) { m_aRealName = _rName; } - void setLabel(const ::rtl::OUString& i_sLabel) { m_sLabel = i_sLabel; } - void setTableName(const ::rtl::OUString& _rName) { m_TableName = _rName; } + void setRealName(const OUString& _rName) { m_aRealName = _rName; } + void setLabel(const OUString& i_sLabel) { m_sLabel = i_sLabel; } + void setTableName(const OUString& _rName) { m_TableName = _rName; } void setFunction(sal_Bool _bFunction) { m_bFunction = _bFunction; } void setAggregateFunction(sal_Bool _bFunction) { m_bAggregateFunction = _bFunction; } void setIsSearchable( sal_Bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } - const ::rtl::OUString& getRealName() const { return m_aRealName; } - const ::rtl::OUString& getLabel() const { return m_sLabel; } - const ::rtl::OUString& getTableName() const { return m_TableName; } + const OUString& getRealName() const { return m_aRealName; } + const OUString& getLabel() const { return m_sLabel; } + const OUString& getTableName() const { return m_TableName; } sal_Bool getFunction() const { return m_bFunction; } sal_Bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } @@ -129,7 +129,7 @@ namespace connectivity public: OOrderColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, - const ::rtl::OUString& i_rOriginatingTableName, + const OUString& i_rOriginatingTableName, sal_Bool _bCase, sal_Bool _bAscending ); @@ -142,7 +142,7 @@ namespace connectivity virtual void construct(); - 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); private: using OOrderColumn_BASE::createArrayHelper; }; diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx index eca8b615fa91..a7c358e3adb4 100644 --- a/connectivity/inc/connectivity/SQLStatementHelper.hxx +++ b/connectivity/inc/connectivity/SQLStatementHelper.hxx @@ -32,7 +32,7 @@ namespace dbtools class OOO_DLLPUBLIC_DBTOOLS ISQLStatementHelper { public: - virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut) = 0; + virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,OUStringBuffer& _rOut) = 0; protected: ~ISQLStatementHelper() {} diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx index d957f225f5df..d6cf10a75d6f 100644 --- a/connectivity/inc/connectivity/StdTypeDefs.hxx +++ b/connectivity/inc/connectivity/StdTypeDefs.hxx @@ -29,11 +29,11 @@ namespace rtl { class OUString; } namespace connectivity { - typedef ::std::vector< ::rtl::OUString> TStringVector; + typedef ::std::vector< OUString> TStringVector; typedef ::std::vector< sal_Int32> TIntVector; typedef ::std::map<sal_Int32,sal_Int32> TInt2IntMap; - typedef ::std::map< ::rtl::OUString,sal_Int32> TString2IntMap; - typedef ::std::map< sal_Int32,::rtl::OUString> TInt2StringMap; + typedef ::std::map< OUString,sal_Int32> TString2IntMap; + typedef ::std::map< sal_Int32,OUString> TInt2StringMap; } #endif // CONNECTIVITY_STDTYPEDEFS_HXX diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx index 3e874f966fbf..5fe1dd0eb845 100644 --- a/connectivity/inc/connectivity/TColumnsHelper.hxx +++ b/connectivity/inc/connectivity/TColumnsHelper.hxx @@ -37,11 +37,11 @@ namespace connectivity protected: OTableHelper* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OColumnsHelper( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx index 331a9426f20e..b8502af9c5ec 100644 --- a/connectivity/inc/connectivity/TIndex.hxx +++ b/connectivity/inc/connectivity/TIndex.hxx @@ -35,8 +35,8 @@ namespace connectivity public: OIndexHelper( OTableHelper* _pTable); OIndexHelper( OTableHelper* _pTable, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Catalog, + const OUString& _Name, + const OUString& _Catalog, sal_Bool _isUnique, sal_Bool _isPrimaryKeyIndex, sal_Bool _isClustered diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx index 2bf459dc6920..31b0ecfe3ca5 100644 --- a/connectivity/inc/connectivity/TIndexColumns.hxx +++ b/connectivity/inc/connectivity/TIndexColumns.hxx @@ -30,13 +30,13 @@ namespace connectivity { OIndexHelper* m_pIndex; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OIndexColumns( OIndexHelper* _pIndex, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector); + const ::std::vector< OUString> &_rVector); }; } #endif // CONNECTIVITY_INDEXCOLUMNSHELPER_HXX diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx index 4566a607d397..c558c709c8e8 100644 --- a/connectivity/inc/connectivity/TIndexes.hxx +++ b/connectivity/inc/connectivity/TIndexes.hxx @@ -31,15 +31,15 @@ namespace connectivity { OTableHelper* m_pTable; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OIndexesHelper(OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ); }; diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx index 5099245ef06f..9b24e41c3126 100644 --- a/connectivity/inc/connectivity/TKey.hxx +++ b/connectivity/inc/connectivity/TKey.hxx @@ -35,7 +35,7 @@ namespace connectivity public: OTableKeyHelper( OTableHelper* _pTable); OTableKeyHelper( OTableHelper* _pTable - ,const ::rtl::OUString& _Name + ,const OUString& _Name ,const sdbcx::TKeyProperties& _rProps ); inline OTableHelper* getTable() const { return m_pTable; } diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx index d7a2f8fff47c..6dbb041805b4 100644 --- a/connectivity/inc/connectivity/TKeyColumns.hxx +++ b/connectivity/inc/connectivity/TKeyColumns.hxx @@ -30,13 +30,13 @@ namespace connectivity { OTableKeyHelper* m_pKey; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OKeyColumnsHelper( OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector); + const ::std::vector< OUString> &_rVector); }; } #endif // CONNECTIVITY_TKEYCOLUMNS_HXX diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx index 26024e792800..817b24da3a42 100644 --- a/connectivity/inc/connectivity/TKeys.hxx +++ b/connectivity/inc/connectivity/TKeys.hxx @@ -32,13 +32,13 @@ namespace connectivity { OTableHelper* m_pTable; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); - virtual ::rtl::OUString getDropForeignKey() const; + virtual OUString getDropForeignKey() const; public: OKeysHelper( OTableHelper* _pTable, diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx index 2155893601f5..aeb58cb4dd0c 100644 --- a/connectivity/inc/connectivity/TTableHelper.hxx +++ b/connectivity/inc/connectivity/TTableHelper.hxx @@ -35,10 +35,10 @@ namespace connectivity typedef sal_Int32 OrdinalPosition; struct ColumnDesc { - ::rtl::OUString sName; - ::rtl::OUString aField6; - ::rtl::OUString sField12; // REMARKS - ::rtl::OUString sField13; + OUString sName; + OUString aField6; + OUString sField12; // REMARKS + OUString sField13; sal_Int32 nField5 , nField7 , nField9 @@ -47,14 +47,14 @@ namespace connectivity OrdinalPosition nOrdinalPosition; ColumnDesc() {} - ColumnDesc( const ::rtl::OUString& _rName + ColumnDesc( const OUString& _rName , sal_Int32 _nField5 - , const ::rtl::OUString& _aField6 + , const OUString& _aField6 , sal_Int32 _nField7 , sal_Int32 _nField9 , sal_Int32 _nField11 - , const ::rtl::OUString& _sField12 - , const ::rtl::OUString& _sField13 + , const OUString& _sField12 + , const OUString& _sField13 ,OrdinalPosition _nPosition ) :sName( _rName ) ,aField6(_aField6) @@ -70,7 +70,7 @@ namespace connectivity }; typedef connectivity::sdbcx::OTable OTable_TYPEDEF; - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OOO_DLLPUBLIC_DBTOOLS OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); DECLARE_STL_USTRINGACCESS_MAP( sdbcx::TKeyProperties , TKeyMap); @@ -110,7 +110,7 @@ namespace connectivity * * \return The start of the rename statement. */ - virtual ::rtl::OUString getRenameStart() const; + virtual OUString getRenameStart() const; virtual ~OTableHelper(); @@ -119,7 +119,7 @@ namespace connectivity virtual void refreshKeys(); virtual void refreshIndexes(); - const ColumnDesc* getColumnDescription(const ::rtl::OUString& _sName) const; + const ColumnDesc* getColumnDescription(const OUString& _sName) const; public: OTableHelper( sdbcx::OCollection* _pTables, @@ -128,11 +128,11 @@ namespace connectivity OTableHelper( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, sal_Bool _bCase, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const; @@ -142,18 +142,18 @@ namespace connectivity virtual void SAL_CALL release() throw(); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XAlterTable virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); // helper method to get key properties - sdbcx::TKeyProperties getKeyProperties(const ::rtl::OUString& _sName) const; - void addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties); + sdbcx::TKeyProperties getKeyProperties(const OUString& _sName) const; + void addKey(const OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties); - virtual ::rtl::OUString getTypeCreatePattern() const; + virtual OUString getTypeCreatePattern() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableRename> getRenameService() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableAlteration> getAlterService() const; diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx index 6ed56b685455..712c44abddb4 100644 --- a/connectivity/inc/connectivity/dbcharset.hxx +++ b/connectivity/inc/connectivity/dbcharset.hxx @@ -77,7 +77,7 @@ namespace dbtools /** find the given IANA name in the map. @return the <em>end</em> iterator if the IANA name could not be found. */ - CharsetIterator find(const ::rtl::OUString& _rIanaName, const IANA&) const; + CharsetIterator find(const OUString& _rIanaName, const IANA&) const; std::size_t size() const { ensureConstructed( ); return m_aEncodings.size(); } @@ -102,16 +102,16 @@ namespace dbtools friend class OCharsetMap::CharsetIterator; rtl_TextEncoding m_eEncoding; - ::rtl::OUString m_aIanaName; + OUString m_aIanaName; public: CharsetIteratorDerefHelper(const CharsetIteratorDerefHelper& _rSource); rtl_TextEncoding getEncoding() const { return m_eEncoding; } - ::rtl::OUString getIanaName() const { return m_aIanaName; } + OUString getIanaName() const { return m_aIanaName; } protected: - CharsetIteratorDerefHelper( const rtl_TextEncoding _eEncoding, const ::rtl::OUString& _rIanaName ); + CharsetIteratorDerefHelper( const rtl_TextEncoding _eEncoding, const OUString& _rIanaName ); }; diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx index 78df8d04a0ff..61fa3260c87c 100644 --- a/connectivity/inc/connectivity/dbconversion.hxx +++ b/connectivity/inc/connectivity/dbconversion.hxx @@ -80,7 +80,7 @@ namespace dbtools static void setValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& xVariant, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter, const ::com::sun::star::util::Date& rNullDate, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nKey, sal_Int16 nFieldType, sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException); @@ -94,13 +94,13 @@ namespace dbtools // get the columnvalue as string with a default format given by the column or a default format // for the type - static ::rtl::OUString getFormattedValue( + static OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter, const ::com::sun::star::lang::Locale& _rLocale, const ::com::sun::star::util::Date& rNullDate); - static ::rtl::OUString getFormattedValue( + static OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter, const ::com::sun::star::util::Date& rNullDate, @@ -108,11 +108,11 @@ namespace dbtools sal_Int16 nKeyType); static ::com::sun::star::util::Date toDate(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static ::com::sun::star::util::Date toDate(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::Date toDate(const OUString& _sSQLDate); static ::com::sun::star::util::Time toTime(double dVal); - static ::com::sun::star::util::Time toTime(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::Time toTime(const OUString& _sSQLDate); static ::com::sun::star::util::DateTime toDateTime(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static ::com::sun::star::util::DateTime toDateTime(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::DateTime toDateTime(const OUString& _sSQLDate); static sal_Int32 getMsFromTime(const ::com::sun::star::util::Time& rVal); @@ -142,13 +142,13 @@ namespace dbtools static ::com::sun::star::util::Date getNULLDate(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > &xSupplier); // return the date in the format %04d-%02d-%02d - static ::rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate); + static OUString toDateString(const ::com::sun::star::util::Date& rDate); // return the time in the format %02d:%02d:%02d - static ::rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime); + static OUString toTimeString(const ::com::sun::star::util::Time& rTime); // return the DateTime in the format %04d-%02d-%02d %02d:%02d:%02d - static ::rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& _rDateTime); + static OUString toDateTimeString(const ::com::sun::star::util::DateTime& _rDateTime); // return the any in an sql standard format - static ::rtl::OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, sal_Bool bQuote, + static OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, sal_Bool bQuote, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >& _rxTypeConverter); /** converts a Unicode string into a 8-bit string, using the given encoding @@ -168,8 +168,8 @@ namespace dbtools the length of the converted string */ static sal_Int32 convertUnicodeString( - const ::rtl::OUString& _rSource, - ::rtl::OString& _rDest, + const OUString& _rSource, + OString& _rDest, rtl_TextEncoding _eEncoding ) SAL_THROW((::com::sun::star::sdbc::SQLException)); @@ -198,8 +198,8 @@ namespace dbtools the length of the converted string */ static sal_Int32 convertUnicodeStringToLength( - const ::rtl::OUString& _rSource, - ::rtl::OString& _rDest, + const OUString& _rSource, + OString& _rDest, sal_Int32 _nMaxLen, rtl_TextEncoding _eEncoding ) diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx index 90a5e5eb7a9e..a84450b607d8 100644 --- a/connectivity/inc/connectivity/dbexception.hxx +++ b/connectivity/inc/connectivity/dbexception.hxx @@ -81,7 +81,7 @@ public: In those cases, you can use this constructor, which behaves as if you would have used an SQLException containing exactly the given error message. */ - SQLExceptionInfo( const ::rtl::OUString& _rSimpleErrorMessage ); + SQLExceptionInfo( const OUString& _rSimpleErrorMessage ); SQLExceptionInfo(const SQLExceptionInfo& _rCopySource); @@ -97,7 +97,7 @@ public: @param _nErrorCode the ErrorCode of the to-be-constructed SQLException */ - void prepend( const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); + void prepend( const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); /** appends a plain message to the chain of exceptions @param _eType @@ -110,7 +110,7 @@ public: @param _nErrorCode the error code of the exception to append */ - void append( TYPE _eType, const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); + void append( TYPE _eType, const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); /** throws (properly typed) the exception contained in the object @precond @@ -221,7 +221,7 @@ public: @raises RuntimeException in case of an internal error */ -OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getStandardSQLState( StandardSQLState _eState ); +OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState ); //---------------------------------------------------------------------------------- /** returns a standard ASCII string for a given SQLState @@ -237,7 +237,7 @@ OOO_DLLPUBLIC_DBTOOLS const sal_Char* getStandardSQLStateAscii( StandardSQLState //---------------------------------------------------------------------------------- OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException( - const ::rtl::OUString& _rMsg, + const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context, const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any() ) @@ -275,7 +275,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException( /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException */ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( - const ::rtl::OUString& _rMsg, + const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource ) throw (::com::sun::star::sdbc::SQLException); @@ -284,7 +284,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException */ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( - const ::rtl::OUString& _rMsg, + const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource, const ::com::sun::star::uno::Any& _rNextException ) @@ -335,7 +335,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( /** throws an SQLException */ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( - const ::rtl::OUString& _rMessage, + const OUString& _rMessage, StandardSQLState _eSQLState, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const sal_Int32 _nErrorCode = 0, diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx index cc4cd02e5216..565854ba7ed8 100644 --- a/connectivity/inc/connectivity/dbmetadata.hxx +++ b/connectivity/inc/connectivity/dbmetadata.hxx @@ -95,10 +95,10 @@ namespace dbtools } /// wraps XDatabaseMetaData::getIdentifierQuoteString - const ::rtl::OUString& getIdentifierQuoteString() const; + const OUString& getIdentifierQuoteString() const; /// wraps XDatabaseMetaData::getCatalogSeparator - const ::rtl::OUString& getCatalogSeparator() const; + const OUString& getCatalogSeparator() const; /** determines whether the database supports sub queries in the FROM part of a SELECT clause are supported. diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 78734d8abe27..823efaa52db4 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -192,9 +192,9 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) throw (::com::sun::star::uno::RuntimeException); OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, + const OUString& _rDataSourceName, + const OUString& _rUser, + const OUString& _rPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext) SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); @@ -211,7 +211,7 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getTableFields( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, - const ::rtl::OUString& _rName + const OUString& _rName ); /** returns the primary key columns of the table @@ -267,7 +267,7 @@ namespace dbtools getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); @@ -300,11 +300,11 @@ namespace dbtools @return an array of strings containing the names of the columns (aka fields) of the object */ - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Sequence< ::rtl::OUString > + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Sequence< OUString > getFieldNamesByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); @@ -312,13 +312,13 @@ namespace dbtools /** create a new ::com::sun::star::sdbc::SQLContext, fill it with the given descriptions and the given source, and <i>append</i> _rException (i.e. put it into the NextException member of the SQLContext). */ - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails ); + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const OUString& _rContextDescription, const OUString& _rContextDetails ); OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdbc::SQLException prependErrorInfo( const ::com::sun::star::sdbc::SQLException& _rChainedException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::rtl::OUString& _rAdditionalError, + const OUString& _rAdditionalError, const StandardSQLState _eSQLState = SQL_ERROR_UNSPECIFIED, const sal_Int32 _nErrorCode = 0); @@ -345,7 +345,7 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS sal_Bool isDataSourcePropertyEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xProp - ,const ::rtl::OUString& _sProperty, + ,const OUString& _sProperty, sal_Bool _bDefault = sal_False); /** retrieves a particular indirect data source setting @@ -371,21 +371,21 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS bool getDataSourceSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDataSource, - const ::rtl::OUString& _sSettingsName, + const OUString& _sSettingsName, ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue ); - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OOO_DLLPUBLIC_DBTOOLS OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); /** quote the given name with the given quote string. */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName); + OOO_DLLPUBLIC_DBTOOLS OUString quoteName(const OUString& _rQuote, const OUString& _rName); /** quote the given table name (which may contain a catalog and a schema) according to the rules provided by the meta data */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString quoteTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta - , const ::rtl::OUString& _rName + OUString quoteTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta + , const OUString& _rName ,EComposeRule _eComposeRule); /** split a fully qualified table name (including catalog and schema, if appliable) into it's component parts. @@ -397,7 +397,7 @@ namespace dbtools @param _eComposeRule where do you need the name for */ OOO_DLLPUBLIC_DBTOOLS void qualifiedNameComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConnMetaData, - const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule); + const OUString& _rQualifiedName, OUString& _rCatalog, OUString& _rSchema, OUString& _rName,EComposeRule _eComposeRule); /** calculate a NumberFormatsSupplier for use with an given connection @param _rxConn the connection for which the formatter is requested @@ -453,10 +453,10 @@ namespace dbtools //---------------------------------------------------------------------------------- /** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, - const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, - const ::rtl::OUString& _rName, + OOO_DLLPUBLIC_DBTOOLS OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, + const OUString& _rCatalog, + const OUString& _rSchema, + const OUString& _rName, sal_Bool _bQuote, EComposeRule _eComposeRule); @@ -466,11 +466,11 @@ namespace dbtools the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present in the data source which the connection belongs to. */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableNameForSelect( + OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, - const ::rtl::OUString& _rName ); + const OUString& _rCatalog, + const OUString& _rSchema, + const OUString& _rName ); /** composes a table name for usage in a SELECT statement @@ -478,7 +478,7 @@ namespace dbtools the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present in the data source which the connection belongs to. */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableNameForSelect( + OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ); //---------------------------------------------------------------------------------- @@ -488,7 +488,7 @@ namespace dbtools @param _xTable The table. */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( + OOO_DLLPUBLIC_DBTOOLS OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, EComposeRule _eComposeRule, @@ -500,7 +500,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS sal_Int32 getSearchColumnFlag( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, sal_Int32 _nDataType); // return the datasource for the given datasource name - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const ::rtl::OUString& _rsDataSourceName, + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const OUString& _rsDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); /** search for a name that is NOT in the NameAcces @@ -514,15 +514,15 @@ namespace dbtools A name which doesn't exist in the collection. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer, - const ::rtl::OUString& _rBaseName, + OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer, + const OUString& _rBaseName, sal_Bool _bStartWithNumber = sal_True); /** creates a unique name which is not already used in the given name array */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createUniqueName( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rNames, - const ::rtl::OUString& _rBaseName, + OOO_DLLPUBLIC_DBTOOLS OUString createUniqueName( + const ::com::sun::star::uno::Sequence< OUString >& _rNames, + const OUString& _rBaseName, sal_Bool _bStartWithNumber = sal_True ); @@ -532,7 +532,7 @@ namespace dbtools @see isValidSQLName */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString convertName2SQLName(const ::rtl::OUString& _rName,const ::rtl::OUString& _rSpecials); + OOO_DLLPUBLIC_DBTOOLS OUString convertName2SQLName(const OUString& _rName,const OUString& _rSpecials); /** checks whether the given name is a valid SQL name @@ -541,7 +541,7 @@ namespace dbtools @see convertName2SQLName */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const ::rtl::OUString& _rName, const ::rtl::OUString& _rSpecials ); + OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const OUString& _rName, const OUString& _rSpecials ); OOO_DLLPUBLIC_DBTOOLS void showError( const SQLExceptionInfo& _rInfo, @@ -634,10 +634,10 @@ namespace dbtools The scale will also be added when the value is 0. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardCreateStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, + OUString createStandardCreateStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, ISQLStatementHelper* _pHelper, - const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); + const OUString& _sCreatePattern = OUString()); /** creates the standard sql statement for the key part of a create table statement. @param descriptor @@ -646,7 +646,7 @@ namespace dbtools The connection. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, + OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the standard sql statement for the column part of a create table statement. @@ -660,10 +660,10 @@ namespace dbtools Allow to add special SQL constructs. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardColumnPart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor + OUString createStandardColumnPart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ,ISQLStatementHelper* _pHelper = NULL - ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); + ,const OUString& _sCreatePattern = OUString()); /** creates a SQL CREATE TABLE statement @@ -679,10 +679,10 @@ namespace dbtools The CREATE TABLE statement. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createSqlCreateTableStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor + OUString createSqlCreateTableStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ,ISQLStatementHelper* _pHelper = NULL - ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); + ,const OUString& _sCreatePattern = OUString()); /** creates a SDBC column with the help of getColumns. @param _xTable @@ -704,7 +704,7 @@ namespace dbtools ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createSDBCXColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Bool _bCase, sal_Bool _bQueryForInfo = sal_True, sal_Bool _bIsAutoIncrement = sal_False, @@ -722,7 +722,7 @@ namespace dbtools The datadefintion object. */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> getDataDefinitionByURLAndConnection( - const ::rtl::OUString& _rsUrl, + const OUString& _rsUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); @@ -738,13 +738,13 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS sal_Int32 getTablePrivileges(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, - const ::rtl::OUString& _sCatalog, - const ::rtl::OUString& _sSchema, - const ::rtl::OUString& _sTable); + const OUString& _sCatalog, + const OUString& _sSchema, + const OUString& _sTable); typedef ::std::pair<sal_Bool,sal_Bool> TBoolPair; typedef ::std::pair< TBoolPair,sal_Int32 > ColumnInformation; - typedef ::std::multimap< ::rtl::OUString, ColumnInformation, ::comphelper::UStringMixLess> ColumnInformationMap; + typedef ::std::multimap< OUString, ColumnInformation, ::comphelper::UStringMixLess> ColumnInformationMap; /** collects the information about auto increment, currency and data type for the given column name. The column must be quoted, * is also valid. @param _xConnection @@ -758,8 +758,8 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS void collectColumnInformation( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sComposedTableName, - const ::rtl::OUString& _rName, + const OUString& _sComposedTableName, + const OUString& _rName, ColumnInformationMap& _rInfo); @@ -776,10 +776,10 @@ namespace dbtools the buffer to which the comparison predicate will be appended */ OOO_DLLPUBLIC_DBTOOLS void getBoleanComparisonPredicate( - const ::rtl::OUString& _rExpression, + const OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode, - ::rtl::OUStringBuffer& _out_rSQLPredicate + OUStringBuffer& _out_rSQLPredicate ); //......................................................................... diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx index f52d6d6727e1..c489a91e5033 100644 --- a/connectivity/inc/connectivity/filtermanager.hxx +++ b/connectivity/inc/connectivity/filtermanager.hxx @@ -74,7 +74,7 @@ namespace dbtools m_xORB; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponentAggregate; - ::std::vector< ::rtl::OUString > m_aFilterComponents; + ::std::vector< OUString > m_aFilterComponents; sal_Bool m_bApplyPublicFilter; public: @@ -89,8 +89,8 @@ namespace dbtools /// makes the object forgetting the references to the database component void dispose( ); - const ::rtl::OUString& getFilterComponent( FilterComponent _eWhich ) const; - void setFilterComponent( FilterComponent _eWhich, const ::rtl::OUString& _rComponent ); + const OUString& getFilterComponent( FilterComponent _eWhich ) const; + void setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent ); inline sal_Bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; } void setApplyPublicFilter( sal_Bool _bApply ); @@ -98,14 +98,14 @@ namespace dbtools private: /** retrieves a filter which is a conjunction of all single filter components */ - ::rtl::OUString getComposedFilter( ) const; + OUString getComposedFilter( ) const; /** appends one filter component to the statement in our composer */ - void appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const; + void appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const; /// checks whether there is only one (or even no) non-empty filter component - bool isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const; + bool isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const; /// returns the index of the first filter component which should be considered when building the composed filter inline sal_Int32 getFirstApplicableFilterIndex() const diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx index 11d121fa56a2..fe5c4dbfff52 100644 --- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx +++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx @@ -94,8 +94,8 @@ namespace dbtools virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >& getColumnUpdate() const; - virtual bool setFormattedValue( const ::rtl::OUString& _rFormattedStringValue ) const; - virtual ::rtl::OUString getFormattedValue() const; + virtual bool setFormattedValue( const OUString& _rFormattedStringValue ) const; + virtual OUString getFormattedValue() const; private: ::std::auto_ptr< FormattedColumnValue_Data > m_pData; diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx index 648f8df361e0..6e99b9392053 100644 --- a/connectivity/inc/connectivity/parameters.hxx +++ b/connectivity/inc/connectivity/parameters.hxx @@ -95,7 +95,7 @@ namespace dbtools } }; - typedef ::std::map< ::rtl::OUString, ParameterMetaData > ParameterInformation; + typedef ::std::map< OUString, ParameterMetaData > ParameterInformation; private: ::osl::Mutex& m_rMutex; @@ -122,11 +122,11 @@ namespace dbtools ParameterInformation m_aParameterInformation; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; + ::com::sun::star::uno::Sequence< OUString > m_aMasterFields; + ::com::sun::star::uno::Sequence< OUString > m_aDetailFields; - ::rtl::OUString m_sIdentifierQuoteString; - ::rtl::OUString m_sSpecialCharacters; + OUString m_sIdentifierQuoteString; + OUString m_sSpecialCharacters; ::std::vector< bool > m_aParametersVisited; @@ -220,7 +220,7 @@ namespace dbtools // XParameters equivalents void setNull ( sal_Int32 _nIndex, sal_Int32 sqlType); - void setObjectNull ( sal_Int32 _nIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName); + void setObjectNull ( sal_Int32 _nIndex, sal_Int32 sqlType, const OUString& typeName); void setBoolean ( sal_Int32 _nIndex, sal_Bool x); void setByte ( sal_Int32 _nIndex, sal_Int8 x); void setShort ( sal_Int32 _nIndex, sal_Int16 x); @@ -228,7 +228,7 @@ namespace dbtools void setLong ( sal_Int32 _nIndex, sal_Int64 x); void setFloat ( sal_Int32 _nIndex, float x); void setDouble ( sal_Int32 _nIndex, double x); - void setString ( sal_Int32 _nIndex, const ::rtl::OUString& x); + void setString ( sal_Int32 _nIndex, const OUString& x); void setBytes ( sal_Int32 _nIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x); void setDate ( sal_Int32 _nIndex, const ::com::sun::star::util::Date& x); void setTime ( sal_Int32 _nIndex, const ::com::sun::star::util::Time& x); @@ -249,11 +249,11 @@ namespace dbtools /** creates a filter expression from a master-detail link where the detail denotes a column name */ - ::rtl::OUString + OUString createFilterConditionFromColumnLink( - const ::rtl::OUString& /* [in] */ _rMasterColumn, - const ::rtl::OUString& /* [in] */ _rDetailColumn, - ::rtl::OUString& /* [out] */ _rNewParamName + const OUString& /* [in] */ _rMasterColumn, + const OUString& /* [in] */ _rDetailColumn, + OUString& /* [out] */ _rNewParamName ); /** initializes our query composer, and the collection of inner parameter columns @@ -315,7 +315,7 @@ namespace dbtools void classifyLinks( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxParentColumns, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns, - ::std::vector< ::rtl::OUString >& _out_rAdditionalFilterComponents + ::std::vector< OUString >& _out_rAdditionalFilterComponents ) SAL_THROW(( ::com::sun::star::uno::Exception )); /** finalizes our <member>m_pOuterParameters</member> so that it can be used for diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx index f2f6354708f7..69347e9c4e6d 100644 --- a/connectivity/inc/connectivity/paramwrapper.hxx +++ b/connectivity/inc/connectivity/paramwrapper.hxx @@ -111,7 +111,7 @@ namespace param using ::cppu::OPropertySetHelper::getFastPropertyValue; private: - ::rtl::OUString impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const; + OUString impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const; private: ParameterWrapper(); // not implemented diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx index 776e357261b2..629419c9719d 100644 --- a/connectivity/inc/connectivity/predicateinput.hxx +++ b/connectivity/inc/connectivity/predicateinput.hxx @@ -69,9 +69,9 @@ namespace dbtools points to. */ sal_Bool normalizePredicateString( - ::rtl::OUString& _rPredicateValue, + OUString& _rPredicateValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, - ::rtl::OUString* _pErrorMessage = NULL + OUString* _pErrorMessage = NULL ) const; /** get's a value of the predicate which can be used in a WHERE clause. @@ -87,23 +87,23 @@ namespace dbtools points to. @see normalizePredicateString */ - ::rtl::OUString getPredicateValue( - const ::rtl::OUString& _rPredicateValue, + OUString getPredicateValue( + const OUString& _rPredicateValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField, sal_Bool _bForStatementUse, - ::rtl::OUString* _pErrorMessage = NULL + OUString* _pErrorMessage = NULL ) const; - ::rtl::OUString getPredicateValue( - const ::rtl::OUString& _sField - , const ::rtl::OUString& _rPredicateValue + OUString getPredicateValue( + const OUString& _sField + , const OUString& _rPredicateValue , sal_Bool _bForStatementUse - , ::rtl::OUString* _pErrorMessage = NULL) const; + , OUString* _pErrorMessage = NULL) const; private: ::connectivity::OSQLParseNode* implPredicateTree( - ::rtl::OUString& _rErrorMessage, - const ::rtl::OUString& _rStatement, + OUString& _rErrorMessage, + const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField ) const; @@ -113,7 +113,7 @@ namespace dbtools sal_Unicode& _rThdSep ) const; - ::rtl::OUString implParseNode(::connectivity::OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const; + OUString implParseNode(::connectivity::OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const; }; //......................................................................... diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx index 7004554cc08a..14840400b385 100644 --- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx @@ -77,7 +77,7 @@ namespace connectivity @param _xRow The current row from the resultset given to fillNames. */ - virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); + virtual OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); /** fills a vector with the necessary names which can be used in combination with the collections. For each row buildName will be called. diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx index 77424f74a3d1..e30075f009e9 100644 --- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx @@ -66,23 +66,23 @@ namespace connectivity public: virtual ~IObjectCollection(); virtual void reserve(size_t nLength) = 0; - virtual bool exists(const ::rtl::OUString& _sName ) = 0; + virtual bool exists(const OUString& _sName ) = 0; virtual bool empty() = 0; virtual void swapAll() = 0; virtual void swap() = 0; virtual void clear() = 0; virtual void reFill(const TStringVector &_rVector) = 0; - virtual void insert(const ::rtl::OUString& _sName,const ObjectType& _xObject) = 0; - virtual bool rename(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName) = 0; + virtual void insert(const OUString& _sName,const ObjectType& _xObject) = 0; + virtual bool rename(const OUString _sOldName,const OUString _sNewName) = 0; virtual sal_Int32 size() = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getElementNames() = 0; - virtual ::rtl::OUString getName(sal_Int32 _nIndex) = 0; + virtual ::com::sun::star::uno::Sequence< OUString > getElementNames() = 0; + virtual OUString getName(sal_Int32 _nIndex) = 0; virtual void disposeAndErase(sal_Int32 _nIndex) = 0; virtual void disposeElements() = 0; - virtual sal_Int32 findColumn( const ::rtl::OUString& columnName ) = 0; - virtual ::rtl::OUString findColumnAtIndex( sal_Int32 _nIndex) = 0; + virtual sal_Int32 findColumn( const OUString& columnName ) = 0; + virtual OUString findColumnAtIndex( sal_Int32 _nIndex) = 0; virtual ObjectType getObject(sal_Int32 _nIndex) = 0; - virtual ObjectType getObject(const ::rtl::OUString& columnName) = 0; + virtual ObjectType getObject(const OUString& columnName) = 0; virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) = 0; virtual sal_Bool isCaseSensitive() const = 0; }; @@ -107,7 +107,7 @@ namespace connectivity virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) = 0; // will be called when a object was requested by one of the accessing methods like getByIndex - virtual ObjectType createObject(const ::rtl::OUString& _rName) = 0; + virtual ObjectType createObject(const OUString& _rName) = 0; // will be called when a new object should be generated by a call of createDataDescriptor // the returned object is empty will be filled outside and added to the collection @@ -124,16 +124,16 @@ namespace connectivity the new object which is to be inserted into the collection. This might be the result of a call of <code>createObject( _rForName )</code>, or a clone of the descriptor. */ - virtual ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); // called when XDrop was called - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); /** returns the name for the object. The default implementation ask for the property NAME. If this doesn't satisfy, it has to be overloaded. @param _xObject The object where the name should be extracted. @return The name of the object. */ - virtual ::rtl::OUString getNameForObject(const ObjectType& _xObject); + virtual OUString getNameForObject(const ObjectType& _xObject); /** clones the given descriptor @@ -160,11 +160,11 @@ namespace connectivity /** insert a new element into the collection */ - void insertElement(const ::rtl::OUString& _sElementName,const ObjectType& _xElement); + void insertElement(const OUString& _sElementName,const ObjectType& _xElement); /** return the name of element at index _nIndex */ - inline ::rtl::OUString getElementName(sal_Int32 _nIndex) + inline OUString getElementName(sal_Int32 _nIndex) { return m_pElements->findColumnAtIndex(_nIndex); } @@ -183,7 +183,7 @@ namespace connectivity void reFill(const TStringVector &_rVector); inline sal_Bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); } - void renameObject(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName); + void renameObject(const OUString _sOldName,const OUString _sNewName); // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); @@ -203,9 +203,9 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::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); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) 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::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< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XRefreshable @@ -217,15 +217,15 @@ namespace connectivity // XAppend virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XDrop - virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); private: - void notifyElementRemoved(const ::rtl::OUString& _sName); + void notifyElementRemoved(const OUString& _sName); void disposeElements(); void dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop = sal_True); }; diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx index ca7a0bcc0b1c..42cddc51c041 100644 --- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx @@ -50,9 +50,9 @@ namespace connectivity public ODescriptor { protected: - ::rtl::OUString m_TypeName; - ::rtl::OUString m_Description; - ::rtl::OUString m_DefaultValue; + OUString m_TypeName; + OUString m_Description; + OUString m_DefaultValue; sal_Int32 m_IsNullable; sal_Int32 m_Precision; @@ -63,9 +63,9 @@ namespace connectivity sal_Bool m_IsRowVersion; sal_Bool m_IsCurrency; - ::rtl::OUString m_CatalogName; - ::rtl::OUString m_SchemaName; - ::rtl::OUString m_TableName; + OUString m_CatalogName; + OUString m_SchemaName; + OUString m_TableName; using OColumnDescriptor_BASE::rBHelper; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; @@ -77,10 +77,10 @@ namespace connectivity virtual void SAL_CALL release() throw(); OColumn( sal_Bool _bCase); - OColumn( const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, - const ::rtl::OUString& _Description, + OColumn( const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, + const OUString& _Description, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -89,9 +89,9 @@ namespace connectivity sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName); + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName); DECLARE_SERVICE_INFO(); //XInterface @@ -105,8 +105,8 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) 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 ) throw(::com::sun::star::uno::RuntimeException); + 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); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx index 12f0e4b0cfbd..aa04b5229ac9 100644 --- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx +++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx @@ -41,7 +41,7 @@ namespace connectivity ,public ::com::sun::star::lang::XUnoTunnel { protected: - ::rtl::OUString m_Name; + OUString m_Name; /** helper for derived classes to implement OPropertyArrayUsageHelper::createArrayHelper @@ -74,7 +74,7 @@ namespace connectivity virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // compare - inline sal_Bool operator == ( const ::rtl::OUString & _rRH ) + inline sal_Bool operator == ( const OUString & _rRH ) { return m_aCase(m_Name,_rRH); } diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx index 139c6240797d..6e4ba2355d62 100644 --- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx +++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx @@ -65,7 +65,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: OGroup(sal_Bool _bCase); - OGroup( const ::rtl::OUString& _Name,sal_Bool _bCase); + OGroup( const OUString& _Name,sal_Bool _bCase); virtual ~OGroup(); DECLARE_SERVICE_INFO(); @@ -85,14 +85,14 @@ namespace connectivity // XUsersSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::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 ) throw(::com::sun::star::uno::RuntimeException); + 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); }; } } diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx index 6fddc6c374ba..3e50ddf9459c 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx @@ -52,7 +52,7 @@ namespace connectivity public OIndex_BASE { protected: - ::rtl::OUString m_Catalog; + OUString m_Catalog; sal_Bool m_IsUnique; sal_Bool m_IsPrimaryKeyIndex; sal_Bool m_IsClustered; @@ -66,8 +66,8 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OIndex(sal_Bool _bCase); - OIndex( const ::rtl::OUString& _Name, - const ::rtl::OUString& _Catalog, + OIndex( const OUString& _Name, + const OUString& _Catalog, sal_Bool _isUnique, sal_Bool _isPrimaryKeyIndex, sal_Bool _isClustered, @@ -93,8 +93,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) 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 ) throw(::com::sun::star::uno::RuntimeException); + 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); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx index bdccd128f172..a4de9e6bf5bd 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx @@ -40,9 +40,9 @@ namespace connectivity public: OIndexColumn( sal_Bool _bCase); OIndexColumn( sal_Bool _IsAscending, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, + const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -51,9 +51,9 @@ namespace connectivity sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName); + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName); virtual void construct(); DECLARE_SERVICE_INFO(); diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx index eb95420e35f0..24d85dfb2614 100644 --- a/connectivity/inc/connectivity/sdbcx/VKey.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx @@ -40,12 +40,12 @@ namespace connectivity struct OOO_DLLPUBLIC_DBTOOLS KeyProperties { - ::std::vector< ::rtl::OUString> m_aKeyColumnNames; - ::rtl::OUString m_ReferencedTable; + ::std::vector< OUString> m_aKeyColumnNames; + OUString m_ReferencedTable; sal_Int32 m_Type; sal_Int32 m_UpdateRule; sal_Int32 m_DeleteRule; - KeyProperties(const ::rtl::OUString& _ReferencedTable, + KeyProperties(const OUString& _ReferencedTable, sal_Int32 _Type, sal_Int32 _UpdateRule, sal_Int32 _DeleteRule) @@ -79,9 +79,9 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: OKey(sal_Bool _bCase); - OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase); - /*OKey( const ::rtl::OUString& _Name, - const ::rtl::OUString& _ReferencedTable, + OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase); + /*OKey( const OUString& _Name, + const OUString& _ReferencedTable, sal_Int32 _Type, sal_Int32 _UpdateRule, sal_Int32 _DeleteRule, @@ -107,8 +107,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) 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 ) throw(::com::sun::star::uno::RuntimeException); + 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); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx index b3624bd69a3a..b22ea3247941 100644 --- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx @@ -34,15 +34,15 @@ namespace connectivity public OColumn, public OKeyColumn_PROP { protected: - ::rtl::OUString m_ReferencedColumn; + OUString m_ReferencedColumn; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OKeyColumn(sal_Bool _bCase); - OKeyColumn( const ::rtl::OUString& _ReferencedColumn, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, + OKeyColumn( const OUString& _ReferencedColumn, + const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -51,9 +51,9 @@ namespace connectivity sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName); + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName); // just to make it not inline virtual ~OKeyColumn(); diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx index 47d589578e68..0be41a9cd22f 100644 --- a/connectivity/inc/connectivity/sdbcx/VTable.hxx +++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx @@ -67,10 +67,10 @@ namespace connectivity public ODescriptor { protected: - ::rtl::OUString m_CatalogName; - ::rtl::OUString m_SchemaName; - ::rtl::OUString m_Description; - ::rtl::OUString m_Type; + OUString m_CatalogName; + OUString m_SchemaName; + OUString m_Description; + OUString m_Type; OCollection* m_pKeys; OCollection* m_pColumns; @@ -88,11 +88,11 @@ namespace connectivity sal_Bool _bCase); OTable( OCollection* _pTables, sal_Bool _bCase, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString()); + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString()); virtual ~OTable(); @@ -118,16 +118,16 @@ namespace connectivity // XKeysSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getKeys( ) 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 ) throw(::com::sun::star::uno::RuntimeException); + 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); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( void ) throw(::com::sun::star::uno::RuntimeException); // XIndexesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw(::com::sun::star::uno::RuntimeException); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XAlterTable - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // helper method diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx index d953d6a2b714..01bafc0d177c 100644 --- a/connectivity/inc/connectivity/sdbcx/VUser.hxx +++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx @@ -62,7 +62,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: OUser(sal_Bool _bCase); - OUser(const ::rtl::OUString& _Name,sal_Bool _bCase); + OUser(const OUString& _Name,sal_Bool _bCase); virtual ~OUser( ); @@ -79,18 +79,18 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XUser - virtual void SAL_CALL changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XGroupsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) 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 ) throw(::com::sun::star::uno::RuntimeException); + 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); }; } } diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx index 1772ac3acf1b..6134ddc4bb69 100644 --- a/connectivity/inc/connectivity/sdbcx/VView.hxx +++ b/connectivity/inc/connectivity/sdbcx/VView.hxx @@ -50,9 +50,9 @@ namespace connectivity public ODescriptor { protected: - ::rtl::OUString m_CatalogName; - ::rtl::OUString m_SchemaName; - ::rtl::OUString m_Command; + OUString m_CatalogName; + OUString m_SchemaName; + OUString m_Command; sal_Int32 m_CheckOption; // need for the getName method ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; @@ -67,12 +67,12 @@ namespace connectivity OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData); OView( sal_Bool _bCase, - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, sal_Int32 _nCheckOption = 0, - const ::rtl::OUString& _rCommand = ::rtl::OUString(), - const ::rtl::OUString& _rSchemaName = ::rtl::OUString(), - const ::rtl::OUString& _rCatalogName = ::rtl::OUString()); + const OUString& _rCommand = OUString(), + const OUString& _rSchemaName = OUString(), + const OUString& _rCatalogName = OUString()); virtual ~OView(); // ODescriptor @@ -90,8 +90,8 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) 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& ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx index fae9b2a05870..ccad18a88d0f 100644 --- a/connectivity/inc/connectivity/sqlerror.hxx +++ b/connectivity/inc/connectivity/sqlerror.hxx @@ -67,13 +67,13 @@ namespace connectivity // -------------------------------------------------------------------- /** convenience wrapper around boost::optional, allowing implicit construction */ - class ParamValue : public ::boost::optional< ::rtl::OUString > + class ParamValue : public ::boost::optional< OUString > { - typedef ::boost::optional< ::rtl::OUString > base_type; + typedef ::boost::optional< OUString > base_type; public: ParamValue( ) : base_type( ) { } - ParamValue( ::rtl::OUString const& val ) : base_type( val ) { } + ParamValue( OUString const& val ) : base_type( val ) { } ParamValue( ParamValue const& rhs ) : base_type( (base_type const&)rhs ) { } bool is() const { return !base_type::operator!(); } @@ -118,7 +118,7 @@ namespace connectivity @see ::com::sun::star::sdb::ErrorCondition */ - ::rtl::OUString getErrorMessage( + OUString getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1 = ParamValue(), const ParamValue& _rParamValue2 = ParamValue(), @@ -143,7 +143,7 @@ namespace connectivity prefix before presenting the message to the user, or use it to determine whether a concrete error has been raised by a OpenOffice.org core component. */ - static const ::rtl::OUString& + static const OUString& getMessagePrefix(); diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index 261607030685..ee967dd7d7a3 100644 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.hxx @@ -69,21 +69,21 @@ namespace connectivity ::std::auto_ptr< OSQLParseTreeIteratorImpl > m_pImpl; - void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const ::rtl::OUString& _aColumnName, ::rtl::OUString& _aTableRange, const ::rtl::OUString& _rColumnAlias); + void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const OUString& _aColumnName, OUString& _aTableRange, const OUString& _rColumnAlias); // inserts a table into the map - void traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const ::rtl::OUString & rTableRange ); + void traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const OUString & rTableRange ); void traverseSearchCondition(OSQLParseNode * pSearchCondition); void traverseOnePredicate( OSQLParseNode * pColumnRef, - ::rtl::OUString& aValue, + OUString& aValue, OSQLParseNode * pParameter); void traverseByColumnNames(const OSQLParseNode* pSelectNode,sal_Bool _bOrder); void traverseParameters(const OSQLParseNode* pSelectNode); - const OSQLParseNode* getTableNode( OSQLTables& _rTables, const OSQLParseNode* pTableRef, ::rtl::OUString& aTableRange ); - void getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, ::rtl::OUString& aTableRange ); + const OSQLParseNode* getTableNode( OSQLTables& _rTables, const OSQLParseNode* pTableRef, OUString& aTableRange ); + void getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, OUString& aTableRange ); void getSelect_statement(OSQLTables& _rTables,const OSQLParseNode* pSelect); - ::rtl::OUString getUniqueColumnName(const ::rtl::OUString & rColumnName) const; + OUString getUniqueColumnName(const OUString & rColumnName) const; /** finds the column with a given name, belonging to a given table, in a given tables collection @param _rTables @@ -96,7 +96,7 @@ namespace connectivity the desired column object, or <NULL/> if no such column could be found */ static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn( - const OSQLTables& _rTables, const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange ); + const OSQLTables& _rTables, const OUString & rColumnName, OUString & rTableRange ); /** finds a column with a given name, belonging to a given table @param rColumnName @@ -109,11 +109,11 @@ namespace connectivity @return */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn( - const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, bool _bLookInSubTables ); + const OUString & rColumnName, OUString & rTableRange, bool _bLookInSubTables ); protected: - void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False); - void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable); + void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False); + void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable); // Other member variables that should be available in the "set" functions // can be defined in the derived class. They can be initialized // in its constructor and, after the "traverse" routines have been used, @@ -219,8 +219,8 @@ namespace connectivity The table range to be set. */ void getColumnRange( const OSQLParseNode* _pColumnRef, - ::rtl::OUString &_rColumnName, - ::rtl::OUString& _rTableRange) const; + OUString &_rColumnName, + OUString& _rTableRange) const; /** retrieves a column's name, table range, and alias @@ -235,9 +235,9 @@ namespace connectivity this alias is returned here. */ void getColumnRange( const OSQLParseNode* _pColumnRef, - ::rtl::OUString& _out_rColumnName, - ::rtl::OUString& _out_rTableRange, - ::rtl::OUString& _out_rColumnAliasIfPresent + OUString& _out_rColumnName, + OUString& _out_rTableRange, + OUString& _out_rColumnAliasIfPresent ) const; /** return the alias name of a column @@ -246,7 +246,7 @@ namespace connectivity @return The alias name of the column or an empty string. */ - static ::rtl::OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn); + static OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn); /** return the columname and the table range @param _pColumnRef @@ -260,11 +260,11 @@ namespace connectivity */ static void getColumnRange( const OSQLParseNode* _pColumnRef, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - ::rtl::OUString &_rColumnName, - ::rtl::OUString& _rTableRange); + OUString &_rColumnName, + OUString& _rTableRange); // empty if ambiguous - sal_Bool getColumnTableRange(const OSQLParseNode* pNode, ::rtl::OUString &rTableRange) const; + sal_Bool getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const; // return true when the tableNode is a rule like catalog_name, schema_name or table_name sal_Bool isTableNode(const OSQLParseNode* _pTableNode) const; @@ -303,12 +303,12 @@ namespace connectivity only used when we're iterating through a CREATE TABLE statement */ OSQLTable impl_createTableObject( - const ::rtl::OUString& rTableName, const ::rtl::OUString& rCatalogName, const ::rtl::OUString& rSchemaName ); + const OUString& rTableName, const OUString& rCatalogName, const OUString& rSchemaName ); /** locates a record source (a table or query) with the given name */ OSQLTable impl_locateRecordSource( - const ::rtl::OUString& _rComposedName + const OUString& _rComposedName ); /** implementation for both traverseAll and traverseSome @@ -319,8 +319,8 @@ namespace connectivity */ void impl_getQueryParameterColumns( const OSQLTable& _rQuery ); - void setOrderByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, sal_Bool bAscending); - void setGroupByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange); + void setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, sal_Bool bAscending); + void setGroupByColumnName(const OUString & rColumnName, OUString & rTableRange); private: /** appends an SQLException corresponding to the given error code to our error collection @@ -335,7 +335,7 @@ namespace connectivity in the error message will be replaced with _rReplaceToken2 */ void impl_appendError( IParseContext::ErrorCode _eError, - const ::rtl::OUString* _pReplaceToken1 = NULL, const ::rtl::OUString* _pReplaceToken2 = NULL ); + const OUString* _pReplaceToken1 = NULL, const OUString* _pReplaceToken2 = NULL ); /** appends an SQLException corresponding to the given error code to our error collection */ diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx index a74c8abe84e7..45a46997d194 100644 --- a/connectivity/inc/connectivity/sqlnode.hxx +++ b/connectivity/inc/connectivity/sqlnode.hxx @@ -74,7 +74,7 @@ namespace connectivity SQL_NODE_EQUAL,SQL_NODE_LESS,SQL_NODE_GREAT,SQL_NODE_LESSEQ,SQL_NODE_GREATEQ,SQL_NODE_NOTEQUAL, SQL_NODE_PUNCTUATION, SQL_NODE_AMMSC, SQL_NODE_ACCESS_DATE,SQL_NODE_DATE,SQL_NODE_CONCAT}; - typedef ::std::set< ::rtl::OUString > QueryNameSet; + typedef ::std::set< OUString > QueryNameSet; //================================================================== //= SQLParseNodeParameter //================================================================== @@ -118,9 +118,9 @@ namespace connectivity OSQLParseNodes m_aChildren; OSQLParseNode* m_pParent; // pParent for reverse linkage in the tree - ::rtl::OUString m_aNodeValue; // token name, or empty in case of rules, - // or ::rtl::OUString in case of - // ::rtl::OUString, INT, etc. + OUString m_aNodeValue; // token name, or empty in case of rules, + // or OUString in case of + // OUString, INT, etc. SQLNodeType m_eNodeType; // see above sal_uInt32 m_nNodeID; // ::com::sun::star::chaos::Rule ID (if IsRule()) // or Token ID (if !IsRule()) @@ -241,11 +241,11 @@ namespace connectivity SQLNodeType _eNodeType, sal_uInt32 _nNodeID = 0); - OSQLParseNode(const ::rtl::OString& _rValue, + OSQLParseNode(const OString& _rValue, SQLNodeType eNewNodeType, sal_uInt32 nNewNodeID=0); - OSQLParseNode(const ::rtl::OUString& _rValue, + OSQLParseNode(const OUString& _rValue, SQLNodeType _eNodeType, sal_uInt32 _nNodeID = 0); @@ -272,7 +272,7 @@ namespace connectivity OSQLParseNode* removeAt(sal_uInt32 nPos); - void replaceNodeValue(const ::rtl::OUString& rTableAlias,const ::rtl::OUString& rColumnName); + void replaceNodeValue(const OUString& rTableAlias,const OUString& rColumnName); /** parses the node to a string which can be passed to a driver's connection for execution @@ -310,26 +310,26 @@ namespace connectivity If this method returns <FALSE/>, you're encouraged to check and handle the error in <arg>_pErrorHolder</arg>. */ - bool parseNodeToExecutableStatement( ::rtl::OUString& _out_rString, + bool parseNodeToExecutableStatement( OUString& _out_rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, OSQLParser& _rParser, ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const; - void parseNodeToStr(::rtl::OUString& rString, + void parseNodeToStr(OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const IParseContext* pContext = NULL, sal_Bool _bIntl = sal_False, sal_Bool _bQuote= sal_True) const; // quoted and internationalised - void parseNodeToPredicateStr(::rtl::OUString& rString, + void parseNodeToPredicateStr(OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::lang::Locale& rIntl, sal_Char _cDec, const IParseContext* pContext = NULL ) const; - void parseNodeToPredicateStr(::rtl::OUString& rString, + void parseNodeToPredicateStr(OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField, @@ -341,8 +341,8 @@ namespace connectivity #if OSL_DEBUG_LEVEL > 1 // shows the ParseTree with tabs and linefeeds - void showParseTree( ::rtl::OUString& rString ) const; - void showParseTree( ::rtl::OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const; + void showParseTree( OUString& rString ) const; + void showParseTree( OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const; #endif SQLNodeType getNodeType() const {return m_eNodeType;}; @@ -367,9 +367,9 @@ namespace connectivity // IsToken tests whether a Node is a Token (Terminal but not a rule) sal_Bool isToken() const {return !isRule();} - const ::rtl::OUString& getTokenValue() const {return m_aNodeValue;} + const OUString& getTokenValue() const {return m_aNodeValue;} - void setTokenValue(const ::rtl::OUString& rString) { if (isToken()) m_aNodeValue = rString;} + void setTokenValue(const OUString& rString) { if (isToken()) m_aNodeValue = rString;} sal_Bool isLeaf() const {return m_aChildren.empty();} @@ -396,8 +396,8 @@ namespace connectivity // _pTableNode must be a rule of that above or a SQL_TOKEN_NAME static sal_Bool getTableComponents(const OSQLParseNode* _pTableNode, ::com::sun::star::uno::Any &_rCatalog, - ::rtl::OUString &_rSchema, - ::rtl::OUString &_rTable + OUString &_rSchema, + OUString &_rTable ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData); // substitute all occurrences of :var or [name] into the dynamic parameter ? @@ -406,11 +406,11 @@ namespace connectivity /** return a table range when it exists. */ - static ::rtl::OUString getTableRange(const OSQLParseNode* _pTableRef); + static OUString getTableRange(const OSQLParseNode* _pTableRef); protected: // ParseNodeToStr concatenates all Tokens (leaves) of the ParseNodes. - void parseNodeToStr(::rtl::OUString& rString, + void parseNodeToStr(OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField, @@ -423,22 +423,22 @@ namespace connectivity bool _bSubstitute) const; private: - void impl_parseNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; - void impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; - void impl_parseTableRangeNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; + void impl_parseNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; + void impl_parseLikeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; + void impl_parseTableRangeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; /** parses a table_name node into a SQL statement particle. @return <TRUE/> if and only if parsing was successful, <FALSE/> if default handling should be applied. */ - bool impl_parseTableNameNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; + bool impl_parseTableNameNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; - sal_Bool addDateValue(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; - ::rtl::OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const; - ::rtl::OUString convertDateString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const; - ::rtl::OUString convertTimeString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const; - void parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; + sal_Bool addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; + OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const; + OUString convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const; + OUString convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const; + void parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; }; //----------------------------------------------------------------------------- diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index 173c669c3f0b..892d3ecb8db5 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -76,13 +76,13 @@ namespace connectivity virtual ~OParseContext(); // retrieves language specific error messages - virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const; + virtual OUString getErrorMessage(ErrorCode _eCodes) const; // retrieves language specific keyword strings (only ASCII allowed) - virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; + virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; // finds out, if we have an international keyword (only ASCII allowed) - virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const; + virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const; // determines the default international setting static const ::com::sun::star::lang::Locale& getDefaultLocale(); @@ -151,8 +151,8 @@ namespace connectivity OSQLParseNode* m_pParseTree; // result from parsing ::std::auto_ptr< OSQLParser_Data > m_pData; - ::rtl::OUString m_sFieldName; // current field name for a predicate - ::rtl::OUString m_sErrorMessage;// current error msg + OUString m_sFieldName; // current field name for a predicate + OUString m_sErrorMessage;// current error msg ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField; // current field @@ -166,7 +166,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> xDummy; // can be deleted after 627 // convert a string into double trim it to scale of _nscale and than transform it back to string - ::rtl::OUString stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale); + OUString stringToDouble(const OUString& _rValue,sal_Int16 _nScale); OSQLParseNode* buildDate(sal_Int32 _nType,OSQLParseNode*& pLiteral); bool extractDate(OSQLParseNode* pLiteral,double& _rfValue); void killThousandSeparator(OSQLParseNode* pLiteral); @@ -184,12 +184,12 @@ namespace connectivity ~OSQLParser(); // Parsing an SQLStatement - OSQLParseNode* parseTree(::rtl::OUString& rErrorMessage, - const ::rtl::OUString& rStatement, + OSQLParseNode* parseTree(OUString& rErrorMessage, + const OUString& rStatement, sal_Bool bInternational = sal_False); // Check a Predicate - OSQLParseNode* predicateTree(::rtl::OUString& rErrorMessage, const ::rtl::OUString& rStatement, + OSQLParseNode* predicateTree(OUString& rErrorMessage, const OUString& rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xField); @@ -200,24 +200,24 @@ namespace connectivity const SQLError& getErrorHelper() const; // TokenIDToStr: token name belonging to a token number. - static ::rtl::OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL); + static OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL); #if OSL_DEBUG_LEVEL > 1 // (empty string if not found) - static ::rtl::OUString RuleIDToStr(sal_uInt32 nRuleID); + static OUString RuleIDToStr(sal_uInt32 nRuleID); #endif - // StrToRuleID calculates the RuleID for a ::rtl::OUString (that is, ::com::sun::star::sdbcx::Index in yytname) + // StrToRuleID calculates the RuleID for a OUString (that is, ::com::sun::star::sdbcx::Index in yytname) // (0 if not found). The search for an ID based on a String is - // extremely inefficient (sequential search for ::rtl::OUString)! - static sal_uInt32 StrToRuleID(const ::rtl::OString & rValue); + // extremely inefficient (sequential search for OUString)! + static sal_uInt32 StrToRuleID(const OString & rValue); static OSQLParseNode::Rule RuleIDToRule( sal_uInt32 _nRule ); // RuleId with enum, far more efficient static sal_uInt32 RuleID(OSQLParseNode::Rule eRule); // compares the _sFunctionName with all known function names and return the DataType of the return value - static sal_Int32 getFunctionReturnType(const ::rtl::OUString& _sFunctionName, const IParseContext* pContext = NULL); + static sal_Int32 getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext = NULL); // returns the type for a parameter in a given function name static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); @@ -230,7 +230,7 @@ namespace connectivity // Is the parse in a special mode? // Predicate chack is used to check a condition for a field sal_Bool inPredicateCheck() const {return m_xField.is();} - const ::rtl::OUString& getFieldName() const {return m_sFieldName;} + const OUString& getFieldName() const {return m_sFieldName;} void reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank); // does not change the pLiteral argument diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx index f2ba862821ad..56b10ebd0d11 100644 --- a/connectivity/inc/connectivity/statementcomposer.hxx +++ b/connectivity/inc/connectivity/statementcomposer.hxx @@ -51,7 +51,7 @@ namespace dbtools */ StatementComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing ); @@ -67,8 +67,8 @@ namespace dbtools */ void setDisposeComposer( bool _bDoDispose ); - void setFilter( const ::rtl::OUString& _rFilter ); - void setOrder( const ::rtl::OUString& _rOrder ); + void setFilter( const OUString& _rFilter ); + void setOrder( const OUString& _rOrder ); /** returns the composer which has been fed with the current settings @@ -86,7 +86,7 @@ namespace dbtools @throws ::com::sun::star::sdbc::SQLException if such an exception occurs while creating the composer */ - ::rtl::OUString + OUString getQuery(); private: diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx index 1e12e9a60fd9..352c98d7a8c4 100644 --- a/connectivity/inc/connectivity/virtualdbtools.hxx +++ b/connectivity/inc/connectivity/virtualdbtools.hxx @@ -117,9 +117,9 @@ namespace connectivity { public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, + const OUString& _rDataSourceName, + const OUString& _rUser, + const OUString& _rPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ) = 0; @@ -152,19 +152,19 @@ namespace connectivity const ::com::sun::star::lang::Locale& _rLocale ) const = 0; - virtual ::rtl::OUString quoteName( - const ::rtl::OUString& _rQuote, - const ::rtl::OUString& _rName + virtual OUString quoteName( + const OUString& _rQuote, + const OUString& _rName ) const = 0; - virtual ::rtl::OUString composeTableNameForSelect( + virtual OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, - const ::rtl::OUString& _rName + const OUString& _rCatalog, + const OUString& _rSchema, + const OUString& _rName ) const = 0; - virtual ::rtl::OUString composeTableNameForSelect( + virtual OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ) const = 0; @@ -172,12 +172,12 @@ namespace connectivity virtual ::com::sun::star::sdb::SQLContext prependContextInfo( ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::rtl::OUString& _rContextDescription, - const ::rtl::OUString& _rContextDetails + const OUString& _rContextDescription, + const OUString& _rContextDetails ) const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( - const ::rtl::OUString& _rsRegisteredName, + const OUString& _rsRegisteredName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const = 0; @@ -185,16 +185,16 @@ namespace connectivity getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ) = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getFieldNamesByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ) = 0; @@ -259,14 +259,14 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant, const ::com::sun::star::util::Date& rNullDate ) const = 0; - virtual ::rtl::OUString getFormattedValue( + virtual OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::util::Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const = 0; - virtual ::rtl::OUString getFormattedValue( + virtual OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter, const ::com::sun::star::lang::Locale& _rLocale, @@ -285,12 +285,12 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS ISQLParseNode : public ::rtl::IReference { public: - virtual void parseNodeToStr(::rtl::OUString& _rString, + virtual void parseNodeToStr(OUString& _rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const IParseContext* _pContext ) const = 0; - virtual void parseNodeToPredicateStr(::rtl::OUString& _rString, + virtual void parseNodeToPredicateStr(OUString& _rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, @@ -312,8 +312,8 @@ namespace connectivity { public: virtual ::rtl::Reference< ISQLParseNode > predicateTree( - ::rtl::OUString& rErrorMessage, - const ::rtl::OUString& rStatement, + OUString& rErrorMessage, + const OUString& rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField ) const = 0; diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx index 63ebc4106a7e..5a013f9a5145 100644 --- a/connectivity/inc/connectivity/warningscontainer.hxx +++ b/connectivity/inc/connectivity/warningscontainer.hxx @@ -79,7 +79,7 @@ namespace dbtools the context of the warning */ void appendWarning( - const ::rtl::OUString& _rWarning, + const OUString& _rWarning, const sal_Char* _pAsciiSQLState, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext ); |