diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /dbaccess | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'dbaccess')
380 files changed, 3276 insertions, 3276 deletions
diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 9aa7963a899e..d699ef4c6c43 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -82,7 +82,7 @@ namespace dbaui @return <TRUE/> if the command is allowed, otherwise <FALSE/>. */ - virtual sal_Bool isCommandEnabled( const ::rtl::OUString& _rCompleteCommandURL ) const = 0; + virtual sal_Bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const = 0; /** registers a command URL, giving it a unique name @@ -96,7 +96,7 @@ namespace dbaui then 0 is returned. */ virtual sal_uInt16 - registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ) = 0; + registerCommandURL( const OUString& _rCompleteCommandURL ) = 0; /** notifyHiContrastChanged will be called when the hicontrast mode changed. @param _bHiContrast diff --git a/dbaccess/inc/dbaundomanager.hxx b/dbaccess/inc/dbaundomanager.hxx index cd3bb3a7ff36..a04b57248053 100644 --- a/dbaccess/inc/dbaundomanager.hxx +++ b/dbaccess/inc/dbaundomanager.hxx @@ -56,7 +56,7 @@ namespace dbaui void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -64,10 +64,10 @@ namespace dbaui virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/inc/dbsubcomponentcontroller.hxx b/dbaccess/inc/dbsubcomponentcontroller.hxx index b709458d03da..17319cb84325 100644 --- a/dbaccess/inc/dbsubcomponentcontroller.hxx +++ b/dbaccess/inc/dbsubcomponentcontroller.hxx @@ -92,7 +92,7 @@ namespace dbaui // ---------------------------------------------------------------- // access to the data source / document - ::rtl::OUString getDataSourceName() const; + OUString getDataSourceName() const; const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& getDataSource() const; sal_Bool haveDataSource() const; @@ -107,7 +107,7 @@ namespace dbaui /** appends an error in the current environment. */ void appendError( - const ::rtl::OUString& _rErrorMessage, + const OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState = ::dbtools::SQL_GENERAL_ERROR, const sal_Int32 _nErrorCode = 1000 ); @@ -160,7 +160,7 @@ namespace dbaui virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); protected: DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB); diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index e2da361b27de..6a7fd7f4bc2c 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -124,7 +124,7 @@ namespace dbaui optional< bool > bChecked; optional< bool > bInvisible; ::com::sun::star::uno::Any aValue; - optional< ::rtl::OUString > sTitle; + optional< OUString > sTitle; FeatureState() : bEnabled(sal_False) { } }; @@ -140,9 +140,9 @@ namespace dbaui }; // .................................................................... - typedef ::std::map < ::rtl::OUString + typedef ::std::map < OUString , ControllerFeature - , ::std::less< ::rtl::OUString > + , ::std::less< OUString > > SupportedFeatures; // .................................................................... @@ -268,13 +268,13 @@ namespace dbaui @param _nHelpId The help id to dispatch. */ - void openHelpAgent( const rtl::OString& _sHelpId ); + void openHelpAgent( const OString& _sHelpId ); /** open the help agent for the given help url. @param _pHelpStringURL The help url to dispatch. */ - void openHelpAgent( const rtl::OUString& _suHelpStringURL ); + void openHelpAgent( const OUString& _suHelpStringURL ); /** opens the given Help URL in the help agent @@ -342,7 +342,7 @@ namespace dbaui @see IController::registerCommandURL */ - bool isUserDefinedFeature( const ::rtl::OUString& _rFeatureURL ) const; + bool isUserDefinedFeature( const OUString& _rFeatureURL ) const; // connect to a datasource ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connect( @@ -352,8 +352,8 @@ namespace dbaui // connect to a datasource ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connect( - const ::rtl::OUString& _rsDataSourceName, - const ::rtl::OUString& _rContextInformation, + const OUString& _rsDataSourceName, + const OUString& _rContextInformation, ::dbtools::SQLExceptionInfo* _pErrorInfo ); @@ -369,7 +369,7 @@ namespace dbaui // XInitialize will be called inside initialize virtual void impl_initialize(); - virtual ::rtl::OUString getPrivateTitle() const { return ::rtl::OUString(); } + virtual OUString getPrivateTitle() const { return OUString(); } ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper_throw(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const @@ -393,7 +393,7 @@ namespace dbaui void ImplInvalidateFeature( sal_Int32 _nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _xListener, sal_Bool _bForceBroadcast ); sal_Bool ImplInvalidateTBItem(sal_uInt16 nId, const FeatureState& rState); - void ImplBroadcastFeatureState(const ::rtl::OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, sal_Bool _bIgnoreCache); + void ImplBroadcastFeatureState(const OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, sal_Bool _bIgnoreCache); // link methods DECL_LINK(OnAsyncInvalidateAll, void*); @@ -409,7 +409,7 @@ namespace dbaui // if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state - virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); + virtual void InvalidateFeature(const OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); // if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used. // if there is a toolbar slot with the given id it is updated (the new state is determined via GetState) // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state @@ -435,8 +435,8 @@ namespace dbaui virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const; - virtual sal_Bool isCommandEnabled(const ::rtl::OUString& _rCompleteCommandURL) const; - virtual sal_uInt16 registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ); + virtual sal_Bool isCommandEnabled(const OUString& _rCompleteCommandURL) const; + virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ); virtual void notifyHiContrastChanged(); virtual sal_Bool isDataSourceReadOnly() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > getXController() throw( ::com::sun::star::uno::RuntimeException ); @@ -457,7 +457,7 @@ namespace dbaui // ::com::sun::star::frame::XController2 virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getComponentWindow() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getViewControllerName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getViewControllerName() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCreationArguments() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XController @@ -481,7 +481,7 @@ namespace dbaui virtual void SAL_CALL setMasterDispatchProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & _xNewProvider) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent @@ -496,17 +496,17 @@ namespace dbaui virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; - 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) = 0; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; + 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) = 0; // XDispatchInformationProvider virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 ) throw (::com::sun::star::uno::RuntimeException); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); // XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index 2d0151c88177..7b8498768485 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -52,7 +52,7 @@ class DBAccessTest : public test::BootstrapFixture, public unotest::MacrosTest public: DBAccessTest(); - void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -66,14 +66,14 @@ public: CPPUNIT_TEST_SUITE_END(); private: - rtl::OUString m_aBaseString; + OUString m_aBaseString; }; -void DBAccessTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) +void DBAccessTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - rtl::OUString aSep("/"); - rtl::OUStringBuffer aBuffer( getSrcRootURL() ); + OUString aSep("/"); + OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); rFilePath = aBuffer.makeStringAndClear(); @@ -86,9 +86,9 @@ DBAccessTest::DBAccessTest() void DBAccessTest::test() { - const rtl::OUString aFileNameBase("testdb."); - const rtl::OUString aFileExtension("odb"); - rtl::OUString aFileName; + const OUString aFileNameBase("testdb."); + const OUString aFileExtension("odb"); + OUString aFileName; createFileURL(aFileNameBase, aFileExtension, aFileName); uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); CPPUNIT_ASSERT(xComponent.is()); diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index f7f79e28e93d..dce28eba521a 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::osl; -void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index c61f40b4644c..2fae48bf178b 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -39,7 +39,7 @@ namespace dbaccess m_xRowLocate = NULL; } - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbcx::XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index 0994d91539dc..dc83d81dd42e 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -38,7 +38,7 @@ using namespace dbaccess; using namespace cppu; -ObjectType OIndexes::createObject(const ::rtl::OUString& _rName) +ObjectType OIndexes::createObject(const OUString& _rName) { ObjectType xRet; if ( m_xIndexes.is() && m_xIndexes->hasByName(_rName) ) @@ -59,7 +59,7 @@ Reference< XPropertySet > OIndexes::createDescriptor() } // XAppend -ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference<XAppend> xData( m_xIndexes,UNO_QUERY); if ( !xData.is() ) @@ -70,7 +70,7 @@ ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Refer } // XDrop -void OIndexes::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OIndexes::dropObject(sal_Int32 _nPos,const OUString _sElementName) { if ( m_xIndexes.is() ) { diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx index 33986f1804e8..25c58152f511 100644 --- a/dbaccess/source/core/api/CIndexes.hxx +++ b/dbaccess/source/core/api/CIndexes.hxx @@ -28,14 +28,14 @@ namespace dbaccess { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xIndexes; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::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 connectivity::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: OIndexes(connectivity::OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes ) : connectivity::OIndexesHelper(_pTable,_rMutex,_rVector) ,m_xIndexes(_rxIndexes) diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 2f4ce681ce08..a1fa8c941fd8 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -37,7 +37,7 @@ namespace dbaccess { ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos, - const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rDescription, const ::rtl::OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue ) + const Reference< XDatabaseMetaData >& _rxDBMeta, const OUString& _rDescription, const OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue ) :ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel,_rColumnValue ) { } @@ -46,7 +46,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaDa { BEGIN_PROPERTY_SEQUENCE(21) - DECL_PROP1( CATALOGNAME, ::rtl::OUString, READONLY ); + DECL_PROP1( CATALOGNAME, OUString, READONLY ); DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY ); DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY ); DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY ); @@ -58,14 +58,14 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaDa DECL_PROP1_BOOL( ISSEARCHABLE, READONLY ); DECL_PROP1_BOOL( ISSIGNED, READONLY ); DECL_PROP1_BOOL( ISWRITABLE, READONLY ); - DECL_PROP1( LABEL, ::rtl::OUString, READONLY ); + DECL_PROP1( LABEL, OUString, READONLY ); DECL_PROP1( PRECISION, sal_Int32, READONLY ); DECL_PROP1( SCALE, sal_Int32, READONLY ); - DECL_PROP1( SCHEMANAME, ::rtl::OUString, READONLY ); - DECL_PROP1( SERVICENAME, ::rtl::OUString, READONLY ); - DECL_PROP1( TABLENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( SCHEMANAME, OUString, READONLY ); + DECL_PROP1( SERVICENAME, OUString, READONLY ); + DECL_PROP1( TABLENAME, OUString, READONLY ); DECL_PROP1( TYPE, sal_Int32, READONLY ); - DECL_PROP1( TYPENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( TYPENAME, OUString, READONLY ); DECL_PROP2( VALUE, Any, READONLY, BOUND ); END_PROPERTY_SEQUENCE() diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index ddb134b5c684..c51579c86099 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -36,8 +36,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow, sal_Int32 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, ORowSetCacheIterator& _rColumnValue); virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index d16c211e13b8..f9b00667a98a 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -45,8 +45,8 @@ ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& const Reference < XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, const Reference< XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, const ORowSetCacheIterator& _rColumnValue) :ODataColumn(_xMetaData,_xRow,_xRowUpdate,_nPos,_rxDBMeta) ,m_aColumnValue(_rColumnValue) @@ -68,7 +68,7 @@ ORowSetDataColumn::~ORowSetDataColumn() { BEGIN_PROPERTY_SEQUENCE(21) - DECL_PROP1( CATALOGNAME, ::rtl::OUString, READONLY ); + DECL_PROP1( CATALOGNAME, OUString, READONLY ); DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY ); DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY ); DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY ); @@ -80,14 +80,14 @@ ORowSetDataColumn::~ORowSetDataColumn() DECL_PROP1_BOOL( ISSEARCHABLE, READONLY ); DECL_PROP1_BOOL( ISSIGNED, READONLY ); DECL_PROP1_BOOL( ISWRITABLE, READONLY ); - DECL_PROP1( LABEL, ::rtl::OUString, READONLY ); + DECL_PROP1( LABEL, OUString, READONLY ); DECL_PROP1( PRECISION, sal_Int32, READONLY ); DECL_PROP1( SCALE, sal_Int32, READONLY ); - DECL_PROP1( SCHEMANAME, ::rtl::OUString, READONLY ); - DECL_PROP1( SERVICENAME, ::rtl::OUString, READONLY ); - DECL_PROP1( TABLENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( SCHEMANAME, OUString, READONLY ); + DECL_PROP1( SERVICENAME, OUString, READONLY ); + DECL_PROP1( TABLENAME, OUString, READONLY ); DECL_PROP1( TYPE, sal_Int32, READONLY ); - DECL_PROP1( TYPENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( TYPENAME, OUString, READONLY ); DECL_PROP1( VALUE, Any, BOUND ); END_PROPERTY_SEQUENCE() @@ -216,7 +216,7 @@ ORowSetDataColumns::ORowSetDataColumns( const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ) : connectivity::sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aColumns(_rColumns) { @@ -228,7 +228,7 @@ ORowSetDataColumns::~ORowSetDataColumns() DBG_DTOR(ORowSetDataColumns ,NULL); } -sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName) { connectivity::sdbcx::ObjectType xNamed; @@ -246,7 +246,7 @@ void SAL_CALL ORowSetDataColumns::disposing(void) m_aColumns = NULL; } -void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector) +void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector) { m_aColumns = _rColumns; reFill(_rVector); diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index bc75088bd081..bd87766d707e 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -40,8 +40,8 @@ namespace dbaccess ORowSetCacheIterator m_aColumnValue; ::com::sun::star::uno::Any m_aOldValue; - ::rtl::OUString m_sLabel; - ::rtl::OUString m_aDescription; // description + OUString m_sLabel; + OUString m_aDescription; // description ORowSetBase* m_pRowSet; virtual ~ORowSetDataColumn(); @@ -51,8 +51,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, const ORowSetCacheIterator& _rColumnValue); @@ -81,7 +81,7 @@ namespace dbaccess { ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: ORowSetDataColumns( @@ -89,12 +89,12 @@ namespace dbaccess const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ); virtual ~ORowSetDataColumns(); // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); - void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector); + void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector); }; } diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 1efe897dce16..268854781269 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -69,17 +69,17 @@ OCacheSet::OCacheSet(sal_Int32 i_nMaxRows) } -::rtl::OUString OCacheSet::getIdentifierQuoteString() const +OUString OCacheSet::getIdentifierQuoteString() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getIdentifierQuoteString" ); - ::rtl::OUString sQuote; + OUString sQuote; Reference<XDatabaseMetaData> xMeta; if ( m_xConnection.is() && (xMeta = m_xConnection->getMetaData()).is() ) sQuote = xMeta->getIdentifierQuoteString(); return sQuote; } -void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) +void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const OUString& /*i_sRowSetFilter*/) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" ); OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet"); @@ -162,10 +162,10 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti OUStringBuffer aSql("INSERT INTO " + m_aComposedTableName + " ( "); // set values and column names - ::rtl::OUStringBuffer aValues(" VALUES ( "); - static ::rtl::OUString aPara("?,"); - ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aComma(","); + OUStringBuffer aValues(" VALUES ( "); + static OUString aPara("?,"); + OUString aQuote = getIdentifierQuoteString(); + static OUString aComma(","); sal_Int32 i = 1; ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->get().begin()+1; connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end(); @@ -200,8 +200,8 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti void OCacheSet::fillParameters( const ORowSetRow& _rRow ,const connectivity::OSQLTable& _xTable - ,::rtl::OUStringBuffer& _sCondition - ,::rtl::OUStringBuffer& _sParameter + ,OUStringBuffer& _sCondition + ,OUStringBuffer& _sParameter ,::std::list< sal_Int32>& _rOrgValues) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillParameters" ); @@ -232,18 +232,18 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow } } - ::rtl::OUString aColumnName; + OUString aColumnName; - static ::rtl::OUString aPara("?,"); - static ::rtl::OUString aAnd(" AND "); + static OUString aPara("?,"); + static OUString aAnd(" AND "); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + OUString aQuote = getIdentifierQuoteString(); sal_Int32 nCheckCount = 1; // index for the orginal values sal_Int32 i = 1; - ::rtl::OUString sIsNull(" IS NULL"); - ::rtl::OUString sParam(" = ?"); + OUString sIsNull(" IS NULL"); + OUString sParam(" = ?"); ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rRow->get().begin()+1; ORowVector< ORowSetValue >::Vector::const_iterator aEnd = _rRow->get().end()+1; for(; aIter != aEnd;++aIter,++nCheckCount,++i) @@ -292,7 +292,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR OUStringBuffer aSql("UPDATE " + m_aComposedTableName + " SET "); // list all cloumns that should be set - ::rtl::OUStringBuffer aCondition; + OUStringBuffer aCondition; ::std::list< sal_Int32> aOrgValues; fillParameters(_rInsertRow,_xTable,aCondition,aSql,aOrgValues); aSql[aSql.getLength() - 1] = ' '; @@ -362,7 +362,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti } } - ::rtl::OUStringBuffer aColumnName; + OUStringBuffer aColumnName; ::std::list< sal_Int32> aOrgValues; fillParameters(_rDeleteRow,_xTable,aSql,aColumnName,aOrgValues); @@ -416,7 +416,7 @@ sal_Bool SAL_CALL OCacheSet::wasNull( ) throw(SQLException, RuntimeException) return m_xDriverRow->wasNull(); } -::rtl::OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getString" ); return m_xDriverRow->getString(columnIndex); diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 15040e3c1f00..7b3abf6dfec4 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -52,7 +52,7 @@ namespace dbaccess ::com::sun::star::uno::Sequence<sal_Bool> m_aSignedFlags; ::com::sun::star::uno::Sequence<sal_Int32> m_aColumnTypes; ORowSetRow m_aInsertRow; - ::rtl::OUString m_aComposedTableName; + OUString m_aComposedTableName; sal_Int32 m_nMaxRows; sal_Bool m_bInserted; sal_Bool m_bUpdated; @@ -69,21 +69,21 @@ namespace dbaccess ) const; void fillParameters( const ORowSetRow& _rRow ,const connectivity::OSQLTable& _xTable - ,::rtl::OUStringBuffer& _sCondition - ,::rtl::OUStringBuffer& _sParameter + ,OUStringBuffer& _sCondition + ,OUStringBuffer& _sParameter ,::std::list< sal_Int32>& _rOrgValues); void fillTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getIdentifierQuoteString() const; + OUString getIdentifierQuoteString() const; public: // late constructor - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 32691e19be7f..629bb8576652 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -46,13 +46,13 @@ namespace dbaccess /** creates a vector of WildCards and reduce the _rTableFilter of the length of WildsCards */ -sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut) +sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OFilteredContainer::createWildCardVector" ); // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard // for them - ::rtl::OUString* pTableFilters = _rTableFilter.getArray(); - ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength(); + OUString* pTableFilters = _rTableFilter.getArray(); + OUString* pEnd = pTableFilters + _rTableFilter.getLength(); sal_Int32 nShiftPos = 0; for (sal_Int32 i=0; pEnd != pTableFilters; ++pTableFilters,++i) { @@ -74,14 +74,14 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std return nShiftPos; } - bool lcl_isElementAllowed( const ::rtl::OUString& _rName, - const Sequence< ::rtl::OUString >& _rTableFilter, + bool lcl_isElementAllowed( const OUString& _rName, + const Sequence< OUString >& _rTableFilter, const ::std::vector< WildCard >& _rWCSearch ) { sal_Int32 nTableFilterLen = _rTableFilter.getLength(); - const ::rtl::OUString* tableFilter = _rTableFilter.getConstArray(); - const ::rtl::OUString* tableFilterEnd = _rTableFilter.getConstArray() + nTableFilterLen; + const OUString* tableFilter = _rTableFilter.getConstArray(); + const OUString* tableFilterEnd = _rTableFilter.getConstArray() + nTableFilterLen; bool bFilterMatch = ::std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd; // the table is allowed to "pass" if we had no filters at all or any of the non-wildcard filters matches if (!bFilterMatch && !_rWCSearch.empty()) @@ -96,7 +96,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std return bFilterMatch; } - typedef ::boost::optional< ::rtl::OUString > OptionalString; + typedef ::boost::optional< OUString > OptionalString; struct TableInfo { OptionalString sComposedName; @@ -105,13 +105,13 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std OptionalString sSchema; OptionalString sName; - TableInfo( const ::rtl::OUString& _composedName ) + TableInfo( const OUString& _composedName ) :sComposedName( _composedName ) { } - TableInfo( const ::rtl::OUString& _catalog, const ::rtl::OUString& _schema, const ::rtl::OUString& _name, - const ::rtl::OUString& _type ) + TableInfo( const OUString& _catalog, const OUString& _schema, const OUString& _name, + const OUString& _type ) :sComposedName() ,sType( _type ) ,sCatalog( _catalog ) @@ -148,7 +148,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std if ( !_masterContainer.is() ) throw RuntimeException(); - ::rtl::OUString sTypeName; + OUString sTypeName; try { Reference< XPropertySet > xTable( _masterContainer->getByName( *_io_tableInfo.sComposedName ), UNO_QUERY_THROW ); @@ -162,7 +162,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } connectivity::TStringVector lcl_filter( const TableInfos& _unfilteredTables, - const Sequence< ::rtl::OUString >& _tableFilter, const Sequence< ::rtl::OUString >& _tableTypeFilter, + const Sequence< OUString >& _tableFilter, const Sequence< OUString >& _tableTypeFilter, const Reference< XDatabaseMetaData >& _metaData, const Reference< XNameAccess >& _masterContainer ) { TableInfos aFilteredTables; @@ -179,7 +179,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them ::std::vector< WildCard > aWildCardTableFilter; - Sequence< ::rtl::OUString > aNonWildCardTableFilter = _tableFilter; + Sequence< OUString > aNonWildCardTableFilter = _tableFilter; nTableFilterCount = createWildCardVector( aNonWildCardTableFilter, aWildCardTableFilter ); TableInfos aUnfilteredTables( _unfilteredTables ); @@ -207,8 +207,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std TableInfos aUnfilteredTables; aUnfilteredTables.swap( aFilteredTables ); - const ::rtl::OUString* pTableTypeFilterBegin = _tableTypeFilter.getConstArray(); - const ::rtl::OUString* pTableTypeFilterEnd = pTableTypeFilterBegin + _tableTypeFilter.getLength(); + const OUString* pTableTypeFilterBegin = _tableTypeFilter.getConstArray(); + const OUString* pTableTypeFilterEnd = pTableTypeFilterBegin + _tableTypeFilter.getLength(); for ( TableInfos::iterator table = aUnfilteredTables.begin(); table != aUnfilteredTables.end(); @@ -245,7 +245,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) - :OCollection(_rParent,_bCase,_rMutex,::std::vector< ::rtl::OUString>()) + :OCollection(_rParent,_bCase,_rMutex,::std::vector< OUString>()) ,m_bConstructed(sal_False) ,m_pWarningsContainer(_pWarningsContainer) ,m_pRefreshListener(_pRefreshListener) @@ -255,8 +255,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } void OFilteredContainer::construct(const Reference< XNameAccess >& _rxMasterContainer, - const Sequence< ::rtl::OUString >& _rTableFilter, - const Sequence< ::rtl::OUString >& _rTableTypeFilter) + const Sequence< OUString >& _rTableFilter, + const Sequence< OUString >& _rTableTypeFilter) { try { @@ -277,9 +277,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std TableInfos aUnfilteredTables; - Sequence< ::rtl::OUString > aNames = m_xMasterContainer->getElementNames(); - const ::rtl::OUString* name = aNames.getConstArray(); - const ::rtl::OUString* nameEnd = name + aNames.getLength(); + Sequence< OUString > aNames = m_xMasterContainer->getElementNames(); + const OUString* name = aNames.getConstArray(); + const OUString* nameEnd = name + aNames.getLength(); for ( ; name != nameEnd; ++name ) aUnfilteredTables.push_back( TableInfo( *name ) ); @@ -294,10 +294,10 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - void OFilteredContainer::construct(const Sequence< ::rtl::OUString >& _rTableFilter, const Sequence< ::rtl::OUString >& _rTableTypeFilter) + void OFilteredContainer::construct(const Sequence< OUString >& _rTableFilter, const Sequence< OUString >& _rTableTypeFilter) { // build sorted versions of the filter sequences, so the visibility decision is faster - Sequence< ::rtl::OUString > aTableFilter(_rTableFilter); + Sequence< OUString > aTableFilter(_rTableFilter); // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them @@ -312,14 +312,14 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // create a table table filter suitable for the XDatabaseMetaData::getTables call, // taking into account both the externally-provided table type filter, and any // table type restriction which is inherent to the container - Sequence< ::rtl::OUString > aTableTypeFilter; - ::rtl::OUString sInherentTableTypeRestriction( getTableTypeRestriction() ); + Sequence< OUString > aTableTypeFilter; + OUString sInherentTableTypeRestriction( getTableTypeRestriction() ); if ( !sInherentTableTypeRestriction.isEmpty() ) { if ( _rTableTypeFilter.getLength() != 0 ) { - const ::rtl::OUString* tableType = _rTableTypeFilter.getConstArray(); - const ::rtl::OUString* tableTypeEnd = tableType + _rTableTypeFilter.getLength(); + const OUString* tableType = _rTableTypeFilter.getConstArray(); + const OUString* tableTypeEnd = tableType + _rTableTypeFilter.getLength(); for ( ; tableType != tableTypeEnd; ++tableType ) { if ( *tableType == sInherentTableTypeRestriction ) @@ -348,13 +348,13 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - static const ::rtl::OUString sAll("%"); + static const OUString sAll("%"); Reference< XResultSet > xTables = m_xMetaData->getTables( Any(), sAll, sAll, aTableTypeFilter ); Reference< XRow > xCurrentRow( xTables, UNO_QUERY_THROW ); TableInfos aUnfilteredTables; - ::rtl::OUString sCatalog, sSchema, sName, sType; + OUString sCatalog, sSchema, sName, sType; while ( xTables->next() ) { sCatalog = xCurrentRow->getString(1); @@ -407,7 +407,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - ::rtl::OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) + OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) { OSL_ENSURE( _xObject.is(), "OFilteredContainer::getNameForObject: Object is NULL!" ); return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false ); @@ -426,7 +426,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // drivers, even the ones which do not understand the standard #define FILTER_MODE_MIX_ALL 3 - void OFilteredContainer::getAllTableTypeFilter( Sequence< ::rtl::OUString >& /* [out] */ _rFilter ) const + void OFilteredContainer::getAllTableTypeFilter( Sequence< OUString >& /* [out] */ _rFilter ) const { sal_Int32 nFilterMode = FILTER_MODE_MIX_ALL; // for compatibility reasons, this is the default: we used this way before we @@ -439,9 +439,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std OSL_VERIFY( aFilterModeSetting >>= nFilterMode ); } - const ::rtl::OUString sAll( "%" ); - const ::rtl::OUString sView( "VIEW" ); - const ::rtl::OUString sTable( "TABLE" ); + const OUString sAll( "%" ); + const OUString sView( "VIEW" ); + const OUString sTable( "TABLE" ); switch ( nFilterMode ) { diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index e16d6dcd4af4..54366b41314a 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -41,7 +41,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, sal_Bool _bUseAsIndex ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector,_bUseAsIndex) ,m_aColumns(_rColumns) @@ -51,9 +51,9 @@ namespace dbaccess OPrivateColumns* OPrivateColumns::createWithIntrinsicNames( const ::rtl::Reference< ::connectivity::OSQLColumns >& _rColumns, sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex ) { - ::std::vector< ::rtl::OUString > aNames; aNames.reserve( _rColumns->get().size() ); + ::std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() ); - ::rtl::OUString sColumName; + OUString sColumName; for ( ::connectivity::OSQLColumns::Vector::const_iterator column = _rColumns->get().begin(); column != _rColumns->get().end(); ++column @@ -75,7 +75,7 @@ namespace dbaccess OPrivateColumns_Base::disposing(); } - connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const OUString& _rName) { if ( m_aColumns.is() ) { @@ -91,7 +91,7 @@ namespace dbaccess return NULL; } - connectivity::sdbcx::ObjectType OPrivateTables::createObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType OPrivateTables::createObject(const OUString& _rName) { if ( !m_aTables.empty() ) { diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index c48a8b13ec8e..992b6c23c4ce 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -46,7 +46,7 @@ namespace dbaccess { ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} virtual Reference< XPropertySet > createDescriptor() { @@ -57,7 +57,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, sal_Bool _bUseAsIndex = sal_False ); @@ -81,7 +81,7 @@ namespace dbaccess { OSQLTables m_aTables; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} virtual Reference< XPropertySet > createDescriptor() { @@ -92,7 +92,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aTables(_rTables) { diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 118579014c67..571add7c163d 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -36,9 +36,9 @@ namespace dbaccess { struct SelectColumnDescription { - ::rtl::OUString sRealName; // may be empty - ::rtl::OUString sTableName; // may be empty - ::rtl::OUString sDefaultValue; + OUString sRealName; // may be empty + OUString sTableName; // may be empty + OUString sDefaultValue; sal_Int32 nPosition; sal_Int32 nType; sal_Int32 nScale; @@ -52,7 +52,7 @@ namespace dbaccess { } - SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, sal_Int32 _nScale,sal_Bool _bNullable, const ::rtl::OUString& _rDefaultValue ) + SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, sal_Int32 _nScale,sal_Bool _bNullable, const OUString& _rDefaultValue ) :sDefaultValue( _rDefaultValue ) ,nPosition( _nPosition ) ,nType( _nType ) @@ -61,12 +61,12 @@ namespace dbaccess { } }; - typedef ::std::map< ::rtl::OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; + typedef ::std::map< OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; // the elements of _rxQueryColumns must have the properties PROPERTY_REALNAME and PROPERTY_TABLENAME void getColumnPositions(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxQueryColumns, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rColumnNames, - const ::rtl::OUString& _rsUpdateTableName, + const ::com::sun::star::uno::Sequence< OUString >& _rColumnNames, + const OUString& _rsUpdateTableName, SelectColumnsMetaData& o_rColumnNames /* out */, bool i_bAppendTableName = false); @@ -80,7 +80,7 @@ namespace dbaccess OKeySetMatrix m_aKeyMap; OKeySetMatrix::iterator m_aKeyIter; - ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones + ::std::vector< OUString > m_aAutoColumns; // contains all columns which are autoincrement ones OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching ORowSetValueVector m_aParameterValueForCache; @@ -105,9 +105,9 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer; - const ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sRowSetFilter; - ::std::vector< ::rtl::OUString > m_aFilterColumns; + const OUString m_sUpdateTableName; + OUString m_sRowSetFilter; + ::std::vector< OUString > m_aFilterColumns; sal_Int32& m_rRowCount; sal_Bool m_bRowCountFinal; @@ -130,7 +130,7 @@ namespace dbaccess void initColumns(); SAL_WNODEPRECATED_DECLARATIONS_PUSH void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable, - const ::rtl::OUString& i_rUpdateTableName, + const OUString& i_rUpdateTableName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns, ::std::auto_ptr<SelectColumnsMetaData>& o_pKeyColumnNames); @@ -142,29 +142,29 @@ namespace dbaccess const connectivity::ORowSetValue &_rValue, sal_Int32 _nType, sal_Int32 _nScale ) const; - ::rtl::OUStringBuffer createKeyFilter( ); + OUStringBuffer createKeyFilter( ); bool doTryRefetch_throw() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);; void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); - void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>()); - void executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName = ::rtl::OUString(),bool bRefetch = false); - void executeStatement(::rtl::OUStringBuffer& io_aFilter, ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); + void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>()); + void executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQL,const OUString& i_sTableName = OUString(),bool bRefetch = false); + void executeStatement(OUStringBuffer& io_aFilter, ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); virtual ~OKeySet(); public: OKeySet(const connectivity::OSQLTable& _xTable, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xTableKeys, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, const ORowSetValueVector& _aParameterValueForCache, sal_Int32 i_nMaxRows, sal_Int32& o_nRowCount); // late ctor which can throw exceptions - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 8ff2da819b01..be34382fad9e 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -66,12 +66,12 @@ using namespace ::com::sun::star; using namespace ::cppu; using namespace ::osl; -DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUStringBuffer,TSQLStatements); +DECLARE_STL_USTRINGACCESS_MAP(OUStringBuffer,TSQLStatements); namespace { - void lcl_fillKeyCondition(const ::rtl::OUString& i_sTableName,const ::rtl::OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions) + void lcl_fillKeyCondition(const OUString& i_sTableName,const OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions) { - ::rtl::OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName]; + OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName]; if ( !rKeyCondition.isEmpty() ) rKeyCondition.append(" AND "); rKeyCondition.append(i_sQuotedColumnName); @@ -90,7 +90,7 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext, const ORowSetValueVector& _aParameterValueForCache, sal_Int32 i_nMaxRows, sal_Int32& o_nRowCount) - :OKeySet(NULL,NULL,::rtl::OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount) + :OKeySet(NULL,NULL,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount) ,m_aSqlParser( _rContext ) ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, NULL ) ,m_bResultSetChanged(false) @@ -104,7 +104,7 @@ OptimisticSet::~OptimisticSet() DBG_DTOR(OptimisticSet,NULL); } -void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::construct" ); @@ -119,9 +119,9 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: const Reference<XNameAccess> xQueryColumns = xQueryColSup->getColumns(); const Reference<XTablesSupplier> xTabSup(m_xComposer,UNO_QUERY); const Reference<XNameAccess> xTables = xTabSup->getTables(); - const Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames(); - const ::rtl::OUString* pTableNameIter = aTableNames.getConstArray(); - const ::rtl::OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength(); + const Sequence< OUString> aTableNames = xTables->getElementNames(); + const OUString* pTableNameIter = aTableNames.getConstArray(); + const OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength(); for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -140,15 +140,15 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: void OptimisticSet::makeNewStatement( ) { - ::rtl::OUStringBuffer aFilter = createKeyFilter(); + OUStringBuffer aFilter = createKeyFilter(); Reference< XSingleSelectQueryComposer> xSourceComposer(m_xComposer,UNO_QUERY); Reference< XMultiServiceFactory > xFactory(m_xConnection, UNO_QUERY_THROW); Reference<XSingleSelectQueryComposer> xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY); - ::rtl::OUString sQuery = xSourceComposer->getQuery(); + OUString sQuery = xSourceComposer->getQuery(); xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery()); // check for joins - ::rtl::OUString aErrorMsg; + OUString aErrorMsg; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) ); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -156,7 +156,7 @@ void OptimisticSet::makeNewStatement( ) m_aSqlIterator.traverseAll(); fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions()); - const ::rtl::OUString sComposerFilter = m_xComposer->getFilter(); + const OUString sComposerFilter = m_xComposer->getFilter(); if ( !m_sRowSetFilter.isEmpty() || !sComposerFilter.isEmpty() ) { FilterCreator aFilterCreator; @@ -184,10 +184,10 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( m_aJoinedKeyColumns.empty() ) throw SQLException(); // list all cloumns that should be set - static ::rtl::OUString s_sPara(" = ?"); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + static OUString s_sPara(" = ?"); + OUString aQuote = getIdentifierQuoteString(); - ::std::map< ::rtl::OUString,bool > aResultSetChanged; + ::std::map< OUString,bool > aResultSetChanged; TSQLStatements aKeyConditions; TSQLStatements aIndexConditions; TSQLStatements aSql; @@ -199,7 +199,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow { if ( aResultSetChanged.find( aIter->second.sTableName ) == aResultSetChanged.end() ) aResultSetChanged[aIter->second.sTableName] = false; - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { aResultSetChanged[aIter->second.sTableName] = m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end(); @@ -215,7 +215,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow { (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition]; } - ::rtl::OUStringBuffer& rPart = aSql[aIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName + s_sPara); @@ -228,8 +228,8 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if( aKeyConditions.empty() ) ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection ); - static const ::rtl::OUString s_sUPDATE("UPDATE "); - static const ::rtl::OUString s_sSET(" SET "); + static const OUString s_sUPDATE("UPDATE "); + static const OUString s_sSET(" SET "); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); @@ -240,11 +240,11 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( aSqlIter->second.getLength() ) { m_bResultSetChanged = m_bResultSetChanged || aResultSetChanged[aSqlIter->first]; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUStringBuffer sSql(s_sUPDATE + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + + OUStringBuffer sSql(s_sUPDATE + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + s_sSET + aSqlIter->second.toString()); - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) sSql.append(" WHERE " + rCondition.toString() ); @@ -259,8 +259,8 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn TSQLStatements aSql; TSQLStatements aParameter; TSQLStatements aKeyConditions; - ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::std::map< OUString,bool > aResultSetChanged; + OUString aQuote = getIdentifierQuoteString(); // here we build the condition part for the update statement SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); @@ -270,7 +270,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn if ( aResultSetChanged.find( aIter->second.sTableName ) == aResultSetChanged.end() ) aResultSetChanged[aIter->second.sTableName] = false; - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); if ( (_rInsertRow->get())[aIter->second.nPosition].isModified() ) { if ( m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end() ) @@ -283,11 +283,11 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn { (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition]; } - ::rtl::OUStringBuffer& rPart = aSql[aIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName); - ::rtl::OUStringBuffer& rParam = aParameter[aIter->second.sTableName]; + OUStringBuffer& rParam = aParameter[aIter->second.sTableName]; if ( !rParam.isEmpty() ) rParam.append(", "); rParam.append("?"); @@ -297,8 +297,8 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), SQL_GENERAL_ERROR, m_xConnection ); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); - static const ::rtl::OUString s_sINSERT("INSERT INTO "); - static const ::rtl::OUString s_sVALUES(") VALUES ( "); + static const OUString s_sINSERT("INSERT INTO "); + static const OUString s_sVALUES(") VALUES ( "); TSQLStatements::iterator aSqlIter = aSql.begin(); TSQLStatements::iterator aSqlEnd = aSql.end(); for(;aSqlIter != aSqlEnd ; ++aSqlIter) @@ -306,16 +306,16 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn if ( aSqlIter->second.getLength() ) { m_bResultSetChanged = m_bResultSetChanged || aResultSetChanged[aSqlIter->first]; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); - ::rtl::OUString sSql(s_sINSERT + sComposedTableName + " ( " + aSqlIter->second.toString() + + OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); + OUString sSql(s_sINSERT + sComposedTableName + " ( " + aSqlIter->second.toString() + s_sVALUES + aParameter[aSqlIter->first].toString() + " )"); - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + + OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + rCondition.toString()); try @@ -353,7 +353,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - ::rtl::OUString aQuote = getIdentifierQuoteString(); + OUString aQuote = getIdentifierQuoteString(); TSQLStatements aKeyConditions; TSQLStatements aIndexConditions; TSQLStatements aSql; @@ -366,7 +366,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne if ( m_aJoinedKeyColumns.find(aIter->second.nPosition) == m_aJoinedKeyColumns.end() && m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { // only delete rows which aren't the key in the join - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); lcl_fillKeyCondition(aIter->second.sTableName,sQuotedColumnName,(_rDeleteRow->get())[aIter->second.nPosition],aKeyConditions); } } @@ -375,19 +375,19 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne TSQLStatements::iterator aSqlEnd = aKeyConditions.end(); for(;aSqlIter != aSqlEnd ; ++aSqlIter) { - ::rtl::OUStringBuffer& rCondition = aSqlIter->second; + OUStringBuffer& rCondition = aSqlIter->second; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sSql("DELETE FROM " + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + + OUString sSql("DELETE FROM " + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + " WHERE " + rCondition.toString() ); executeDelete(_rDeleteRow, sSql, aSqlIter->first); } } } -void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName) +void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::executeDelete" ); @@ -420,16 +420,16 @@ void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_ ::std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin(); for(;aIter != i_aJoinColumns.end();++aIter) { - ::rtl::OUString sColumnName,sTableName; + OUString sColumnName,sTableName; m_aSqlIterator.getColumnRange(aIter->first,sColumnName,sTableName); - ::rtl::OUString sLeft(sTableName + "." + sColumnName); + OUString sLeft(sTableName + "." + sColumnName); m_aSqlIterator.getColumnRange(aIter->second,sColumnName,sTableName); - ::rtl::OUString sRight(sTableName + "." + sColumnName); + OUString sRight(sTableName + "." + sColumnName); fillJoinedColumns_throw(sLeft, sRight); } } -void OptimisticSet::fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn) +void OptimisticSet::fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn) { sal_Int32 nLeft = 0,nRight = 0; SelectColumnsMetaData::const_iterator aLeftIter = m_pKeyColumnNames->find(i_sLeftColumn); @@ -478,7 +478,7 @@ bool OptimisticSet::isResultSetChanged() const void OptimisticSet::reset(const Reference< XResultSet>& _xDriverSet) { - OCacheSet::construct(_xDriverSet,::rtl::OUString()); + OCacheSet::construct(_xDriverSet,OUString()); m_bRowCountFinal = sal_False; m_aKeyMap.clear(); OKeySetValue keySetValue((ORowSetValueVector *)NULL,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL)); @@ -515,8 +515,8 @@ namespace }; struct TableNameFunctor : ::std::unary_function<SelectColumnsMetaData::value_type,bool> { - ::rtl::OUString m_sTableName; - TableNameFunctor(const ::rtl::OUString& i_sTableName) + OUString m_sTableName; + TableNameFunctor(const OUString& i_sTableName) : m_sTableName(i_sTableName) { } @@ -537,7 +537,7 @@ bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCac SelectColumnsMetaData::const_iterator aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),PositionFunctor(*aColIdxIter)); if ( aFind != m_pKeyColumnNames->end() ) { - const ::rtl::OUString sTableName = aFind->second.sTableName; + const OUString sTableName = aFind->second.sTableName; aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),TableNameFunctor(sTableName)); while( aFind != m_pKeyColumnNames->end() ) { @@ -575,7 +575,7 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow SelectColumnsMetaData::const_iterator aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),PositionFunctor(aIter->second.nPosition)); if ( aFind != m_pKeyColumnNames->end() ) { - const ::rtl::OUString sTableName = aFind->second.sTableName; + const OUString sTableName = aFind->second.sTableName; aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),TableNameFunctor(sTableName)); while( aFind != m_pKeyColumnNames->end() ) { @@ -608,19 +608,19 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const { TSQLStatements aSql; TSQLStatements aKeyConditions; - ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::std::map< OUString,bool > aResultSetChanged; + OUString aQuote = getIdentifierQuoteString(); // here we build the condition part for the update statement SelectColumnsMetaData::const_iterator aColIter = m_pColumnNames->begin(); SelectColumnsMetaData::const_iterator aColEnd = m_pColumnNames->end(); for(;aColIter != aColEnd;++aColIter) { - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aColIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aColIter->second.sRealName); if ( m_aJoinedKeyColumns.find(aColIter->second.nPosition) != m_aJoinedKeyColumns.end() ) { lcl_fillKeyCondition(aColIter->second.sTableName,sQuotedColumnName,io_aRow[aColIter->second.nPosition],aKeyConditions); } - ::rtl::OUStringBuffer& rPart = aSql[aColIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aColIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName); @@ -632,13 +632,13 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const { if ( aSqlIter->second.getLength() ) { - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); - ::rtl::OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + + OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); + OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + rCondition.makeStringAndClear()); try diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index da6c034fdeca..83608360d418 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -45,9 +45,9 @@ namespace dbaccess void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); - void executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName); + void executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName); void fillJoinedColumns_throw(const ::std::vector< ::connectivity::TNodePair>& i_aJoinColumns); - void fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn); + void fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn); protected: virtual void makeNewStatement( ); virtual ~OptimisticSet(); @@ -60,7 +60,7 @@ namespace dbaccess sal_Int32& o_nRowCount); // late ctor which can throw exceptions - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); // ::com::sun::star::sdbcx::XDeleteRows virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx index dd2533c5c21f..465fc3e47f7b 100644 --- a/dbaccess/source/core/api/PrivateRow.cxx +++ b/dbaccess/source/core/api/PrivateRow.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; { return m_aRow[m_nPos].isNull(); } - ::rtl::OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) { m_nPos = columnIndex; return m_aRow[m_nPos]; diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx index 80249d5acf2e..2068dfff8af8 100644 --- a/dbaccess/source/core/api/PrivateRow.hxx +++ b/dbaccess/source/core/api/PrivateRow.hxx @@ -34,7 +34,7 @@ namespace dbaccess { } virtual ::sal_Bool SAL_CALL wasNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 17437c9d885c..abf7bae375b5 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -475,9 +475,9 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeExcepti return aRet; } -rtl::OUString ORowSet::getImplementationName_static( ) throw(RuntimeException) +OUString ORowSet::getImplementationName_static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.comp.dba.ORowSet"); + return OUString("com.sun.star.comp.dba.ORowSet"); } // ::com::sun::star::XServiceInfo @@ -493,7 +493,7 @@ sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) thro Sequence< OUString > ORowSet::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< rtl::OUString > aSNS( 5 ); + Sequence< OUString > aSNS( 5 ); aSNS[0] = SERVICE_SDBC_RESULTSET; aSNS[1] = SERVICE_SDBC_ROWSET; aSNS[2] = SERVICE_SDBCX_RESULTSET; @@ -2330,7 +2330,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw() } else { - sCommand = rtl::OUString("SELECT * FROM "); + sCommand = OUString("SELECT * FROM "); OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); sCommand += ::dbtools::composeTableNameForSelect( m_xActiveConnection, sCatalog, sSchema, sTable ); @@ -2559,11 +2559,11 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer try { Sequence <sal_Int8> aData; - rtl::OUString aDataStr; + OUString aDataStr; // the data is given as character data and the length defines the character length sal_Int32 nSize = x->readBytes(aData, length * sizeof(sal_Unicode)); if (nSize / sizeof(sal_Unicode)) - aDataStr = rtl::OUString((sal_Unicode*)aData.getConstArray(), nSize / sizeof(sal_Unicode)); + aDataStr = OUString((sal_Unicode*)aData.getConstArray(), nSize / sizeof(sal_Unicode)); rParamValue = aDataStr; rParamValue.setTypeKind( DataType::LONGVARCHAR ); x->closeInput(); @@ -2837,9 +2837,9 @@ void ORowSetClone::release() throw() } // XServiceInfo -rtl::OUString ORowSetClone::getImplementationName( ) throw(RuntimeException) +OUString ORowSetClone::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.ORowSetClone"); + return OUString("com.sun.star.sdb.ORowSetClone"); } sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 0e3558ad6f43..1ae22058b42b 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -99,20 +99,20 @@ namespace dbaccess OTableContainer* m_pTables; - rtl::OUString m_aCommand; - rtl::OUString m_aDataSourceName; - rtl::OUString m_aURL; - rtl::OUString m_aUser; - rtl::OUString m_aPassword; - rtl::OUString m_aFilter; - rtl::OUString m_aHavingClause; - rtl::OUString m_aGroupBy; - rtl::OUString m_aOrder; - rtl::OUString m_aActiveCommand; - rtl::OUString m_aCursorName; - rtl::OUString m_aUpdateCatalogName; // is set by a query - rtl::OUString m_aUpdateSchemaName; // is set by a query - rtl::OUString m_aUpdateTableName; // is set by a query + OUString m_aCommand; + OUString m_aDataSourceName; + OUString m_aURL; + OUString m_aUser; + OUString m_aPassword; + OUString m_aFilter; + OUString m_aHavingClause; + OUString m_aGroupBy; + OUString m_aOrder; + OUString m_aActiveCommand; + OUString m_aCursorName; + OUString m_aUpdateCatalogName; // is set by a query + OUString m_aUpdateSchemaName; // is set by a query + OUString m_aUpdateTableName; // is set by a query sal_Int32 m_nFetchDirection; sal_Int32 m_nFetchSize; @@ -172,7 +172,7 @@ namespace dbaccess @throws com::sun::star::uno::RuntimeException if any of the components involved throws a com::sun::star::uno::RuntimeException */ - sal_Bool impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecute ); + sal_Bool impl_initComposer_throw( OUString& _out_rCommandToExecute ); /** returns the table container of our active connection @@ -261,13 +261,13 @@ namespace dbaccess virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -298,7 +298,7 @@ namespace dbaccess // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -327,7 +327,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -369,7 +369,7 @@ namespace dbaccess // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -377,7 +377,7 @@ namespace dbaccess virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -491,9 +491,9 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 80f2c4660c76..bfeca61b4e68 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -64,16 +64,16 @@ class OEmptyCollection : public sdbcx::OCollection { protected: virtual void impl_refresh() throw(RuntimeException); - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); public: - OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< ::rtl::OUString>()){} + OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< OUString>()){} }; void OEmptyCollection::impl_refresh() throw(RuntimeException) { } -connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const ::rtl::OUString& /*_rName*/) +connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& /*_rName*/) { return connectivity::sdbcx::ObjectType(); } @@ -279,7 +279,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) return m_aEmptyValue; } -::rtl::OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getString" ); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -592,7 +592,7 @@ Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData( ) throw(SQLE } // XColumnLocate -sal_Int32 SAL_CALL ORowSetBase::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::findColumn" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 31660e9411ab..185808602f88 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -262,14 +262,14 @@ namespace dbaccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::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::sdbcx::XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index f6506fae69f6..3d79f2f8f6c5 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -83,11 +83,11 @@ DBG_NAME(ORowSetCache) ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, const Reference<XComponentContext>& _rContext, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, sal_Bool& _bModified, sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, - const ::rtl::OUString& i_sRowSetFilter, + const OUString& i_sRowSetFilter, sal_Int32 i_nMaxRows) :m_xSet(_xRs) ,m_xMetaData(Reference< XResultSetMetaDataSupplier >(_xRs,UNO_QUERY)->getMetaData()) @@ -155,7 +155,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, ::comphelper::getINT32(xProp->getPropertyValue(PROPERTY_RESULTSETCONCURRENCY)) == ResultSetConcurrency::READ_ONLY); Reference< XIndexAccess> xUpdateTableKeys; - ::rtl::OUString aUpdateTableName = _rUpdateTableName; + OUString aUpdateTableName = _rUpdateTableName; Reference< XConnection> xConnection; // first we need a connection Reference< XStatement> xStmt(_xRs->getStatement(),UNO_QUERY); @@ -174,7 +174,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, Reference<XTablesSupplier> xTabSup(_xAnalyzer,UNO_QUERY); OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!"); Reference<XNameAccess> xTables = xTabSup->getTables(); - Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames(); + Sequence< OUString> aTableNames = xTables->getElementNames(); if ( aTableNames.getLength() > 1 && _rUpdateTableName.isEmpty() && bNeedKeySet ) {// here we have a join or union and nobody told us which table to update, so we update them all m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE; @@ -298,9 +298,9 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, m_nPrivileges = Privilege::SELECT; sal_Bool bNoInsert = sal_False; - Sequence< ::rtl::OUString> aNames(xColumns->getElementNames()); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames(xColumns->getElementNames()); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xColumn(xColumns->getByName(*pIter),UNO_QUERY); @@ -1534,7 +1534,7 @@ void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex) throwFunctionSequenceException(m_xSet.get()); } -sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sUpdateTableName) +sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const OUString& _sUpdateTableName) { sal_Bool bOk = sal_False; if (pNode->count() == 3 && // Ausdruck is geklammert @@ -1561,7 +1561,7 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode { bOk = sal_False; } - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; OSQLParseTreeIterator::getColumnRange( pNode->getChild(0), _xConnection, sColumnName, sTableRange ); bOk = sTableRange == _sUpdateTableName; if ( !bOk ) @@ -1575,11 +1575,11 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, - const ::rtl::OUString& _sUpdateTableName ) + const OUString& _sUpdateTableName ) { sal_Bool bOk = sal_False; - ::rtl::OUString sSql = _xAnalyzer->getQuery(); - ::rtl::OUString sErrorMsg; + OUString sSql = _xAnalyzer->getQuery(); + OUString sErrorMsg; ::connectivity::OSQLParser aSqlParser( m_aContext ); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); @@ -1618,7 +1618,7 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, pTableRef = pJoin->getChild(3); OSL_ENSURE(SQL_ISRULE(pTableRef,table_ref),"Must be a tableref here!"); - ::rtl::OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); + OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); if(sTableRange.isEmpty()) pTableRef->getChild(0)->parseNodeToStr( sTableRange, _xConnection, NULL, sal_False, sal_False ); bOk = sTableRange == _sUpdateTableName; diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 6eabf0df1e09..67e8757d89d1 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -120,10 +120,10 @@ namespace dbaccess void checkUpdateConditions(sal_Int32 columnIndex); sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, - const ::rtl::OUString& _sUpdateTableName); + const OUString& _sUpdateTableName); sal_Bool checkInnerJoin(const ::connectivity::OSQLParseNode *pNode ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection - ,const ::rtl::OUString& _sUpdateTableName); + ,const OUString& _sUpdateTableName); // clears the insert row void clearInsertRow(); @@ -137,11 +137,11 @@ namespace dbaccess ORowSetCache(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xRs, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xAnalyzer, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, sal_Bool& _bModified, sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, - const ::rtl::OUString& i_sRowSetFilter, + const OUString& i_sRowSetFilter, sal_Int32 i_nMaxRows); ~ORowSetCache(); diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 30eee81a9976..a10188244c86 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -163,7 +163,7 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue( { Any aValue; getFastPropertyValue(aValue,nHandle); - bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< ::rtl::OUString*>(0))); + bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< OUString*>(0))); } break; // we assume that it works } @@ -409,7 +409,7 @@ Sequence< Type > SAL_CALL ODBTableDecorator::getTypes( ) throw(RuntimeException } // XRename, -void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::rename" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -424,7 +424,7 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro } // XAlterTable, -void SAL_CALL ODBTableDecorator::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -484,7 +484,7 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException) return m_pColumns; } -::rtl::OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException) +OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getName" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -539,7 +539,7 @@ void ODBTableDecorator::fillPrivileges() const } if ( m_nPrivileges == 0 ) // second chance { - ::rtl::OUString sCatalog,sSchema,sName; + OUString sCatalog,sSchema,sName; xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; xProp->getPropertyValue(PROPERTY_NAME) >>= sName; @@ -586,7 +586,7 @@ void ODBTableDecorator::refreshColumns() ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); - ::std::vector< ::rtl::OUString> aVector; + ::std::vector< OUString> aVector; Reference<XNameAccess> xNames; if(m_xTable.is()) @@ -594,9 +594,9 @@ void ODBTableDecorator::refreshColumns() xNames = m_xTable->getColumns(); if(xNames.is()) { - Sequence< ::rtl::OUString> aNames = xNames->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xNames->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) aVector.push_back(*pIter); } @@ -618,7 +618,7 @@ void ODBTableDecorator::refreshColumns() m_pColumns->reFill(aVector); } -OColumn* ODBTableDecorator::createColumn(const ::rtl::OUString& _rName) const +OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createColumn" ); OColumn* pReturn = NULL; @@ -648,7 +648,7 @@ void ODBTableDecorator::columnAppended( const Reference< XPropertySet >& /*_rxSo // not interested in } -void ODBTableDecorator::columnDropped(const ::rtl::OUString& _sName) +void ODBTableDecorator::columnDropped(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::columnDropped" ); Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY); @@ -678,7 +678,7 @@ void SAL_CALL ODBTableDecorator::release() throw() OTableDescriptor_BASE::release(); } -void SAL_CALL ODBTableDecorator::setName( const ::rtl::OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::setName" ); throwFunctionNotSupportedException( "XNamed::setName", *this ); diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 8523a7020564..82c9d5561a94 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -46,9 +46,9 @@ namespace dbaccess using ::com::sun::star::lang::DisposedException; using ::com::sun::star::sdbc::XRow; - ::rtl::OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& i_sSetting) + OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& i_sSetting) { - ::rtl::OUString sSupportService; + OUString sSupportService; Any aValue; if ( dbtools::getDataSourceSetting(_xConnection,i_sSetting,aValue) ) { @@ -60,14 +60,14 @@ namespace dbaccess //= View //==================================================================== View::View( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive, - const ::rtl::OUString& _rCatalogName,const ::rtl::OUString& _rSchemaName, const ::rtl::OUString& _rName ) - :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, ::rtl::OUString(), _rSchemaName, _rCatalogName ) + const OUString& _rCatalogName,const OUString& _rSchemaName, const OUString& _rName ) + :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, _rCatalogName ) { m_nCommandHandle = getProperty(PROPERTY_COMMAND).Handle; try { Reference<XMultiServiceFactory> xFac(_rxConnection,UNO_QUERY_THROW); - static const ::rtl::OUString s_sViewAccess("ViewAccessServiceName"); + static const OUString s_sViewAccess("ViewAccessServiceName"); m_xViewAccess.set(xFac->createInstance(lcl_getServiceNameForSetting(_rxConnection,s_sViewAccess)),UNO_QUERY); } catch(const Exception& ) @@ -113,7 +113,7 @@ namespace dbaccess return Sequence< Type >(pTypes, aOwnTypes.size()); } - void SAL_CALL View::alterCommand( const ::rtl::OUString& _rNewCommand ) throw (SQLException, RuntimeException) + void SAL_CALL View::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException) { OSL_ENSURE(m_xViewAccess.is(),"Illegal call to AlterView!"); m_xViewAccess->alterCommand(this,_rNewCommand); diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index d4d600559cf7..6fa18a837ad5 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::osl; -void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index 8359b33eb29d..815158b393eb 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -42,7 +42,7 @@ namespace dbaccess m_xRowLocate = NULL; } - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbcx::XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index ac28dfcb7f76..355bb0bb066a 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -84,23 +84,23 @@ void OCallableStatement::release() throw () } // XServiceInfo -rtl::OUString OCallableStatement::getImplementationName( ) throw(RuntimeException) +OUString OCallableStatement::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OCallableStatement"); + return OUString("com.sun.star.sdb.OCallableStatement"); } -Sequence< ::rtl::OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT; aSNS.getArray()[1] = SERVICE_SDB_CALLABLESTATEMENT; return aSNS; } // XOutParameters -void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException) +void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::registerOutParameter" ); MutexGuard aGuard(m_aMutex); @@ -129,7 +129,7 @@ sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeExc return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->wasNull(); } -::rtl::OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getString" ); MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 731026a77b94..2b5fabb4225c 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -94,19 +94,19 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException) IMPLEMENT_FORWARD_XINTERFACE2( OColumn, OColumnBase, ::comphelper::OPropertyContainer ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OColumn::getImplementationName( ) throw(RuntimeException) +OUString OColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OColumn"); + return OUString("com.sun.star.sdb.OColumn"); } -sal_Bool OColumn::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OColumn::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDBCX_COLUMN; return aSNS; } @@ -123,12 +123,12 @@ Reference< XPropertySetInfo > OColumn::getPropertySetInfo() throw (RuntimeExcept return createPropertySetInfo( getInfoHelper() ) ; } -::rtl::OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException) { return m_sName; } -void SAL_CALL OColumn::setName( const ::rtl::OUString& _rName ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OColumn::setName( const OUString& _rName ) throw(::com::sun::star::uno::RuntimeException) { m_sName = _rName; } @@ -138,17 +138,17 @@ void OColumn::fireValueChange(const ::connectivity::ORowSetValue& /*_rOldValue*/ OSL_FAIL( "OColumn::fireValueChange: not implemented!" ); } -void OColumn::registerProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType ) +void OColumn::registerProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType ) { ::comphelper::OPropertyContainer::registerProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rMemberType ); } -void OColumn::registerMayBeVoidProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType ) +void OColumn::registerMayBeVoidProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType ) { ::comphelper::OPropertyContainer::registerMayBeVoidProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rExpectedType ); } -void OColumn::registerPropertyNoMember( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue ) +void OColumn::registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue ) { ::comphelper::OPropertyContainer::registerPropertyNoMember( _rName, _nHandle, _nAttributes, _rType, _pInitialValue ); } @@ -160,7 +160,7 @@ DBG_NAME(OColumns); OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - sal_Bool _bCaseSensitive,const ::std::vector< ::rtl::OUString> &_rVector, + sal_Bool _bCaseSensitive,const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn, @@ -180,7 +180,7 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns, - sal_Bool _bCaseSensitive,const ::std::vector< ::rtl::OUString> &_rVector, + sal_Bool _bCaseSensitive,const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn, @@ -204,25 +204,25 @@ OColumns::~OColumns() } // XServiceInfo -rtl::OUString OColumns::getImplementationName( ) throw(RuntimeException) +OUString OColumns::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OColumns"); + return OUString("com.sun.star.sdb.OColumns"); } -sal_Bool OColumns::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OColumns::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDBCX_CONTAINER; return aSNS; } //------------------------------------------------------------------ -void OColumns::append( const ::rtl::OUString& _rName, OColumn* _pColumn ) +void OColumns::append( const OUString& _rName, OColumn* _pColumn ) { MutexGuard aGuard(m_rMutex); @@ -257,7 +257,7 @@ void OColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException) m_pRefreshColumns->refreshColumns(); } -connectivity::sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OColumns::createObject(const OUString& _rName) { OSL_ENSURE(m_pColFactoryImpl, "OColumns::createObject: no column factory!"); @@ -369,7 +369,7 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException) } // XAppend -sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OColumns::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { sdbcx::ObjectType xReturn; @@ -407,7 +407,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, cons } // XDrop -void OColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OColumns::dropObject(sal_Int32 _nPos,const OUString _sElementName) { Reference< XDrop > xDrop( m_xDrvColumns, UNO_QUERY ); if ( xDrop.is() ) diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index a2ade21289c6..5cf277bba674 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -72,7 +72,7 @@ namespace dbaccess const sal_Int32 nMayBeVoidAttr = PropertyAttribute::MAYBEVOID | nBoundAttr; const Type& rSalInt32Type = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); - const Type& rStringType = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + const Type& rStringType = ::getCppuType( static_cast< OUString* >( NULL ) ); _rPropertyContainer.registerMayBeVoidProperty( PROPERTY_ALIGN, PROPERTY_ID_ALIGN, nMayBeVoidAttr, &m_aAlignment, rSalInt32Type ); _rPropertyContainer.registerMayBeVoidProperty( PROPERTY_NUMBERFORMAT, PROPERTY_ID_NUMBERFORMAT, nMayBeVoidAttr, &m_aFormatKey, rSalInt32Type ); @@ -131,7 +131,7 @@ namespace dbaccess struct PropertyDescriptor { - ::rtl::OUString sName; + OUString sName; sal_Int32 nHandle; }; PropertyDescriptor aProps[] = diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 0e94e91306fc..d08f59c81633 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -94,14 +94,14 @@ Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeEx } // XServiceInfo -rtl::OUString ODataColumn::getImplementationName( ) throw(RuntimeException) +OUString ODataColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.ODataColumn"); + return OUString("com.sun.star.sdb.ODataColumn"); } -Sequence< ::rtl::OUString > ODataColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > ODataColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 3 ); + Sequence< OUString > aSNS( 3 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_RESULTCOLUMN; aSNS[2] = SERVICE_SDB_DATACOLUMN; @@ -126,7 +126,7 @@ sal_Bool ODataColumn::wasNull(void) throw( SQLException, RuntimeException ) return m_xRow->wasNull(); } -rtl::OUString ODataColumn::getString(void) throw( SQLException, RuntimeException ) +OUString ODataColumn::getString(void) throw( SQLException, RuntimeException ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -343,7 +343,7 @@ void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException ) m_xRowUpdate->updateDouble(m_nPos, x); } -void ODataColumn::updateString(const rtl::OUString& x) throw( SQLException, RuntimeException ) +void ODataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException ) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index 1c1724519079..60c52ce36320 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -57,15 +57,15 @@ namespace dbaccess virtual void SAL_CALL release() throw() { OResultColumn::release(); } // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // cppu::OComponentHelper virtual void SAL_CALL disposing(void); // ::com::sun::star::sdb::XColumn virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -94,7 +94,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index 522da407334a..cfdf5cff3a78 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -143,7 +143,7 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau case PROPERTY_ID_GROUP_BY: case PROPERTY_ID_FILTER: case PROPERTY_ID_ORDER: - _rDefault <<= ::rtl::OUString(); + _rDefault <<= OUString(); break; case PROPERTY_ID_FONT: _rDefault <<= ::comphelper::getDefaultFont(); diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index df9a92a6f69e..3e27c738aa54 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -86,14 +86,14 @@ void OTableColumnDescriptor::impl_registerProperties() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnDescriptor"); + return OUString("com.sun.star.sdb.OTableColumnDescriptor"); } -Sequence< ::rtl::OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = m_bActAsDescriptor ? SERVICE_SDBCX_COLUMNDESCRIPTOR : SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; @@ -135,7 +135,7 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& //============================================================ DBG_NAME(OTableColumn); -OTableColumn::OTableColumn( const ::rtl::OUString& _rName ) +OTableColumn::OTableColumn( const OUString& _rName ) :OTableColumnDescriptor( false /* do not act as descriptor */ ) { DBG_CTOR(OTableColumn,NULL); @@ -149,9 +149,9 @@ OTableColumn::~OTableColumn() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn ) -rtl::OUString OTableColumn::getImplementationName( ) throw (RuntimeException) +OUString OTableColumn::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumn"); + return OUString("com.sun.star.sdb.OTableColumn"); } ::cppu::IPropertyArrayHelper& SAL_CALL OTableColumn::getInfoHelper() @@ -169,7 +169,7 @@ rtl::OUString OTableColumn::getImplementationName( ) throw (RuntimeException) // ========================================================================= DBG_NAME( OQueryColumn ); -OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const ::rtl::OUString &i_sLabel ) +OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const OUString &i_sLabel ) :OTableColumnDescriptor( false /* do not act as descriptor */ ) ,m_sLabel(i_sLabel) { @@ -200,7 +200,7 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co // copy some optional properties from the parser column struct PropertyDescriptor { - ::rtl::OUString sName; + OUString sName; sal_Int32 nHandle; }; PropertyDescriptor aProps[] = @@ -240,14 +240,14 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const { // determine the composed table name, plus the column name, as indicated by the // respective properties - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; OSL_VERIFY( getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog ); OSL_VERIFY( getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema ); OSL_VERIFY( getPropertyValue( PROPERTY_TABLENAME ) >>= sTable ); if ( sCatalog.isEmpty() && sSchema.isEmpty() && sTable.isEmpty() ) return NULL; - ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( + OUString sComposedTableName = ::dbtools::composeTableName( _rxConnection->getMetaData(), sCatalog, sSchema, sTable, sal_False, ::dbtools::eComplete ); // retrieve the table in question @@ -259,7 +259,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const Reference< XColumnsSupplier > xSuppCols( xTables->getByName( sComposedTableName ), UNO_QUERY_THROW ); Reference< XNameAccess > xColumns( xSuppCols->getColumns(), UNO_QUERY_THROW ); - ::rtl::OUString sColumn; + OUString sColumn; OSL_VERIFY( getPropertyValue( PROPERTY_REALNAME ) >>= sColumn ); if ( !xColumns->hasByName( sColumn ) ) return NULL; @@ -275,9 +275,9 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn ) -::rtl::OUString SAL_CALL OQueryColumn::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OQueryColumn::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.dbaccess.OQueryColumn" ); + return OUString( "org.openoffice.comp.dbaccess.OQueryColumn" ); } ::cppu::IPropertyArrayHelper& SAL_CALL OQueryColumn::getInfoHelper() @@ -309,7 +309,7 @@ void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand try { // determine original property name - ::rtl::OUString sPropName; + OUString sPropName; sal_Int16 nAttributes( 0 ); const_cast< OQueryColumn* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, &nAttributes, _nHandle ); OSL_ENSURE( !sPropName.isEmpty(), "OColumnWrapper::impl_getPropertyNameFromHandle: property not found!" ); @@ -356,9 +356,9 @@ OColumnWrapper::~OColumnWrapper() DBG_DTOR(OColumnWrapper,NULL); } -::rtl::OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const +OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const { - ::rtl::OUString sPropName; + OUString sPropName; sal_Int16 nAttributes( 0 ); const_cast< OColumnWrapper* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, &nAttributes, _nHandle ); OSL_ENSURE( !sPropName.isEmpty(), "OColumnWrapper::impl_getPropertyNameFromHandle: property not found!" ); @@ -436,14 +436,14 @@ OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< X IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OTableColumnDescriptorWrapper::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnDescriptorWrapper::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper"); + return OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper"); } -Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMNDESCRIPTOR; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; @@ -465,19 +465,19 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa DECL_PROP0( PRECISION, sal_Int32 ); DECL_PROP0( SCALE, sal_Int32 ); DECL_PROP0( TYPE, sal_Int32 ); - DECL_PROP0( TYPENAME, ::rtl::OUString ); + DECL_PROP0( TYPENAME, OUString ); if ( nId & HAS_AUTOINCREMENT_CREATION ) { - DECL_PROP1( AUTOINCREMENTCREATION, ::rtl::OUString, MAYBEVOID ); + DECL_PROP1( AUTOINCREMENTCREATION, OUString, MAYBEVOID ); } if ( nId & HAS_DEFAULTVALUE ) { - DECL_PROP0( DEFAULTVALUE, ::rtl::OUString ); + DECL_PROP0( DEFAULTVALUE, OUString ); } if ( nId & HAS_DESCRIPTION ) { - DECL_PROP0( DESCRIPTION, ::rtl::OUString ); + DECL_PROP0( DESCRIPTION, OUString ); } if ( nId & HAS_ROWVERSION ) { @@ -485,15 +485,15 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa } if ( nId & HAS_CATALOGNAME ) { - DECL_PROP0( CATALOGNAME, ::rtl::OUString ); + DECL_PROP0( CATALOGNAME, OUString ); } if ( nId & HAS_SCHEMANAME ) { - DECL_PROP0( SCHEMANAME, ::rtl::OUString ); + DECL_PROP0( SCHEMANAME, OUString ); } if ( nId & HAS_TABLENAME ) { - DECL_PROP0( TABLENAME, ::rtl::OUString ); + DECL_PROP0( TABLENAME, OUString ); } END_PROPERTY_SEQUENCE() @@ -603,14 +603,14 @@ OTableColumnWrapper::~OTableColumnWrapper() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnWrapper ) -rtl::OUString OTableColumnWrapper::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnWrapper::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnWrapper" ); + return OUString("com.sun.star.sdb.OTableColumnWrapper" ); } -Sequence< ::rtl::OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index fa624f183cb6..f8f9680b6150 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -52,7 +52,7 @@ OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn, m_xAggregateAsParameters = Reference< XParameters >( m_xAggregateAsSet, UNO_QUERY_THROW ); Reference<XDatabaseMetaData> xMeta = _xConn->getMetaData(); - m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< ::rtl::OUString>(), NULL,NULL); + m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< OUString>(), NULL,NULL); } OPreparedStatement::~OPreparedStatement() @@ -120,19 +120,19 @@ void OPreparedStatement::release() throw () } // XServiceInfo -rtl::OUString OPreparedStatement::getImplementationName( ) throw(RuntimeException) +OUString OPreparedStatement::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OPreparedStatement"); + return OUString("com.sun.star.sdb.OPreparedStatement"); } -sal_Bool OPreparedStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OPreparedStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OPreparedStatement::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_PREPAREDSTATEMENT; aSNS.getArray()[1] = SERVICE_SDB_PREPAREDSTATMENT; return aSNS; @@ -169,7 +169,7 @@ Reference< ::com::sun::star::container::XNameAccess > OPreparedStatement::getCol for (sal_Int32 i = 0, nCount = xMetaData->getColumnCount(); i < nCount; ++i) { // retrieve the name of the column - rtl::OUString aName = xMetaData->getColumnName(i + 1); + OUString aName = xMetaData->getColumnName(i + 1); OResultColumn* pColumn = new OResultColumn(xMetaData, i + 1, xDBMeta); m_pColumns->append(aName, pColumn); } @@ -245,7 +245,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s m_xAggregateAsParameters->setNull(parameterIndex, sqlType); } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -309,7 +309,7 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x m_xAggregateAsParameters->setDouble(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 2d10f929978d..c72f8bf40aad 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -101,7 +101,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition OSL_FAIL("OQueryDescriptor_Base::OQueryDescriptor_Base: caught an exception!"); } - m_xCommandDefinition->addPropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->addPropertyChangeListener(OUString(), this); // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this); m_xCommandPropInfo = m_xCommandDefinition->getPropertySetInfo(); } @@ -160,7 +160,7 @@ void OQuery::rebuildColumns() Reference< XResultSetMetaData > xResultSetMeta( xResMetaDataSup->getMetaData() ); if ( !xResultSetMeta.is() ) { - ::rtl::OUString sError( DBA_RES( RID_STR_STATEMENT_WITHOUT_RESULT_SET ) ); + OUString sError( DBA_RES( RID_STR_STATEMENT_WITHOUT_RESULT_SET ) ); ::dbtools::throwSQLException( sError, SQL_GENERAL_ERROR, *this ); } @@ -173,13 +173,13 @@ void OQuery::rebuildColumns() throw RuntimeException(); } - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for ( sal_Int32 i = 0;pIter != pEnd; ++pIter,++i) { Reference<XPropertySet> xSource(xColumns->getByName( *pIter ),UNO_QUERY); - ::rtl::OUString sLabel = *pIter; + OUString sLabel = *pIter; if ( xColumnDefinitions.is() && xColumnDefinitions->hasByName(*pIter) ) { Reference<XPropertySet> xCommandColumn(xColumnDefinitions->getByName( *pIter ),UNO_QUERY); @@ -260,7 +260,7 @@ void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeExc OSL_ENSURE(_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinition, UNO_QUERY).get(), "OQuery::disposing : where did this call come from ?"); - m_xCommandDefinition->removePropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->removePropertyChangeListener(OUString(), this); m_xCommandDefinition = NULL; } @@ -276,7 +276,7 @@ void SAL_CALL OQuery::disposing() MutexGuard aGuard(m_aMutex); if (m_xCommandDefinition.is()) { - m_xCommandDefinition->removePropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->removePropertyChangeListener(OUString(), this); m_xCommandDefinition = NULL; } disposeColumns(); @@ -287,7 +287,7 @@ void SAL_CALL OQuery::disposing() void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception) { ODataSettings::setFastPropertyValue_NoBroadcast(_nHandle, _rValue); - ::rtl::OUString sAggPropName; + OUString sAggPropName; sal_Int16 nAttr = 0; if (getInfoHelper().fillPropertyMembersByHandle(&sAggPropName,&nAttr,_nHandle) && m_xCommandPropInfo.is() && @@ -322,12 +322,12 @@ Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(Runt return new ::cppu::OPropertyArrayHelper(aProps); } -OColumn* OQuery::createColumn(const ::rtl::OUString& /*_rName*/) const +OColumn* OQuery::createColumn(const OUString& /*_rName*/) const { return NULL; } -void SAL_CALL OQuery::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OQuery::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { MutexGuard aGuard(m_aMutex); Reference<XRename> xRename(m_xCommandDefinition,UNO_QUERY); diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index 7a95a37e902e..a0a8e781954f 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -61,7 +61,7 @@ class OQuery :public OContentHelper friend struct TRelease; public: - typedef ::std::map< ::rtl::OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; + typedef ::std::map< OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; protected: // TNameColumnMap m_aColumnMap; // contains all columnnames to columns @@ -139,17 +139,17 @@ public: ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; } // 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); protected: virtual void SAL_CALL disposing(); - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual void rebuildColumns( ); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: void registerProperties(); diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index c970878a46b0..98d6bc94bed8 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -137,35 +137,35 @@ OUString OQueryComposer::getImplementationName( ) throw(RuntimeException) return OUString("com.sun.star.sdb.dbaccess.OQueryComposer"); } -sal_Bool OQueryComposer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OQueryComposer::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OQueryComposer::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getSupportedServiceNames" ); - Sequence< rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDB_SQLQUERYCOMPOSER; return aSNS; } // XSQLQueryComposer -::rtl::OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); Reference<XPropertySet> xProp(m_xComposer,UNO_QUERY); - ::rtl::OUString sQuery; + OUString sQuery; if ( xProp.is() ) xProp->getPropertyValue(PROPERTY_ORIGINAL) >>= sQuery; return sQuery; } -void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -177,7 +177,7 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S m_sOrgOrder = m_xComposer->getOrder(); } -::rtl::OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getComposedQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -187,7 +187,7 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S return m_xComposer->getQuery(); } -::rtl::OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -206,7 +206,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt return m_xComposer->getStructuredFilter(); } -::rtl::OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -224,7 +224,7 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe ::osl::MutexGuard aGuard( m_aMutex ); m_xComposerHelper->setQuery(getQuery()); - m_xComposerHelper->setFilter(::rtl::OUString()); + m_xComposerHelper->setFilter(OUString()); m_xComposerHelper->appendFilterByColumn(column, sal_True, SQLFilterOperator::EQUAL); FilterCreator aFilterCreator; @@ -241,7 +241,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet ::osl::MutexGuard aGuard( m_aMutex ); m_xComposerHelper->setQuery(getQuery()); - m_xComposerHelper->setOrder(::rtl::OUString()); + m_xComposerHelper->setOrder(OUString()); m_xComposerHelper->appendOrderByColumn(column,ascending); OrderCreator aOrderCreator; @@ -251,7 +251,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet setOrder(aOrderCreator.getComposedAndClear()); } -void SAL_CALL OQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -268,7 +268,7 @@ void SAL_CALL OQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(S m_xComposer->setFilter( aFilterCreator.getComposedAndClear() ); } -void SAL_CALL OQueryComposer::setOrder( const ::rtl::OUString& order ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 984b9e8fe006..4e6d38f959b3 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -89,9 +89,9 @@ OQueryContainer::OQueryContainer( // fill my structures ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); - Sequence< ::rtl::OUString > sDefinitionNames = m_xCommandDefinitions->getElementNames(); - const ::rtl::OUString* pDefinitionName = sDefinitionNames.getConstArray(); - const ::rtl::OUString* pEnd = pDefinitionName + sDefinitionNames.getLength(); + Sequence< OUString > sDefinitionNames = m_xCommandDefinitions->getElementNames(); + const OUString* pDefinitionName = sDefinitionNames.getConstArray(); + const OUString* pEnd = pDefinitionName + sDefinitionNames.getLength(); for ( ; pDefinitionName != pEnd; ++pDefinitionName ) { rDefinitions.insert( *pDefinitionName, TContentPtr() ); @@ -152,7 +152,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet { ResettableMutexGuard aGuard(m_aMutex); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); // first clone this object's CommandDefinition part Reference< css::sdb::XQueryDefinition > xCommandDefinitionPart = css::sdb::QueryDefinition::create(m_aContext); @@ -163,7 +163,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet // create a wrapper for the object (*before* inserting into our command definition container) Reference< XContent > xNewObject( implCreateWrapper( Reference< XContent>( xCommandDefinitionPart, UNO_QUERY_THROW ) ) ); - ::rtl::OUString sNewObjectName; + OUString sNewObjectName; _rxDesc->getPropertyValue(PROPERTY_NAME) >>= sNewObjectName; try @@ -189,14 +189,14 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet } // XDrop -void SAL_CALL OQueryContainer::dropByName( const ::rtl::OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OQueryContainer::dropByName( const OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException) { MutexGuard aGuard(m_aMutex); if ( !checkExistence(_rName) ) throw NoSuchElementException(_rName,*this); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); // now simply forward the remove request to the CommandDefinition container, we're a listener for the removal // and thus we do everything necessary in ::elementRemoved @@ -210,9 +210,9 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti throw IndexOutOfBoundsException(); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); - ::rtl::OUString sName; + OUString sName; Reference<XPropertySet> xProp(Reference<XIndexAccess>(m_xCommandDefinitions,UNO_QUERY)->getByIndex(_nIndex),UNO_QUERY); if ( xProp.is() ) xProp->getPropertyValue(PROPERTY_NAME) >>= sName; @@ -223,7 +223,7 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti void SAL_CALL OQueryContainer::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { Reference< XContent > xNewElement; - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; { MutexGuard aGuard(m_aMutex); @@ -244,7 +244,7 @@ void SAL_CALL OQueryContainer::elementInserted( const ::com::sun::star::containe void SAL_CALL OQueryContainer::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sAccessor; + OUString sAccessor; _rEvent.Accessor >>= sAccessor; { OSL_ENSURE(!sAccessor.isEmpty(), "OQueryContainer::elementRemoved : invalid name !"); @@ -259,7 +259,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::containe { Reference< XPropertySet > xReplacedElement; Reference< XContent > xNewElement; - ::rtl::OUString sAccessor; + OUString sAccessor; _rEvent.Accessor >>= sAccessor; { @@ -277,7 +277,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::containe Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const ContainerEvent& Event ) throw (WrappedTargetException, RuntimeException) { - ::rtl::OUString sName; + OUString sName; OSL_VERIFY( Event.Accessor >>= sName ); Reference< XContent > xElement( Event.Element, UNO_QUERY_THROW ); @@ -288,7 +288,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain } catch( const Exception& ) { - xReturn = new Veto( ::rtl::OUString(), ::cppu::getCaughtException() ); + xReturn = new Veto( OUString(), ::cppu::getCaughtException() ); } return xReturn; } @@ -328,12 +328,12 @@ void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObj } } -::rtl::OUString OQueryContainer::determineContentType() const +OUString OQueryContainer::determineContentType() const { - return ::rtl::OUString( "application/vnd.org.openoffice.DatabaseQueryContainer" ); + return OUString( "application/vnd.org.openoffice.DatabaseQueryContainer" ); } -Reference< XContent > OQueryContainer::implCreateWrapper(const ::rtl::OUString& _rName) +Reference< XContent > OQueryContainer::implCreateWrapper(const OUString& _rName) { Reference< XContent > xObject(m_xCommandDefinitions->getByName(_rName),UNO_QUERY); return implCreateWrapper(xObject); @@ -361,12 +361,12 @@ Reference< XContent > OQueryContainer::implCreateWrapper(const Reference< XConte return xReturn; } -Reference< XContent > OQueryContainer::createObject( const ::rtl::OUString& _rName) +Reference< XContent > OQueryContainer::createObject( const OUString& _rName) { return implCreateWrapper(_rName); } -sal_Bool OQueryContainer::checkExistence(const ::rtl::OUString& _rName) +sal_Bool OQueryContainer::checkExistence(const OUString& _rName) { sal_Bool bRet = sal_False; if ( !m_bInPropertyChange ) @@ -398,7 +398,7 @@ sal_Int32 SAL_CALL OQueryContainer::getCount( ) throw(RuntimeException) return Reference<XIndexAccess>(m_xCommandDefinitions,UNO_QUERY)->getCount(); } -Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 8b6db104e3c3..78f549984951 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -123,7 +123,7 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWea ,m_rMutex(_rMutex) { DBG_CTOR(OQueryDescriptor_Base,NULL); - m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< ::rtl::OUString>(), this,this); + m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this); } OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf) @@ -131,7 +131,7 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSour ,m_rMutex(_rSource.m_rMutex) { DBG_CTOR(OQueryDescriptor_Base,NULL); - m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< ::rtl::OUString>(), this,this); + m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this); m_sCommand = _rSource.m_sCommand; m_bEscapeProcessing = _rSource.m_bEscapeProcessing; @@ -170,7 +170,7 @@ void OQueryDescriptor_Base::setColumnsOutOfDate( sal_Bool _bOutOfDate ) m_pColumns->setInitialized(); } -void OQueryDescriptor_Base::implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ) +void OQueryDescriptor_Base::implAppendColumn( const OUString& _rName, OColumn* _pColumn ) { m_pColumns->append( _rName, _pColumn ); } @@ -212,19 +212,19 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (Ru return m_pColumns; } -::rtl::OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.sdb.OQueryDescriptor"); + return OUString("com.sun.star.sdb.OQueryDescriptor"); } -sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(2); + Sequence< OUString > aSupported(2); aSupported.getArray()[0] = SERVICE_SDB_DATASETTINGS; aSupported.getArray()[1] = SERVICE_SDB_QUERYDESCRIPTOR; return aSupported; @@ -240,7 +240,7 @@ void OQueryDescriptor_Base::columnAppended( const Reference< XPropertySet >& /*_ // not interested in } -void OQueryDescriptor_Base::columnDropped(const ::rtl::OUString& /*_sName*/) +void OQueryDescriptor_Base::columnDropped(const OUString& /*_sName*/) { // not interested in } @@ -264,7 +264,7 @@ void OQueryDescriptor_Base::refreshColumns() rebuildColumns(); } -OColumn* OQueryDescriptor_Base::createColumn( const ::rtl::OUString& /*_rName*/ ) const +OColumn* OQueryDescriptor_Base::createColumn( const OUString& /*_rName*/ ) const { // creating a column/descriptor for a query/descriptor does not make sense at all return NULL; diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 9bd081084d18..ccd51749c862 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -60,7 +60,7 @@ private: protected: OColumns* m_pColumns; // our column descriptions - ::rtl::OUString m_sElementName; + OUString m_sElementName; virtual ~OQueryDescriptor_Base(); void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True ); @@ -69,7 +69,7 @@ protected: sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; } void clearColumns( ); - void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ); + void implAppendColumn( const OUString& _rName, OColumn* _pColumn ); public: OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf); @@ -86,17 +86,17 @@ public: DECLARE_IMPLEMENTATION_ID( ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); protected: // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); /** rebuild our columns set diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 8d679ec60a92..e2dd8ba86fa5 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -65,7 +65,7 @@ void OResultColumn::impl_determineIsRowVersion_nothrow() try { - ::rtl::OUString sCatalog, sSchema, sTable, sColumnName; + OUString sCatalog, sSchema, sTable, sColumnName; getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog; getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema; getPropertyValue( PROPERTY_TABLENAME ) >>= sTable; @@ -120,14 +120,14 @@ Sequence< sal_Int8 > OResultColumn::getImplementationId() throw (RuntimeExceptio } // XServiceInfo -rtl::OUString OResultColumn::getImplementationName( ) throw(RuntimeException) +OUString OResultColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OResultColumn"); + return OUString("com.sun.star.sdb.OResultColumn"); } -Sequence< ::rtl::OUString > OResultColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OResultColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_RESULTCOLUMN; return aSNS; @@ -146,7 +146,7 @@ void OResultColumn::disposing() ::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const { BEGIN_PROPERTY_HELPER(21) - DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY); + DECL_PROP1(CATALOGNAME, OUString, READONLY); DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY); DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY); DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY); @@ -158,15 +158,15 @@ void OResultColumn::disposing() DECL_PROP1_BOOL(ISSEARCHABLE, READONLY); DECL_PROP1_BOOL(ISSIGNED, READONLY); DECL_PROP1_BOOL(ISWRITABLE, READONLY); - DECL_PROP1(LABEL, ::rtl::OUString, READONLY); - DECL_PROP1(NAME, ::rtl::OUString, READONLY); + DECL_PROP1(LABEL, OUString, READONLY); + DECL_PROP1(NAME, OUString, READONLY); DECL_PROP1(PRECISION, sal_Int32, READONLY); DECL_PROP1(SCALE, sal_Int32, READONLY); - DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY); - DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY); - DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY); + DECL_PROP1(SCHEMANAME, OUString, READONLY); + DECL_PROP1(SERVICENAME, OUString, READONLY); + DECL_PROP1(TABLENAME, OUString, READONLY); DECL_PROP1(TYPE, sal_Int32, READONLY); - DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY); + DECL_PROP1(TYPENAME, OUString, READONLY); END_PROPERTY_HELPER(); } @@ -278,7 +278,7 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const case PROPERTY_ID_SCHEMANAME: case PROPERTY_ID_CATALOGNAME: // empty string'S - rValue <<= rtl::OUString(); + rValue <<= OUString(); break; case PROPERTY_ID_ISROWVERSION: case PROPERTY_ID_ISAUTOINCREMENT: diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 9a6d2a633045..d5fec73809cd 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -45,7 +45,7 @@ namespace dbaccess mutable ::boost::optional< sal_Bool > m_isDefinitelyWritable; mutable ::boost::optional< sal_Bool > m_isAutoIncrement; mutable ::boost::optional< sal_Int32 > m_isNullable; - mutable ::boost::optional< ::rtl::OUString > m_sColumnLabel; + mutable ::boost::optional< OUString > m_sColumnLabel; mutable ::boost::optional< sal_Int32 > m_nColumnDisplaySize; mutable ::boost::optional< sal_Int32 > m_nColumnType; mutable ::boost::optional< sal_Int32 > m_nPrecision; @@ -62,8 +62,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index b5e3ad0c2a34..e9885fd72b77 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -62,7 +62,7 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star: RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::OResultSet" ); DBG_CTOR(OResultSet, NULL); - m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< ::rtl::OUString>(), NULL,NULL); + m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), NULL,NULL); try { @@ -185,22 +185,22 @@ void OResultSet::close(void) throw( SQLException, RuntimeException ) } // XServiceInfo -rtl::OUString OResultSet::getImplementationName( ) throw(RuntimeException) +OUString OResultSet::getImplementationName( ) throw(RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OResultSet"); + return OUString("com.sun.star.sdb.OResultSet"); } -sal_Bool OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBC_RESULTSET; aSNS[1] = SERVICE_SDB_RESULTSET; return aSNS; @@ -218,7 +218,7 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::createArrayHelper" ); BEGIN_PROPERTY_HELPER(6) - DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY); + DECL_PROP1(CURSORNAME, OUString, READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY); @@ -274,7 +274,7 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const default: { // get the property name - ::rtl::OUString aPropName; + OUString aPropName; sal_Int16 nAttributes; const_cast<OResultSet*>(this)->getInfoHelper(). fillPropertyMembersByHandle(&aPropName, &nAttributes, nHandle); @@ -314,7 +314,7 @@ Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLExceptio } // ::com::sun::star::sdbc::XColumnLocate -sal_Int32 OResultSet::findColumn(const rtl::OUString& columnName) throw( SQLException, RuntimeException ) +sal_Int32 OResultSet::findColumn(const OUString& columnName) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::findColumn" ); MutexGuard aGuard(m_aMutex); @@ -371,7 +371,7 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi for ( sal_Int32 i = 0; i < nColCount; ++i) { // retrieve the name of the column - rtl::OUString sName = xMetaData->getColumnName(i + 1); + OUString sName = xMetaData->getColumnName(i + 1); ODataColumn* pColumn = new ODataColumn(xMetaData, m_xDelegatorRow, m_xDelegatorRowUpdate, i + 1, xDBMetaData); // don't silently assume that the name is unique - result set implementations @@ -395,16 +395,16 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi try { const Reference< XNameAccess > xColNames( static_cast< XNameAccess* >( m_pColumns ), UNO_SET_THROW ); - const Sequence< ::rtl::OUString > aNames( xColNames->getElementNames() ); + const Sequence< OUString > aNames( xColNames->getElementNames() ); OSL_POSTCOND( aNames.getLength() == nColCount, "OResultSet::getColumns: invalid column count!" ); - for ( const ::rtl::OUString* pName = aNames.getConstArray(); + for ( const OUString* pName = aNames.getConstArray(); pName != aNames.getConstArray() + aNames.getLength(); ++pName ) { Reference< XPropertySet > xColProps( xColNames->getByName( *pName ), UNO_QUERY_THROW ); - ::rtl::OUString sName; + OUString sName; OSL_VERIFY( xColProps->getPropertyValue( PROPERTY_NAME ) >>= sName ); OSL_POSTCOND( sName == *pName, "OResultSet::getColumns: invalid column name!" ); } @@ -429,7 +429,7 @@ sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException ) return m_xDelegatorRow->wasNull(); } -rtl::OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) +OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getString" ); MutexGuard aGuard(m_aMutex); @@ -689,7 +689,7 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti m_xDelegatorRowUpdate->updateDouble(columnIndex, x); } -void OResultSet::updateString(sal_Int32 columnIndex, const rtl::OUString& x) throw( SQLException, RuntimeException ) +void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateString" ); MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index 60d5cf5f7213..c43dc763e9b5 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -96,9 +96,9 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); @@ -136,14 +136,14 @@ namespace dbaccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::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::sdbcx::XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -208,7 +208,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index f15a3ce958f9..14a37fda575a 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -189,7 +189,7 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::createArrayHelper" ); BEGIN_PROPERTY_HELPER(10) - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_PROP0_BOOL(ESCAPE_PROCESSING); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); @@ -227,7 +227,7 @@ sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & if ( m_xAggregateAsSet.is() ) { // get the property name - ::rtl::OUString sPropName; + OUString sPropName; getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); // now set the value @@ -266,7 +266,7 @@ void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const default: if ( m_xAggregateAsSet.is() ) { - ::rtl::OUString sPropName; + OUString sPropName; getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); m_xAggregateAsSet->setPropertyValue( sPropName, rValue ); } @@ -292,7 +292,7 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons default: if ( m_xAggregateAsSet.is() ) { - ::rtl::OUString sPropName; + OUString sPropName; const_cast< OStatementBase* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); rValue = m_xAggregateAsSet->getPropertyValue( sPropName ); } @@ -449,28 +449,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OStatementBase, OStatement_IFACE ); IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE ); // XServiceInfo -rtl::OUString OStatement::getImplementationName( ) throw(RuntimeException) +OUString OStatement::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OStatement"); + return OUString("com.sun.star.sdb.OStatement"); } -sal_Bool OStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = SERVICE_SDBC_STATEMENT; return aSNS; } // XStatement -Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeQuery" ); MutexGuard aGuard(m_aMutex); @@ -479,7 +479,7 @@ Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) t disposeResultSet(); Reference< XResultSet > xResultSet; - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); Reference< XResultSet > xInnerResultSet = m_xAggregateStatement->executeQuery( sSQL ); Reference< XConnection > xConnection( m_xParent, UNO_QUERY_THROW ); @@ -497,7 +497,7 @@ Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) t return xResultSet; } -sal_Int32 OStatement::executeUpdate( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeUpdate" ); MutexGuard aGuard(m_aMutex); @@ -505,11 +505,11 @@ sal_Int32 OStatement::executeUpdate( const rtl::OUString& _rSQL ) throw( SQLExce disposeResultSet(); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); return m_xAggregateStatement->executeUpdate( sSQL ); } -sal_Bool OStatement::execute( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); @@ -517,11 +517,11 @@ sal_Bool OStatement::execute( const rtl::OUString& _rSQL ) throw( SQLException, disposeResultSet(); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); return m_xAggregateStatement->execute( sSQL ); } -void OStatement::addBatch( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); @@ -532,7 +532,7 @@ void OStatement::addBatch( const rtl::OUString& _rSQL ) throw( SQLException, Run if (!xMeta.is() && !xMeta->supportsBatchUpdates()) throwFunctionSequenceException(*this); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch( sSQL ); } @@ -576,7 +576,7 @@ void SAL_CALL OStatement::disposing() m_xAggregateStatement.clear(); } -::rtl::OUString OStatement::impl_doEscapeProcessing_nothrow( const ::rtl::OUString& _rSQL ) const +OUString OStatement::impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::impl_doEscapeProcessing_nothrow" ); if ( !m_bEscapeProcessing ) @@ -594,7 +594,7 @@ void SAL_CALL OStatement::disposing() // if we cannot parse it, silently accept this. The driver is probably able to cope with it then return _rSQL; - ::rtl::OUString sLowLevelSQL = m_xComposer->getQueryWithSubstitution(); + OUString sLowLevelSQL = m_xComposer->getQueryWithSubstitution(); return sLowLevelSQL; } catch( const Exception& ) diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 2bb0e7d53a7a..d1977c2fadb7 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -69,11 +69,11 @@ DBG_NAME(ODBTable) ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ,const Reference< XConnection >& _rxConn - ,const ::rtl::OUString& _rCatalog - ,const ::rtl::OUString& _rSchema - ,const ::rtl::OUString& _rName - ,const ::rtl::OUString& _rType - ,const ::rtl::OUString& _rDesc + ,const OUString& _rCatalog + ,const OUString& _rSchema + ,const OUString& _rName + ,const OUString& _rType + ,const OUString& _rDesc ,const Reference< XNameAccess >& _xColumnDefinitions) throw(SQLException) :OTable_Base(_pTables,_rxConn,_rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers(), _rName, _rType, _rDesc, _rSchema, _rCatalog ) ,m_xColumnDefinitions(_xColumnDefinitions) @@ -106,7 +106,7 @@ ODBTable::~ODBTable() IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base) -OColumn* ODBTable::createColumn(const ::rtl::OUString& _rName) const +OColumn* ODBTable::createColumn(const OUString& _rName) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumn" ); OColumn* pReturn = NULL; @@ -136,7 +136,7 @@ void ODBTable::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescr // not interested in } -void ODBTable::columnDropped(const ::rtl::OUString& _sName) +void ODBTable::columnDropped(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::columnDropped" ); Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY); @@ -311,7 +311,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException) } // XRename, -void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::rename" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -325,7 +325,7 @@ void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLExce } // XAlterTable, -void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 2bdfb70e9c58..a8af2bbfb0af 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -83,7 +83,7 @@ OViewContainer::~OViewContainer() // XServiceInfo IMPLEMENT_SERVICE_INFO2(OViewContainer, "com.sun.star.sdb.dbaccess.OViewContainer", SERVICE_SDBCX_CONTAINER.ascii, SERVICE_SDBCX_TABLES.ascii) -ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName) +ObjectType OViewContainer::createObject(const OUString& _rName) { ObjectType xProp; if ( m_xMasterContainer.is() && m_xMasterContainer->hasByName(_rName) ) @@ -91,7 +91,7 @@ ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName) if ( !xProp.is() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, @@ -125,10 +125,10 @@ Reference< XPropertySet > OViewContainer::createDescriptor() } // XAppend -ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +ObjectType OViewContainer::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { // append the new table with a create stmt - ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME)); + OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME)); Reference<XAppend> xAppend(m_xMasterContainer,UNO_QUERY); Reference< XPropertySet > xProp = descriptor; @@ -142,14 +142,14 @@ ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const } else { - ::rtl::OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); + OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); if(sComposedName.isEmpty()) ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this))); - ::rtl::OUString sCommand; + OUString sCommand; descriptor->getPropertyValue(PROPERTY_COMMAND) >>= sCommand; - ::rtl::OUStringBuffer aSQL; + OUStringBuffer aSQL; aSQL.appendAscii( "CREATE VIEW " ); aSQL.append ( sComposedName ); aSQL.appendAscii( " AS " ); @@ -169,7 +169,7 @@ ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const } // XDrop -void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OViewContainer::dropObject(sal_Int32 _nPos,const OUString _sElementName) { if ( !m_bInElementRemoved ) { @@ -178,7 +178,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN xDrop->dropByName(_sElementName); else { - ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; + OUString sCatalog,sSchema,sTable,sComposedName; Reference<XPropertySet> xTable(getObject(_nPos),UNO_QUERY); if ( xTable.is() ) @@ -193,7 +193,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN if(sComposedName.isEmpty()) ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this))); - ::rtl::OUString aSql("DROP VIEW "); + OUString aSql("DROP VIEW "); aSql += sComposedName; Reference<XConnection> xCon = m_xConnection; OSL_ENSURE(xCon.is(),"Connection is null!"); @@ -211,16 +211,16 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - ::rtl::OUString sName; + OUString sName; if ( ( Event.Accessor >>= sName ) && ( !m_nInAppend ) && ( !hasByName( sName ) ) ) { Reference<XPropertySet> xProp(Event.Element,UNO_QUERY); - ::rtl::OUString sType; + OUString sType; xProp->getPropertyValue(PROPERTY_TYPE) >>= sType; - if ( sType == ::rtl::OUString("VIEW") ) + if ( sType == OUString("VIEW") ) insertElement(sName,createObject(sName)); } } @@ -228,7 +228,7 @@ void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) thr void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - ::rtl::OUString sName; + OUString sName; if ( (Event.Accessor >>= sName) && hasByName(sName) ) { m_bInElementRemoved = true; @@ -253,10 +253,10 @@ void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ ) { } -::rtl::OUString OViewContainer::getTableTypeRestriction() const +OUString OViewContainer::getTableTypeRestriction() const { // no restriction at all (other than the ones provided externally) - return ::rtl::OUString( "VIEW" ); + return OUString( "VIEW" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 8266b65b2777..490497369c36 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -144,7 +144,7 @@ OComponentDefinition::~OComponentDefinition() OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const Reference< XComponentContext >& _xORB ,const TContentPtr& _pImpl ,sal_Bool _bTable) @@ -168,21 +168,21 @@ OUString OComponentDefinition::getImplementationName_static( ) throw(RuntimeExc return OUString("com.sun.star.comp.dba.OComponentDefinition"); } -::rtl::OUString SAL_CALL OComponentDefinition::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OComponentDefinition::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } -Sequence< ::rtl::OUString > OComponentDefinition::getSupportedServiceNames_static( ) throw(RuntimeException) +Sequence< OUString > OComponentDefinition::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices(2); - aServices.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableDefinition"); - aServices.getArray()[1] = ::rtl::OUString("com.sun.star.ucb.Content"); + Sequence< OUString > aServices(2); + aServices.getArray()[0] = OUString("com.sun.star.sdb.TableDefinition"); + aServices.getArray()[1] = OUString("com.sun.star.ucb.Content"); return aServices; } -Sequence< ::rtl::OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -219,11 +219,11 @@ Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo( return xInfo; } -::rtl::OUString OComponentDefinition::determineContentType() const +OUString OComponentDefinition::determineContentType() const { return m_bTable - ? ::rtl::OUString( "application/vnd.org.openoffice.DatabaseTable" ) - : ::rtl::OUString( "application/vnd.org.openoffice.DatabaseCommandDefinition" ); + ? OUString( "application/vnd.org.openoffice.DatabaseTable" ) + : OUString( "application/vnd.org.openoffice.DatabaseCommandDefinition" ); } Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeException) @@ -233,7 +233,7 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti if ( !m_pColumns.get() ) { - ::std::vector< ::rtl::OUString> aNames; + ::std::vector< OUString> aNames; const OComponentDefinition_Impl& rDefinition( getDefinition() ); aNames.reserve( rDefinition.size() ); @@ -249,13 +249,13 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti return m_pColumns.get(); } -OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const +OColumn* OComponentDefinition::createColumn(const OUString& _rName) const { const OComponentDefinition_Impl& rDefinition( getDefinition() ); OComponentDefinition_Impl::const_iterator aFind = rDefinition.find( _rName ); if ( aFind != rDefinition.end() ) { - aFind->second->addPropertyChangeListener(::rtl::OUString(),m_xColumnPropertyListener.getRef()); + aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener.getRef()); return new OTableColumnWrapper( aFind->second, aFind->second, true ); } OSL_FAIL( "OComponentDefinition::createColumn: is this a valid case?" ); @@ -274,7 +274,7 @@ void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,co notifyDataSourceModified(); } -void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) +void OComponentDefinition::columnDropped(const OUString& _sName) { getDefinition().erase( _sName ); notifyDataSourceModified(); @@ -282,7 +282,7 @@ void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxSourceDescriptor ) { - ::rtl::OUString sName; + OUString sName; _rxSourceDescriptor->getPropertyValue( PROPERTY_NAME ) >>= sName; Reference<XPropertySet> xColDesc = new OTableColumnDescriptor( true ); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 0f9ff09320e6..82a5518779f7 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -47,7 +47,7 @@ namespace dbaccess ,public ODataSettings_Base { public: - typedef ::std::map < ::rtl::OUString + typedef ::std::map < OUString , ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > Columns; typedef Columns::iterator iterator; @@ -57,8 +57,8 @@ namespace dbaccess Columns m_aColumns; public: - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sCatalogName; + OUString m_sSchemaName; + OUString m_sCatalogName; public: OComponentDefinition_Impl(); @@ -69,11 +69,11 @@ namespace dbaccess inline const_iterator begin() const { return m_aColumns.begin(); } inline const_iterator end() const { return m_aColumns.end(); } - inline const_iterator find( const ::rtl::OUString& _rName ) const { return m_aColumns.find( _rName ); } + inline const_iterator find( const OUString& _rName ) const { return m_aColumns.find( _rName ); } - inline void erase( const ::rtl::OUString& _rName ) { m_aColumns.erase( _rName ); } + inline void erase( const OUString& _rName ) { m_aColumns.erase( _rName ); } - inline void insert( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) + inline void insert( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) { OSL_PRECOND( m_aColumns.find( _rName ) == m_aColumns.end(), "OComponentDefinition_Impl::insert: there's already an element with this name!" ); m_aColumns.insert( Columns::value_type( _rName, _rxColumn ) ); @@ -114,7 +114,7 @@ public: OComponentDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,const TContentPtr& _pImpl ,sal_Bool _bTable = sal_True @@ -127,11 +127,11 @@ public: DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -148,10 +148,10 @@ public: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); virtual void notifyDataSourceModified() { OContentHelper::notifyDataSourceModified(); } protected: @@ -163,7 +163,7 @@ protected: const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: void registerProperties(); diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 2fbb2fa7d145..bfe39b79a14d 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -97,9 +97,9 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw return new ::ucbhelper::ContentIdentifier( aIdentifier ); } -::rtl::OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer ) const +OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer ) const { - ::rtl::OUStringBuffer aHierarchicalName( m_pImpl->m_aProps.aTitle ); + OUStringBuffer aHierarchicalName( m_pImpl->m_aProps.aTitle ); Reference< XInterface > xParent = m_xParentContainer; while( xParent.is() ) { @@ -108,20 +108,20 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw xParent.set( xChild.is() ? xChild->getParent() : Reference< XInterface >(), UNO_QUERY ); if ( xProp.is() && xParent.is() ) { - ::rtl::OUString sName; + OUString sName; xProp->getPropertyValue( PROPERTY_NAME ) >>= sName; - ::rtl::OUString sPrevious = aHierarchicalName.makeStringAndClear(); + OUString sPrevious = aHierarchicalName.makeStringAndClear(); aHierarchicalName.append( sName + "/" + sPrevious ); } } - ::rtl::OUString sHierarchicalName( aHierarchicalName.makeStringAndClear() ); + OUString sHierarchicalName( aHierarchicalName.makeStringAndClear() ); if ( !_includingRootContainer ) sHierarchicalName = sHierarchicalName.copy( sHierarchicalName.indexOf( '/' ) + 1 ); return sHierarchicalName; } -::rtl::OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException) +OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -170,7 +170,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -190,7 +190,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -202,7 +202,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "No properties!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -232,7 +232,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -246,44 +246,44 @@ void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ ) throw (RuntimeExc } // XPropertiesChangeNotifier -void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) +void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); sal_Int32 nCount = PropertyNames.getLength(); if ( !nCount ) { // Note: An empty sequence means a listener for "all" properties. - m_aPropertyChangeListeners.addInterface(::rtl::OUString(), Listener ); + m_aPropertyChangeListeners.addInterface(OUString(), Listener ); } else { - const ::rtl::OUString* pSeq = PropertyNames.getConstArray(); + const OUString* pSeq = PropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const ::rtl::OUString& rName = pSeq[ n ]; + const OUString& rName = pSeq[ n ]; if ( !rName.isEmpty() ) m_aPropertyChangeListeners.addInterface(rName, Listener ); } } } -void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) +void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); sal_Int32 nCount = PropertyNames.getLength(); if ( !nCount ) { // Note: An empty sequence means a listener for "all" properties. - m_aPropertyChangeListeners.removeInterface( ::rtl::OUString(), Listener ); + m_aPropertyChangeListeners.removeInterface( OUString(), Listener ); } else { - const ::rtl::OUString* pSeq = PropertyNames.getConstArray(); + const OUString* pSeq = PropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const ::rtl::OUString& rName = pSeq[ n ]; + const OUString& rName = pSeq[ n ]; if ( !rName.isEmpty() ) m_aPropertyChangeListeners.removeInterface( rName, Listener ); } @@ -291,12 +291,12 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< :: } // XPropertyContainer -void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) +void SAL_CALL OContentHelper::addProperty( const OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { OSL_FAIL( "OContentHelper::addProperty: not implemented!" ); } -void SAL_CALL OContentHelper::removeProperty( const ::rtl::OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) +void SAL_CALL OContentHelper::removeProperty( const OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) { OSL_FAIL( "OContentHelper::removeProperty: not implemented!" ); } @@ -365,7 +365,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue } else if ( rValue.Name == "Title" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { if ( aNewValue != m_pImpl->m_aProps.aTitle ) @@ -460,13 +460,13 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >& // Append all Core Properties. xRow->appendString ( Property( "ContentType", -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), getContentType() ); xRow->appendString ( Property( "Title", -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND ), m_pImpl->m_aProps.aTitle ); xRow->appendBoolean( @@ -495,7 +495,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent if ( nCount ) { // First, notify listeners interested in changes of every property. - OInterfaceContainerHelper* pAllPropsContainer = m_aPropertyChangeListeners.getContainer( ::rtl::OUString() ); + OInterfaceContainerHelper* pAllPropsContainer = m_aPropertyChangeListeners.getContainer( OUString() ); if ( pAllPropsContainer ) { OInterfaceIteratorHelper aIter( *pAllPropsContainer ); @@ -517,7 +517,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent for ( sal_Int32 n = 0; n < nCount; ++n, ++propertyChangeEvent ) { const PropertyChangeEvent& rEvent = *propertyChangeEvent; - const ::rtl::OUString& rName = rEvent.PropertyName; + const OUString& rName = rEvent.PropertyName; OInterfaceContainerHelper* pPropsContainer = m_aPropertyChangeListeners.getContainer( rName ); if ( pPropsContainer ) @@ -597,7 +597,7 @@ void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent m_xParentContainer = _xParent; } -void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify ) +void OContentHelper::impl_rename_throw(const OUString& _sNewName,bool _bNotify ) { osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex); if ( _sNewName.equals( m_pImpl->m_aProps.aTitle ) ) @@ -626,7 +626,7 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN } } -void SAL_CALL OContentHelper::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OContentHelper::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { impl_rename_throw(newName); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 6121644f18a8..882f7863da7c 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -116,7 +116,7 @@ DBG_NAME( DocumentStorageAccess ) class DocumentStorageAccess : public ::cppu::WeakImplHelper2< XDocumentSubStorageSupplier , XTransactionListener > { - typedef ::std::map< ::rtl::OUString, Reference< XStorage > > NamedStorages; + typedef ::std::map< OUString, Reference< XStorage > > NamedStorages; ::osl::Mutex m_aMutex; /// all sub storages which we ever gave to the outer world @@ -144,8 +144,8 @@ public: void dispose(); // XDocumentSubStorageSupplier - virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 _nMode ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (IOException, RuntimeException); + virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nMode ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (IOException, RuntimeException); // XTransactionListener virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -168,7 +168,7 @@ public: private: /** opens the sub storage with the given name, in the given mode */ - Reference< XStorage > impl_openSubStorage_nothrow( const ::rtl::OUString& _rStorageName, sal_Int32 _nMode ); + Reference< XStorage > impl_openSubStorage_nothrow( const OUString& _rStorageName, sal_Int32 _nMode ); void impl_suspendCommitPropagation() { @@ -209,7 +209,7 @@ void DocumentStorageAccess::dispose() m_pModelImplementation = NULL; } -Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const ::rtl::OUString& _rStorageName, sal_Int32 _nDesiredMode ) +Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const OUString& _rStorageName, sal_Int32 _nDesiredMode ) { OSL_ENSURE( !_rStorageName.isEmpty(),"ODatabaseModelImpl::impl_openSubStorage_nothrow: Invalid storage name!" ); @@ -309,7 +309,7 @@ bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits ) } -Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException) +Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); NamedStorages::iterator pos = m_aExposedStorages.find( aStorageName ); @@ -322,24 +322,24 @@ Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( con return pos->second; } -Sequence< ::rtl::OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) throw (IOException, RuntimeException) +Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) throw (IOException, RuntimeException) { Reference< XStorage > xRootStor( m_pModelImplementation->getRootStorage() ); if ( !xRootStor.is() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - ::std::vector< ::rtl::OUString > aNames; + ::std::vector< OUString > aNames; Reference< XNameAccess > xNames( xRootStor, UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > aElementNames( xNames->getElementNames() ); + Sequence< OUString > aElementNames( xNames->getElementNames() ); for ( sal_Int32 i=0; i<aElementNames.getLength(); ++i ) { if ( xRootStor->isStorageElement( aElementNames[i] ) ) aNames.push_back( aElementNames[i] ); } return aNames.empty() - ? Sequence< ::rtl::OUString >() - : Sequence< ::rtl::OUString >( &aNames[0], aNames.size() ); + ? Sequence< OUString >() + : Sequence< OUString >( &aNames[0], aNames.size() ); } void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException) @@ -436,7 +436,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _r } ODatabaseModelImpl::ODatabaseModelImpl( - const ::rtl::OUString& _rRegistrationName, + const OUString& _rRegistrationName, const Reference< XComponentContext >& _rxContext, ODatabaseContext& _rDBContext ) @@ -483,7 +483,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() Type* pAllowedType = aAllowedTypes.getArray(); *pAllowedType++ = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< double* >( NULL ) ); - *pAllowedType++ = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + *pAllowedType++ = ::getCppuType( static_cast< OUString* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< sal_Int16* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< Sequence< Any >* >( NULL ) ); @@ -503,7 +503,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() if ( !pSettings->DefaultValue.hasValue() ) { Property aProperty( - ::rtl::OUString::createFromAscii( pSettings->AsciiName ), + OUString::createFromAscii( pSettings->AsciiName ), -1, pSettings->ValueType, PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT | PropertyAttribute::MAYBEVOID @@ -513,7 +513,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() else { xContainer->addProperty( - ::rtl::OUString::createFromAscii( pSettings->AsciiName ), + OUString::createFromAscii( pSettings->AsciiName ), PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT, pSettings->DefaultValue ); @@ -529,7 +529,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() namespace { - ::rtl::OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType ) + OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType ) { const sal_Char* pAsciiName( NULL ); switch ( _eType ) @@ -541,7 +541,7 @@ namespace default: throw RuntimeException(); } - return ::rtl::OUString::createFromAscii( pAsciiName ); + return OUString::createFromAscii( pAsciiName ); } bool lcl_hasObjectWithMacros_throw( const ODefinitionContainer_Impl& _rObjectDefinitions, const Reference< XStorage >& _rxContainerStorage ) @@ -554,11 +554,11 @@ namespace ) { #if OSL_DEBUG_LEVEL > 0 - const ::rtl::OUString& rName( object->first ); (void)rName; + const OUString& rName( object->first ); (void)rName; #endif const TContentPtr& rDefinition( object->second ); - const ::rtl::OUString& rPersistentName( rDefinition->m_aProps.sPersistentName ); + const OUString& rPersistentName( rDefinition->m_aProps.sPersistentName ); if ( rPersistentName.isEmpty() ) { // it's a logical sub folder used to organize the real objects @@ -605,7 +605,7 @@ namespace } } -bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const ::rtl::OUString& _rPersistentName ) +bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const OUString& _rPersistentName ) { OSL_PRECOND( _rxContainerStorage.is(), "ODatabaseModelImpl::objectHasMacros: this will crash!" ); @@ -762,13 +762,13 @@ const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormats return m_xNumberFormatsSupplier; } -void ODatabaseModelImpl::setDocFileLocation( const ::rtl::OUString& i_rLoadedFrom ) +void ODatabaseModelImpl::setDocFileLocation( const OUString& i_rLoadedFrom ) { ENSURE_OR_THROW( !i_rLoadedFrom.isEmpty(), "invalid URL" ); m_sDocFileLocation = i_rLoadedFrom; } -void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, const Sequence< PropertyValue >& _rArgs ) +void ODatabaseModelImpl::setResource( const OUString& i_rDocumentURL, const Sequence< PropertyValue >& _rArgs ) { ENSURE_OR_THROW( !i_rDocumentURL.isEmpty(), "invalid URL" ); @@ -776,7 +776,7 @@ void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, con #if OSL_DEBUG_LEVEL > 0 if ( aMediaDescriptor.has( "SalvagedFile" ) ) { - ::rtl::OUString sSalvagedFile( aMediaDescriptor.getOrDefault( "SalvagedFile", ::rtl::OUString() ) ); + OUString sSalvagedFile( aMediaDescriptor.getOrDefault( "SalvagedFile", OUString() ) ); // If SalvagedFile is an empty string, this indicates "the document is being recovered, but i_rDocumentURL already // is the real document URL, not the temporary document location" if ( sSalvagedFile.isEmpty() ) @@ -1036,40 +1036,40 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() static const AsciiPropertyValue aKnownSettings[] = { // known JDBC settings - AsciiPropertyValue( "JavaDriverClass", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "JavaDriverClassPath", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "JavaDriverClass", makeAny( OUString() ) ), + AsciiPropertyValue( "JavaDriverClassPath", makeAny( OUString() ) ), AsciiPropertyValue( "IgnoreCurrency", makeAny( (sal_Bool)sal_False ) ), // known settings for file-based drivers - AsciiPropertyValue( "Extension", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "CharSet", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "Extension", makeAny( OUString() ) ), + AsciiPropertyValue( "CharSet", makeAny( OUString() ) ), AsciiPropertyValue( "HeaderLine", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "FieldDelimiter", makeAny( OUString( "," ) ) ), AsciiPropertyValue( "StringDelimiter", makeAny( OUString( "\"" ) ) ), AsciiPropertyValue( "DecimalDelimiter", makeAny( OUString( "." ) ) ), - AsciiPropertyValue( "ThousandDelimiter", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "ThousandDelimiter", makeAny( OUString() ) ), AsciiPropertyValue( "ShowDeleted", makeAny( (sal_Bool)sal_False ) ), // known ODBC settings - AsciiPropertyValue( "SystemDriverSettings", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "SystemDriverSettings", makeAny( OUString() ) ), AsciiPropertyValue( "UseCatalog", makeAny( (sal_Bool)sal_False ) ), AsciiPropertyValue( "TypeInfoSettings", makeAny( Sequence< Any >()) ), // settings related to auto increment handling - AsciiPropertyValue( "AutoIncrementCreation", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "AutoRetrievingStatement", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "AutoIncrementCreation", makeAny( OUString() ) ), + AsciiPropertyValue( "AutoRetrievingStatement", makeAny( OUString() ) ), AsciiPropertyValue( "IsAutoRetrievingEnabled", makeAny( (sal_Bool)sal_False ) ), // known LDAP driver settings - AsciiPropertyValue( "HostName", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "HostName", makeAny( OUString() ) ), AsciiPropertyValue( "PortNumber", makeAny( (sal_Int32)389 ) ), - AsciiPropertyValue( "BaseDN", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "BaseDN", makeAny( OUString() ) ), AsciiPropertyValue( "MaxRowCount", makeAny( (sal_Int32)100 ) ), // known MySQLNative driver settings - AsciiPropertyValue( "LocalSocket", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "NamedPipe", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "LocalSocket", makeAny( OUString() ) ), + AsciiPropertyValue( "NamedPipe", makeAny( OUString() ) ), // misc known driver settings AsciiPropertyValue( "ParameterNameSubstitution", makeAny( (sal_Bool)sal_False ) ), AsciiPropertyValue( "AddIndexAppendix", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "IgnoreDriverPrivileges", makeAny( (sal_Bool)sal_True ) ), - AsciiPropertyValue( "ImplicitCatalogRestriction", ::cppu::UnoType< ::rtl::OUString >::get() ), - AsciiPropertyValue( "ImplicitSchemaRestriction", ::cppu::UnoType< ::rtl::OUString >::get() ), + AsciiPropertyValue( "ImplicitCatalogRestriction", ::cppu::UnoType< OUString >::get() ), + AsciiPropertyValue( "ImplicitSchemaRestriction", ::cppu::UnoType< OUString >::get() ), AsciiPropertyValue( "PrimaryKeySupport", ::cppu::UnoType< sal_Bool >::get() ), AsciiPropertyValue( "ShowColumnDescription", makeAny( (sal_Bool)sal_False ) ), // known SDB level settings @@ -1089,15 +1089,15 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() AsciiPropertyValue( "EscapeDateTime", makeAny( (sal_Bool)sal_True ) ), // known services to handle database tasks - AsciiPropertyValue( "TableAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "TableRenameServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "ViewAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "ViewAccessServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "CommandDefinitions", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "Forms", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "Reports", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "KeyAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "IndexAlterationServiceName", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "TableAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "TableRenameServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "ViewAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "ViewAccessServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "CommandDefinitions", makeAny( OUString() ) ), + AsciiPropertyValue( "Forms", makeAny( OUString() ) ), + AsciiPropertyValue( "Reports", makeAny( OUString() ) ), + AsciiPropertyValue( "KeyAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "IndexAlterationServiceName", makeAny( OUString() ) ), AsciiPropertyValue() }; @@ -1168,7 +1168,7 @@ Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContain catch( const Exception& ) { throw WrappedTargetRuntimeException( - ::rtl::OUString(), + OUString(), xDocument, ::cppu::getCaughtException() ); @@ -1257,12 +1257,12 @@ Reference< XStorage > ODatabaseModelImpl::impl_switchToStorage_throw( const Refe return m_xDocumentStorage.getTyped(); } -void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocumentURL ) +void ODatabaseModelImpl::impl_switchToLogicalURL( const OUString& i_rDocumentURL ) { if ( i_rDocumentURL == m_sDocumentURL ) return; - const ::rtl::OUString sOldURL( m_sDocumentURL ); + const OUString sOldURL( m_sDocumentURL ); // update our name, if necessary if ( ( m_sName == m_sDocumentURL ) // our name is our old URL || ( m_sName.isEmpty() ) // we do not have a name, yet (i.e. are not registered at the database context) @@ -1293,7 +1293,7 @@ void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocu } } -::rtl::OUString ODatabaseModelImpl::getObjectContainerStorageName( const ObjectType _eType ) +OUString ODatabaseModelImpl::getObjectContainerStorageName( const ObjectType _eType ) { return lcl_getContainerStorageName_throw( _eType ); } @@ -1318,7 +1318,7 @@ sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode ) return sal_True; } -::rtl::OUString ODatabaseModelImpl::getDocumentLocation() const +OUString ODatabaseModelImpl::getDocumentLocation() const { return getURL(); // formerly, we returned getDocFileLocation here, which is the location of the file from which we diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 194b6a23bd2b..49f6a10efdc6 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -199,7 +199,7 @@ private: ::comphelper::NamedValueCollection m_aMediaDescriptor; /// the URL the document was loaded from - ::rtl::OUString m_sDocFileLocation; + OUString m_sDocFileLocation; oslInterlockedCount m_refCount; @@ -220,7 +220,7 @@ private: ->m_sDocumentURL then is the URL of the document which actually had been recovered. */ - ::rtl::OUString m_sDocumentURL; + OUString m_sDocumentURL; public: OWeakConnectionArray m_aConnections; @@ -232,11 +232,11 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::rtl::OUString m_sConnectURL; - ::rtl::OUString m_sName; // transient, our creator has to tell us the title - ::rtl::OUString m_sUser; - ::rtl::OUString m_aPassword; // transient ! - ::rtl::OUString m_sFailedPassword; + OUString m_sConnectURL; + OUString m_sName; // transient, our creator has to tell us the title + OUString m_sUser; + OUString m_aPassword; // transient ! + OUString m_sFailedPassword; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; sal_Int32 m_nLoginTimeout; @@ -247,8 +247,8 @@ public: sal_Bool m_bDocumentReadOnly : 1; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess > m_xSettings; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableTypeFilter; OSharedConnectionManager* m_pSharedConnectionManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xSharedConnectionManager; @@ -282,7 +282,7 @@ public: virtual ~ODatabaseModelImpl(); ODatabaseModelImpl( - const ::rtl::OUString& _rRegistrationName, + const OUString& _rRegistrationName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, ODatabaseContext& _rDBContext ); @@ -294,8 +294,8 @@ public: void dispose(); - inline ::rtl::OUString getURL() const { return m_sDocumentURL; } - inline ::rtl::OUString getDocFileLocation() const { return m_sDocFileLocation; } + inline OUString getURL() const { return m_sDocumentURL; } + inline OUString getDocFileLocation() const { return m_sDocFileLocation; } ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getStorage( @@ -312,11 +312,11 @@ public: getMediaDescriptor() const { return m_aMediaDescriptor; } void setResource( - const ::rtl::OUString& _rURL, + const OUString& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ); void setDocFileLocation( - const ::rtl::OUString& i_rLoadedFrom + const OUString& i_rLoadedFrom ); static ::comphelper::NamedValueCollection @@ -403,7 +403,7 @@ public: /** returns the name of the storage which is used to stored objects of the given type, if applicable */ - static ::rtl::OUString + static OUString getObjectContainerStorageName( const ObjectType _eType ); /** revokes the data source registration at the database context @@ -414,7 +414,7 @@ public: */ static bool objectHasMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rPersistentName + const OUString& _rPersistentName ); /** determines which kind of embedded macros are present in the document @@ -487,7 +487,7 @@ public: // IMacroDocumentAccess overridables virtual sal_Int16 getCurrentMacroExecMode() const; virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 ); - virtual ::rtl::OUString getDocumentLocation() const; + virtual OUString getDocumentLocation() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign(); virtual sal_Bool documentStorageHasMacros() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const; @@ -512,7 +512,7 @@ private: URL where the doc was loaded/recovered from */ void impl_switchToLogicalURL( - const ::rtl::OUString& i_rDocumentURL + const OUString& i_rDocumentURL ); }; diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index e88c617bc121..242741ee5585 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -56,7 +56,7 @@ Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) throw(SQ return m_xConnection->createStatement(); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -64,7 +64,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( co return m_xConnection->prepareStatement(sql); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -72,7 +72,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const : return m_xConnection->prepareCall(sql); } -::rtl::OUString SAL_CALL OSharedConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -130,7 +130,7 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeE return m_xConnection->isReadOnly(); } -::rtl::OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index d81e501745bf..916c4fec8cb8 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -96,7 +96,7 @@ namespace dbaccess { throw ::com::sun::star::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,::com::sun::star::uno::Any()); } - virtual void SAL_CALL setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setCatalog( const OUString& /*catalog*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,::com::sun::star::uno::Any()); } @@ -110,16 +110,16 @@ namespace dbaccess } // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index c22fbd99c6c6..291d9e1507ba 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -90,7 +90,7 @@ OUString SAL_CALL OBookmarkContainer::getImplementationName( ) throw(RuntimeExc return OUString("com.sun.star.comp.dba.OBookmarkContainer"); } -sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -105,7 +105,7 @@ Sequence< OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames( ) t } // XNameContainer -void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -117,7 +117,7 @@ void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, c throw IllegalArgumentException(); // approve the new object - ::rtl::OUString sNewLink; + OUString sNewLink; if (!(aElement >>= sNewLink)) throw IllegalArgumentException(); @@ -134,9 +134,9 @@ void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, c } } -void SAL_CALL OBookmarkContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ::rtl::OUString sOldBookmark; + OUString sOldBookmark; { MutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -166,7 +166,7 @@ void SAL_CALL OBookmarkContainer::removeByName( const ::rtl::OUString& _rName ) } // XNameReplace -void SAL_CALL OBookmarkContainer::replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ClearableMutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -180,12 +180,12 @@ void SAL_CALL OBookmarkContainer::replaceByName( const ::rtl::OUString& _rName, throw NoSuchElementException(); // approve the new object - ::rtl::OUString sNewLink; + OUString sNewLink; if (!(aElement >>= sNewLink)) throw IllegalArgumentException(); // the old element (for the notifications) - ::rtl::OUString sOldLink = m_aBookmarks[_rName]; + OUString sOldLink = m_aBookmarks[_rName]; // do the replace implReplace(_rName, sNewLink); @@ -220,7 +220,7 @@ Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); - return ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + return ::getCppuType( static_cast< OUString* >(NULL) ); } sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException) @@ -257,7 +257,7 @@ Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutO return makeAny(m_aBookmarksIndexed[_nIndex]->second); } -Any SAL_CALL OBookmarkContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -268,13 +268,13 @@ Any SAL_CALL OBookmarkContainer::getByName( const ::rtl::OUString& _rName ) thro return makeAny(m_aBookmarks[_rName]); } -Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); - Sequence< ::rtl::OUString > aNames(m_aBookmarks.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aBookmarks.size()); + OUString* pNames = aNames.getArray(); ; for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); aNameIter != m_aBookmarksIndexed.end(); @@ -287,7 +287,7 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) thr return aNames; } -sal_Bool SAL_CALL OBookmarkContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) +sal_Bool SAL_CALL OBookmarkContainer::hasByName( const OUString& _rName ) throw(RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -295,7 +295,7 @@ sal_Bool SAL_CALL OBookmarkContainer::hasByName( const ::rtl::OUString& _rName ) return checkExistence(_rName); } -void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) +void OBookmarkContainer::implRemove(const OUString& _rName) { MutexGuard aGuard(m_rMutex); @@ -324,7 +324,7 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) m_aBookmarks.erase(aMapPos); } -void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl::OUString& _rDocumentLocation) +void OBookmarkContainer::implAppend(const OUString& _rName, const OUString& _rDocumentLocation) { MutexGuard aGuard(m_rMutex); @@ -332,7 +332,7 @@ void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl:: m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); } -void OBookmarkContainer::implReplace(const ::rtl::OUString& _rName, const ::rtl::OUString& _rNewLink) +void OBookmarkContainer::implReplace(const OUString& _rName, const OUString& _rNewLink) { MutexGuard aGuard(m_rMutex); OSL_ENSURE(checkExistence(_rName), "OBookmarkContainer::implReplace : invalid name !"); diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 201903310a59..36a7cb40d057 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -54,7 +54,7 @@ class OBookmarkContainer :public OBookmarkContainer_Base { protected: - DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, MapString2String); + DECLARE_STL_USTRINGACCESS_MAP(OUString, MapString2String); DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector); MapString2String m_aBookmarks; // the bookmarks itself @@ -87,9 +87,9 @@ public: virtual void SAL_CALL release( ) throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); @@ -103,16 +103,16 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::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); // ::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); @@ -143,22 +143,22 @@ protected: @param _rName the object name to check @return sal_True if there already exists such an object */ - inline sal_Bool checkExistence(const ::rtl::OUString& _rName); + inline sal_Bool checkExistence(const OUString& _rName); void implAppend( - const ::rtl::OUString& _rName, - const ::rtl::OUString& _rDocumentLocation + const OUString& _rName, + const OUString& _rDocumentLocation ); - void implRemove(const ::rtl::OUString& _rName); + void implRemove(const OUString& _rName); void implReplace( - const ::rtl::OUString& _rName, - const ::rtl::OUString& _rNewLink); + const OUString& _rName, + const OUString& _rNewLink); }; -inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) +inline sal_Bool OBookmarkContainer::checkExistence(const OUString& _rName) { return m_aBookmarks.find(_rName) != m_aBookmarks.end(); } diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index eb4700052c5c..8fe6ec685150 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -62,7 +62,7 @@ OCommandContainer::~OCommandContainer() IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandContainer_BASE) IMPLEMENT_TYPEPROVIDER2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE); -Reference< XContent > OCommandContainer::createObject( const ::rtl::OUString& _rName) +Reference< XContent > OCommandContainer::createObject( const OUString& _rName) { const ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); OSL_ENSURE( rDefinitions.find(_rName) != rDefinitions.end(), "OCommandContainer::createObject: Invalid entry in map!" ); diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index 39ddb15c357e..cf952d78baaf 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -61,11 +61,11 @@ protected: virtual ~OCommandContainer(); // ODefinitionContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(const OUString& _rName); protected: // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index ba0016be5811..3adf40195ab0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -72,17 +72,17 @@ void OCommandDefinition::registerProperties() &rCommandDefinition.m_aLayoutInformation, ::getCppuType(&rCommandDefinition.m_aLayoutInformation)); } -rtl::OUString OCommandDefinition::getName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getName() throw( ::com::sun::star::uno::RuntimeException ) { return getDefinition().m_aProps.aTitle; } -rtl::OUString OCommandDefinition::getCommand() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getCommand() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sCommand; } -void OCommandDefinition::setCommand(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setCommand(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_COMMAND, Any(p1) ); } @@ -97,32 +97,32 @@ void OCommandDefinition::setEscapeProcessing(sal_Bool p1) throw( ::com::sun::sta setPropertyValue(PROPERTY_ESCAPE_PROCESSING, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateTableName; } -void OCommandDefinition::setUpdateTableName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateTableName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_TABLENAME, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateCatalogName; } -void OCommandDefinition::setUpdateCatalogName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateCatalogName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_CATALOGNAME, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateSchemaName; } -void OCommandDefinition::setUpdateSchemaName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateSchemaName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_SCHEMANAME, Any(p1) ); } @@ -143,7 +143,7 @@ OCommandDefinition::~OCommandDefinition() } OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const Reference< XComponentContext >& _xORB ,const TContentPtr& _pImpl) :OComponentDefinition(_rxContainer,_rElementName,_xORB,_pImpl,sal_False) @@ -162,7 +162,7 @@ OUString OCommandDefinition::getImplementationName_static( ) throw(RuntimeExcep return OUString("com.sun.star.comp.dba.OCommandDefinition"); } -::rtl::OUString SAL_CALL OCommandDefinition::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OCommandDefinition::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } @@ -176,7 +176,7 @@ Sequence< OUString > OCommandDefinition::getSupportedServiceNames_static( ) thr return aServices; } -Sequence< ::rtl::OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -186,7 +186,7 @@ Reference< XInterface > OCommandDefinition::Create(const Reference< XComponentCo return *(new OCommandDefinition( _rxContext, NULL, TContentPtr( new OCommandDefinition_Impl ) ) ); } -void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { try { diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index ccc956b0c22f..b94e0c7083c0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -75,7 +75,7 @@ public: OCommandDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,const TContentPtr& _pImpl ); @@ -87,34 +87,34 @@ public: DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); // 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); // overrides to resolve ambiguity - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const com::sun::star::uno::Any& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OComponentDefinition::setPropertyValue(p1, p2); } - virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return OComponentDefinition::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::removeVetoableChangeListener(p1, p2); } virtual com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> SAL_CALL getIdentifier() throw( ::com::sun::star::uno::RuntimeException ) { return OComponentDefinition::getIdentifier(); } - virtual rtl::OUString SAL_CALL getContentType() throw( ::com::sun::star::uno::RuntimeException ) + virtual OUString SAL_CALL getContentType() throw( ::com::sun::star::uno::RuntimeException ) { return OComponentDefinition::getContentType(); } virtual void SAL_CALL addContentEventListener(const com::sun::star::uno::Reference<com::sun::star::ucb::XContentEventListener>& p1) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addContentEventListener(p1); } @@ -128,17 +128,17 @@ public: { OComponentDefinition::removeEventListener(p1); } // XQueryDefinition properties - virtual rtl::OUString getName() throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getCommand() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setCommand(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getCommand() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setCommand(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool getEscapeProcessing() throw( ::com::sun::star::uno::RuntimeException ); virtual void setEscapeProcessing(sal_Bool) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateTableName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateCatalogName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateSchemaName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateTableName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateCatalogName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateSchemaName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); // OPropertySetHelper DECLARE_PROPERTYCONTAINER_DEFAULTS( ); diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 14534241917b..856a81d082e7 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -89,8 +89,8 @@ protected: OWeakRefArray m_aComposers; // the filter as set on the parent data link at construction of the connection - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableTypeFilter; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_aContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XConnectionTools > m_xConnectionTools; @@ -145,22 +145,22 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > SAL_CALL createQueryComposer( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdb::XCommandPreparation - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const ::rtl::OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -169,8 +169,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -180,9 +180,9 @@ public: virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XUsersSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException); @@ -193,12 +193,12 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableName > SAL_CALL createTableName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XObjectNames > SAL_CALL getObjectNames( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException); // XTableUIProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const ::rtl::OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const ::rtl::OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // IRefreshListener virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed); diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index b2f3bc4dbc6e..c34063488680 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -87,9 +87,9 @@ namespace dbaccess DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); protected: ~DataAccessDescriptor(); @@ -106,22 +106,22 @@ namespace dbaccess Reference<XComponentContext> m_xContext; // </properties> - ::rtl::OUString m_sDataSourceName; - ::rtl::OUString m_sDatabaseLocation; - ::rtl::OUString m_sConnectionResource; + OUString m_sDataSourceName; + OUString m_sDatabaseLocation; + OUString m_sConnectionResource; Sequence< PropertyValue > m_aConnectionInfo; Reference< XConnection > m_xActiveConnection; - ::rtl::OUString m_sCommand; + OUString m_sCommand; sal_Int32 m_nCommandType; - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sOrder; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; + OUString m_sFilter; + OUString m_sOrder; + OUString m_sHavingClause; + OUString m_sGroupBy; sal_Bool m_bEscapeProcessing; Reference< XResultSet > m_xResultSet; Sequence< Any > m_aSelection; sal_Bool m_bBookmarkSelection; - ::rtl::OUString m_sColumnName; + OUString m_sColumnName; Reference< XPropertySet > m_xColumn; // </properties> }; @@ -184,11 +184,11 @@ namespace dbaccess return OUString( "com.sun.star.comp.dba.DataAccessDescriptor" ); } - ::sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() ); - const ::rtl::OUString* pStart = aServices.getConstArray(); - const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); + Sequence< OUString > aServices( getSupportedServiceNames() ); + const OUString* pStart = aServices.getConstArray(); + const OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, rServiceName ) != pEnd; } @@ -227,15 +227,15 @@ namespace dbaccess { public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XServiceInfo - static versions - static Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( RuntimeException ); + static Sequence< OUString > getSupportedServiceNames_static(void) throw( RuntimeException ); + static OUString getImplementationName_static(void) throw( RuntimeException ); static Reference< XInterface > Create(const Reference< XComponentContext >& _rxContext); - static ::rtl::OUString getSingletonName_static(); + static OUString getSingletonName_static(); // XDataAccessDescriptorFactory virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor( ) throw (RuntimeException); @@ -262,9 +262,9 @@ namespace dbaccess return OUString( "com.sun.star.sdb.DataAccessDescriptorFactory" ); } - Sequence< ::rtl::OUString > DataAccessDescriptorFactory::getSupportedServiceNames_static() throw( RuntimeException ) + Sequence< OUString > DataAccessDescriptorFactory::getSupportedServiceNames_static() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aServices(1); + Sequence< OUString > aServices(1); aServices[0] = getSingletonName_static(); return aServices; } @@ -279,20 +279,20 @@ namespace dbaccess return *( new DataAccessDescriptorFactory( _rxContext ) ); } - ::rtl::OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException) + OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } - ::sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames_static() ); - const ::rtl::OUString* pStart = aServices.getConstArray(); - const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); + Sequence< OUString > aServices( getSupportedServiceNames_static() ); + const OUString* pStart = aServices.getConstArray(); + const OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, rServiceName ) != pEnd; } - Sequence< ::rtl::OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index a01a901c12e5..bea00d3665fd 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -218,7 +218,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe the instance lock to be released before doing synchronous notifications */ void impl_storeAs_throw( - const ::rtl::OUString& _rURL, + const OUString& _rURL, const ::comphelper::NamedValueCollection& _rArguments, const StoreType _eType, DocumentGuard& _rGuard @@ -297,13 +297,13 @@ public: } // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -325,8 +325,8 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XModel - virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException) ; @@ -339,17 +339,17 @@ public: // XModel2 virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL getControllers( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableViewControllerNames( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames( ) throw (::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createDefaultViewController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createViewController( const ::rtl::OUString& ViewName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createViewController( const OUString& ViewName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; // XStorable virtual sal_Bool SAL_CALL hasLocation( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException) ; virtual sal_Bool SAL_CALL isReadonly( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL store( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL storeAsURL( const ::rtl::OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL storeToURL( const ::rtl::OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL storeAsURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL storeToURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -366,7 +366,7 @@ public: // XDocumentEventBroadcaster virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XPrintable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (::com::sun::star::uno::RuntimeException) ; @@ -388,8 +388,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException); // XDocumentSubStorageSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XOfficeDatabaseDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > SAL_CALL getDataSource() throw (::com::sun::star::uno::RuntimeException); @@ -422,12 +422,12 @@ public: // css.document.XDocumentRecovery virtual ::sal_Bool SAL_CALL wasModifiedSinceLastSave() throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); + virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); + virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); // XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); @@ -437,7 +437,7 @@ public: virtual ::sal_Int32 SAL_CALL leaseNumber( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL releaseNumberForComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); /** clears the given object container @@ -456,7 +456,7 @@ public: inline void checkInitialized() const { if ( !impl_isInitialized() ) - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::lang::NotInitializedException( OUString(), getThis() ); } /** checks the document is currently in the initialization phase, or already initialized. @@ -468,7 +468,7 @@ public: // fine return; - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::lang::NotInitializedException( OUString(), getThis() ); } /** checks whether the document is currently being initialized, or already initialized, @@ -477,7 +477,7 @@ public: inline void checkNotInitialized() const { if ( impl_isInitializing() || impl_isInitialized() ) - throw ::com::sun::star::frame::DoubleInitializationException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::frame::DoubleInitializationException( OUString(), getThis() ); } private: @@ -556,7 +556,7 @@ private: */ ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > impl_createStorageFor_throw( - const ::rtl::OUString& _rURL + const OUString& _rURL ) const; /** sets our "modified" flag @@ -615,7 +615,7 @@ private: is the guard which currently protects the document instance */ sal_Bool impl_attachResource( - const ::rtl::OUString& i_rLogicalDocumentURL, + const OUString& i_rLogicalDocumentURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rMediaDescriptor, DocumentGuard& _rDocGuard ); @@ -625,7 +625,7 @@ private: */ void impl_throwIOExceptionCausedBySave_throw( const ::com::sun::star::uno::Any& i_rError, - const ::rtl::OUString& i_rTargetURL + const OUString& i_rTargetURL ) const; }; diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index e7b271b24e2c..a02c2be89c31 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -84,21 +84,21 @@ namespace dbaccess ~DatabaseRegistrations(); public: - virtual ::sal_Bool SAL_CALL hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getRegistrationNames() throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); - virtual void SAL_CALL registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException); - virtual void SAL_CALL revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); - virtual void SAL_CALL changeDatabaseLocation( const ::rtl::OUString& Name, const ::rtl::OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); - virtual ::sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); + virtual ::sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getRegistrationNames() throw (RuntimeException); + virtual OUString SAL_CALL getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); + virtual void SAL_CALL registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException); + virtual void SAL_CALL revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); + virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); + virtual ::sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); virtual void SAL_CALL addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException); virtual void SAL_CALL removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException); private: ::utl::OConfigurationNode - impl_checkValidName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ); + impl_checkValidName_throw( const OUString& _rName, const bool _bMustExist ); - void impl_checkValidLocation_throw( const ::rtl::OUString& _rLocation ); + void impl_checkValidLocation_throw( const OUString& _rLocation ); /** retrieves the configuration node whose "Name" sub node has the given value @@ -117,10 +117,10 @@ namespace dbaccess However, in this case the root node is not yet committed. */ ::utl::OConfigurationNode - impl_getNodeForName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ); + impl_getNodeForName_throw( const OUString& _rName, const bool _bMustExist ); ::utl::OConfigurationNode - impl_getNodeForName_nothrow( const ::rtl::OUString& _rName ); + impl_getNodeForName_nothrow( const OUString& _rName ); private: Reference<XComponentContext> m_aContext; @@ -144,17 +144,17 @@ namespace dbaccess { } - ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_nothrow( const ::rtl::OUString& _rName ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_nothrow( const OUString& _rName ) { - Sequence< ::rtl::OUString > aNames( m_aConfigurationRoot.getNodeNames() ); - for ( const ::rtl::OUString* pName = aNames.getConstArray(); + Sequence< OUString > aNames( m_aConfigurationRoot.getNodeNames() ); + for ( const OUString* pName = aNames.getConstArray(); pName != aNames.getConstArray() + aNames.getLength(); ++pName ) { ::utl::OConfigurationNode aNodeForName = m_aConfigurationRoot.openNode( *pName ); - ::rtl::OUString sTestName; + OUString sTestName; OSL_VERIFY( aNodeForName.getNodeValue( getNameNodeName() ) >>= sTestName ); if ( sTestName == _rName ) return aNodeForName; @@ -162,7 +162,7 @@ namespace dbaccess return ::utl::OConfigurationNode(); } - ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_throw( const OUString& _rName, const bool _bMustExist ) { ::utl::OConfigurationNode aNodeForName( impl_getNodeForName_nothrow( _rName ) ); @@ -177,14 +177,14 @@ namespace dbaccess if ( _bMustExist ) throw NoSuchElementException( _rName, *this ); - ::rtl::OUString sNewNodeName; + OUString sNewNodeName; { - ::rtl::OUStringBuffer aNewNodeName; + OUStringBuffer aNewNodeName; aNewNodeName.appendAscii( "org.openoffice." ); aNewNodeName.append( _rName ); // make unique - ::rtl::OUStringBuffer aReset( aNewNodeName ); + OUStringBuffer aReset( aNewNodeName ); sNewNodeName = aNewNodeName.makeStringAndClear(); sal_Int32 i=2; while ( m_aConfigurationRoot.hasByName( sNewNodeName ) ) @@ -201,45 +201,45 @@ namespace dbaccess return aNewNode; } - ::utl::OConfigurationNode DatabaseRegistrations::impl_checkValidName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_checkValidName_throw( const OUString& _rName, const bool _bMustExist ) { if ( !m_aConfigurationRoot.isValid() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); if ( _rName.isEmpty() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); return impl_getNodeForName_throw( _rName, _bMustExist ); } - void DatabaseRegistrations::impl_checkValidLocation_throw( const ::rtl::OUString& _rLocation ) + void DatabaseRegistrations::impl_checkValidLocation_throw( const OUString& _rLocation ) { if ( _rLocation.isEmpty() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); INetURLObject aURL( _rLocation ); if ( aURL.GetProtocol() == INET_PROT_NOT_VALID ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); } - ::sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) + ::sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( _Name ); return aNodeForName.isValid(); } - Sequence< ::rtl::OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException) + Sequence< OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_aConfigurationRoot.isValid() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); - Sequence< ::rtl::OUString > aProgrammaticNames( m_aConfigurationRoot.getNodeNames() ); - Sequence< ::rtl::OUString > aDisplayNames( aProgrammaticNames.getLength() ); - ::rtl::OUString* pDisplayName = aDisplayNames.getArray(); + Sequence< OUString > aProgrammaticNames( m_aConfigurationRoot.getNodeNames() ); + Sequence< OUString > aDisplayNames( aProgrammaticNames.getLength() ); + OUString* pDisplayName = aDisplayNames.getArray(); - for ( const ::rtl::OUString* pName = aProgrammaticNames.getConstArray(); + for ( const OUString* pName = aProgrammaticNames.getConstArray(); pName != aProgrammaticNames.getConstArray() + aProgrammaticNames.getLength(); ++pName, ++pDisplayName ) @@ -251,20 +251,20 @@ namespace dbaccess return aDisplayNames; } - ::rtl::OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw( _Name, true ); - ::rtl::OUString sLocation; + OUString sLocation; OSL_VERIFY( aNodeForName.getNodeValue( getLocationNodeName() ) >>= sLocation ); sLocation = SvtPathOptions().SubstituteVariable( sLocation ); return sLocation; } - void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException) + void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -277,12 +277,12 @@ namespace dbaccess m_aConfigurationRoot.commit(); // notify - DatabaseRegistrationEvent aEvent( *this, _Name, ::rtl::OUString(), _Location ); + DatabaseRegistrationEvent aEvent( *this, _Name, OUString(), _Location ); aGuard.clear(); m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent ); } - void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) + void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -290,24 +290,24 @@ namespace dbaccess ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw( _Name, true ); // obtain properties for notification - ::rtl::OUString sLocation; + OUString sLocation; OSL_VERIFY( aNodeForName.getNodeValue( getLocationNodeName() ) >>= sLocation ); // revoke if ( aNodeForName.isReadonly() || !m_aConfigurationRoot.removeNode( aNodeForName.getLocalName() ) ) - throw IllegalAccessException( ::rtl::OUString(), *this ); + throw IllegalAccessException( OUString(), *this ); m_aConfigurationRoot.commit(); // notify - DatabaseRegistrationEvent aEvent( *this, _Name, sLocation, ::rtl::OUString() ); + DatabaseRegistrationEvent aEvent( *this, _Name, sLocation, OUString() ); aGuard.clear(); m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent ); } - void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) + void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& _Name, const OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -316,10 +316,10 @@ namespace dbaccess ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw( _Name, true ); if ( aDataSourceRegistration.isReadonly() ) - throw IllegalAccessException( ::rtl::OUString(), *this ); + throw IllegalAccessException( OUString(), *this ); // obtain properties for notification - ::rtl::OUString sOldLocation; + OUString sOldLocation; OSL_VERIFY( aDataSourceRegistration.getNodeValue( getLocationNodeName() ) >>= sOldLocation ); // change @@ -332,7 +332,7 @@ namespace dbaccess m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::changedDatabaseLocation, aEvent ); } - ::sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + ::sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw( _Name, true ); diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index 13f47d26d92f..33e241a36af0 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -107,7 +107,7 @@ public: */ static void setName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDocumentDataSource >& _rxDocument, - const ::rtl::OUString& _rNewName, + const OUString& _rNewName, DBContextAccess ); @@ -128,13 +128,13 @@ public: virtual void SAL_CALL release() throw( ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -169,7 +169,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XDataSource - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -180,7 +180,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getQueryDefinitions( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XIsolatedConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnection( const OUString& user, const OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XFlushable @@ -204,14 +204,14 @@ private: manager, so it can be used as a master for a "high level" sdb connection. */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > buildLowLevelConnection( - const ::rtl::OUString& _rUid, const ::rtl::OUString& _rPwd + const OUString& _rUid, const OUString& _rPwd ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > buildIsolatedConnection( - const rtl::OUString& user, const rtl::OUString& password + const OUString& user, const OUString& password ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& user, const ::rtl::OUString& password , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void clearConnections(); diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 181ac55e6c76..50ef79dc31d6 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -173,7 +173,7 @@ Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames( ) } // XNameContainer -void SAL_CALL ODefinitionContainer::insertByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -186,7 +186,7 @@ void SAL_CALL ODefinitionContainer::insertByName( const ::rtl::OUString& _rName, notifyByName( aGuard, _rName, xNewElement, NULL, E_INSERTED, ContainerListemers ); } -void SAL_CALL ODefinitionContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -210,7 +210,7 @@ void SAL_CALL ODefinitionContainer::removeByName( const ::rtl::OUString& _rName } // XNameReplace -void SAL_CALL ODefinitionContainer::replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -267,7 +267,7 @@ namespace }; } -void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const ::rtl::OUString& _rName, +void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const OUString& _rName, const Reference< XContent >& _xNewElement, const Reference< XContent >& _xOldElement, ContainerOperation _eOperation, ListenerType _eType ) { @@ -379,14 +379,14 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu return makeAny(xProp); } -Any SAL_CALL ODefinitionContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_aMutex); return makeAny( implGetByName( _rName, sal_True ) ); } -Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& _rName, sal_Bool _bReadIfNeccessary) throw (NoSuchElementException) +Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, sal_Bool _bReadIfNeccessary) throw (NoSuchElementException) { Documents::iterator aMapPos = m_aDocumentMap.find(_rName); if (aMapPos == m_aDocumentMap.end()) @@ -407,12 +407,12 @@ Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& return xProp; } -Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); - Sequence< ::rtl::OUString > aNames(m_aDocumentMap.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aDocumentMap.size()); + OUString* pNames = aNames.getArray(); Documents::iterator aEnd = m_aDocumentMap.end(); for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); aNameIter != aEnd; @@ -425,7 +425,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) t return aNames; } -sal_Bool SAL_CALL ODefinitionContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) +sal_Bool SAL_CALL ODefinitionContainer::hasByName( const OUString& _rName ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -450,7 +450,7 @@ void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) thr } } -void ODefinitionContainer::implRemove(const ::rtl::OUString& _rName) +void ODefinitionContainer::implRemove(const OUString& _rName) { // from the object maps Documents::iterator aFind = m_aDocumentMap.find(_rName); @@ -467,7 +467,7 @@ void ODefinitionContainer::implRemove(const ::rtl::OUString& _rName) namespace { - bool lcl_ensureName( const Reference< XContent >& _rxContent, const ::rtl::OUString& _rName ) + bool lcl_ensureName( const Reference< XContent >& _rxContent, const OUString& _rName ) { if ( !_rxContent.is() ) return true; @@ -479,7 +479,7 @@ namespace Reference< XPropertySet > xProps( _rxContent, UNO_QUERY ); if ( xProps.is() ) { - ::rtl::OUString sCurrentName; + OUString sCurrentName; OSL_VERIFY( xProps->getPropertyValue( PROPERTY_NAME ) >>= sCurrentName ); if ( sCurrentName.equals( _rName ) ) return true; @@ -508,7 +508,7 @@ namespace } } -void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Reference< XContent >& _rxNewObject) +void ODefinitionContainer::implAppend(const OUString& _rName, const Reference< XContent >& _rxNewObject) { MutexGuard aGuard(m_aMutex); try @@ -551,7 +551,7 @@ void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Refer } } -void ODefinitionContainer::implReplace(const ::rtl::OUString& _rName, const Reference< XContent >& _rxNewObject) +void ODefinitionContainer::implReplace(const OUString& _rName, const Reference< XContent >& _rxNewObject) { OSL_ENSURE(checkExistence(_rName), "ODefinitionContainer::implReplace : invalid name !"); @@ -561,7 +561,7 @@ void ODefinitionContainer::implReplace(const ::rtl::OUString& _rName, const Refe addObjectListener(aFind->second); } -void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const Reference< XContent >& _rxObject) const +void ODefinitionContainer::approveNewObject(const OUString& _sName,const Reference< XContent >& _rxObject) const { // check the arguments if ( _sName.isEmpty() ) @@ -605,12 +605,12 @@ void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) { ClearableMutexGuard aGuard(m_aMutex); - if( evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName == "Title" ) + if( evt.PropertyName == (OUString) PROPERTY_NAME || evt.PropertyName == "Title" ) { m_bInPropertyChange = sal_True; try { - ::rtl::OUString sNewName,sOldName; + OUString sNewName,sOldName; evt.OldValue >>= sOldName; evt.NewValue >>= sNewName; Reference<XContent> xContent( evt.Source, UNO_QUERY ); @@ -632,9 +632,9 @@ void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& a { MutexGuard aGuard(m_aMutex); - if( aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" ) + if( aEvent.PropertyName == (OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" ) { - ::rtl::OUString sNewName; + OUString sNewName; aEvent.NewValue >>= sNewName; if(hasByName(sNewName)) throw PropertyVetoException(); @@ -662,7 +662,7 @@ void ODefinitionContainer::removeObjectListener(const Reference< XContent >& _xN } } -sal_Bool ODefinitionContainer::checkExistence(const ::rtl::OUString& _rName) +sal_Bool ODefinitionContainer::checkExistence(const OUString& _rName) { return m_aDocumentMap.find(_rName) != m_aDocumentMap.end(); } diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 92b2ab75ea65..fcd1bec4ccb9 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -652,7 +652,7 @@ OUString SAL_CALL ODocumentContainer::getHierarchicalName() throw (RuntimeExcept OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( getHierarchicalName() ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( i_rRelativeName ); diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index 16dcd22cf8ad..2ff2269e1180 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -67,33 +67,33 @@ public: DECLARE_SERVICE_INFO(); // XComponentLoader - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL loadComponentFromURL( const ::rtl::OUString& URL, const ::rtl::OUString& TargetFrameName, sal_Int32 SearchFlags, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL loadComponentFromURL( const OUString& URL, const OUString& TargetFrameName, sal_Int32 SearchFlags, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XCommandProcessor virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException) ; // XHierarchicalNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const ::rtl::OUString& _sName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByHierarchicalName( const ::rtl::OUString& _sName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const OUString& _sName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& _sName ) throw (::com::sun::star::uno::RuntimeException); // XHierarchicalNameContainer - virtual void SAL_CALL insertByHierarchicalName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByHierarchicalName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByHierarchicalName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByHierarchicalName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalName - virtual ::rtl::OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL composeHierarchicalName( const ::rtl::OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalNameReplace - virtual void SAL_CALL replaceByHierarchicalName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByHierarchicalName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -103,13 +103,13 @@ public: virtual void SAL_CALL revert( ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException, ::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); // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // helper - ::rtl::Reference<OContentHelper> getContent(const ::rtl::OUString& _sName) const; + ::rtl::Reference<OContentHelper> getContent(const OUString& _sName) const; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getContainerStorage() const; protected: @@ -117,11 +117,11 @@ protected: /** OContentHelper */ - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; // ODefinitionContainer virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( - const ::rtl::OUString& _rName + const OUString& _rName ); virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index e64ac434d2d0..a1a9b085281d 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -144,10 +144,10 @@ namespace dbaccess namespace { // -------------------------------------------------------------------- - ::rtl::OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName ) + OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage, + const OUString& _rEntityName ) { - ::rtl::OUString sContentType; + OUString sContentType; try { Reference< XStorage > xContainerStorage( _rxContainerStorage, UNO_QUERY_THROW ); @@ -352,27 +352,27 @@ namespace dbaccess //================================================================== class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave > { - ::rtl::OUString m_sName; + OUString m_sName; Reference<XContent> m_xParentContainer; public: ODocumentSaveContinuation() { } inline Reference<XContent> getContent() const { return m_xParentContainer; } - inline ::rtl::OUString getName() const { return m_sName; } + inline OUString getName() const { return m_sName; } // XInteractionDocumentSave - virtual void SAL_CALL setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException); + virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException); }; - void SAL_CALL ODocumentSaveContinuation::setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException) + void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException) { m_sName = _sName; m_xParentContainer = _xParent; } -::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const Reference< XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName, const Reference< XComponentContext >& _rContext, +OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const Reference< XStorage >& _rxContainerStorage, + const OUString& _rEntityName, const Reference< XComponentContext >& _rContext, Sequence< sal_Int8 >& _rClassId ) { return GetDocumentServiceFromMediaType( @@ -380,10 +380,10 @@ namespace dbaccess _rContext, _rClassId ); } -::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const ::rtl::OUString& _rMediaType, +OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _rMediaType, const Reference< XComponentContext >& _rContext, Sequence< sal_Int8 >& _rClassId ) { - ::rtl::OUString sResult; + OUString sResult; try { ::comphelper::MimeConfigurationHelper aConfigHelper( _rContext ); @@ -394,11 +394,11 @@ namespace dbaccess Reference< XNameAccess > xObjConfig = aConfigHelper.GetObjConfiguration(); if ( xObjConfig.is() ) { - Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames(); + Sequence< OUString > aClassIDs = xObjConfig->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ ) { Reference< XNameAccess > xObjectProps; - ::rtl::OUString aEntryDocName; + OUString aEntryDocName; if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is() && ( xObjectProps->getByName("ObjectDocumentServiceName") >>= aEntryDocName ) @@ -414,7 +414,7 @@ namespace dbaccess // alternative, shorter approach const Sequence< NamedValue > aProps( aConfigHelper.GetObjectPropsByMediaType( _rMediaType ) ); const ::comphelper::NamedValueCollection aMediaTypeProps( aProps ); - const ::rtl::OUString sAlternativeResult = aMediaTypeProps.getOrDefault( "ObjectDocumentServiceName", ::rtl::OUString() ); + const OUString sAlternativeResult = aMediaTypeProps.getOrDefault( "ObjectDocumentServiceName", OUString() ); OSL_ENSURE( sAlternativeResult == sResult, "ODocumentDefinition::GetDocumentServiceFromMediaType: failed, this approach is *not* equivalent (1)!" ); const Sequence< sal_Int8 > aAlternativeClassID = aMediaTypeProps.getOrDefault( "ClassID", Sequence< sal_Int8 >() ); OSL_ENSURE( aAlternativeClassID == _rClassId, "ODocumentDefinition::GetDocumentServiceFromMediaType: failed, this approach is *not* equivalent (2)!" ); @@ -534,10 +534,10 @@ void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int3 { if ( i_nHandle == PROPERTY_ID_PERSISTENT_PATH ) { - ::rtl::OUString sPersistentPath; + OUString sPersistentPath; if ( !m_pImpl->m_aProps.sPersistentName.isEmpty() ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( ODatabaseModelImpl::getObjectContainerStorageName( m_bForm ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT ) ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( m_pImpl->m_aProps.sPersistentName ); @@ -571,7 +571,7 @@ IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const Sequence< Property > aManualProps( 1 ); aManualProps[0].Name = PROPERTY_PERSISTENT_PATH; aManualProps[0].Handle = PROPERTY_ID_PERSISTENT_PATH; - aManualProps[0].Type = ::getCppuType( static_cast< const ::rtl::OUString* >( NULL ) ); + aManualProps[0].Type = ::getCppuType( static_cast< const OUString* >( NULL ) ); aManualProps[0].Attributes = PropertyAttribute::READONLY; return new OPropertyArrayHelper( ::comphelper::concatSequences( aProps, aManualProps ) ); @@ -780,7 +780,7 @@ void ODocumentDefinition::impl_showOrHideComponent_throw( const bool i_bShow ) { default: case EmbedStates::LOADED: - throw embed::WrongStateException( ::rtl::OUString(), *this ); + throw embed::WrongStateException( OUString(), *this ); case EmbedStates::RUNNING: if ( !i_bShow ) @@ -919,7 +919,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons // not supported ucbhelper::cancelCommandExecution( makeAny( UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( nOpenMode ) ) ), _rxEnvironment ); @@ -1054,14 +1054,14 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); // Unreachable } Reference< XStorage> xDest(aIni[0],UNO_QUERY); - ::rtl::OUString sPersistentName; + OUString sPersistentName; aIni[1] >>= sPersistentName; Reference< XStorage> xStorage = getContainerStorage(); @@ -1080,13 +1080,13 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co OSL_FAIL( "Wrong argument count!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); // Unreachable } - ::rtl::OUString sURL; + OUString sURL; aIni[0] >>= sURL; onCommandInsert( sURL, Environment ); } @@ -1152,7 +1152,7 @@ namespace try { Reference< XPropertySet > xFormProps( xForm, UNO_QUERY_THROW ); - xFormProps->setPropertyValue( PROPERTY_DATASOURCENAME, makeAny( ::rtl::OUString() ) ); + xFormProps->setPropertyValue( PROPERTY_DATASOURCENAME, makeAny( OUString() ) ); } catch( const Exception& ) { @@ -1188,7 +1188,7 @@ namespace } } -void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const Reference< XCommandEnvironment >& Environment ) +void ODocumentDefinition::onCommandInsert( const OUString& _sURL, const Reference< XCommandEnvironment >& Environment ) throw( Exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1198,11 +1198,11 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R { OSL_FAIL( "Content::onCommandInsert - property value missing!" ); - Sequence< rtl::OUString > aProps( 1 ); + Sequence< OUString > aProps( 1 ); aProps[ 0 ] = PROPERTY_URL; ucbhelper::cancelCommandExecution( makeAny( MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -1388,13 +1388,13 @@ sal_Bool ODocumentDefinition::saveAs() try { Reference< XStorage> xStorage = getContainerStorage(); - const static ::rtl::OUString sBaseName("Obj"); + const static OUString sBaseName("Obj"); Reference<XNameAccess> xElements(xStorage,UNO_QUERY_THROW); - ::rtl::OUString sPersistentName = ::dbtools::createUniqueName(xElements,sBaseName); + OUString sPersistentName = ::dbtools::createUniqueName(xElements,sBaseName); xStorage->copyElementTo(m_pImpl->m_aProps.sPersistentName,xStorage,sPersistentName); - ::rtl::OUString sOldName = m_pImpl->m_aProps.aTitle; + OUString sOldName = m_pImpl->m_aProps.aTitle; rename(pDocuSave->getName()); updateDocumentTitle(); @@ -1498,7 +1498,7 @@ sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const return bAllowDocumentMacros; } -::rtl::OUString ODocumentDefinition::determineContentType() const +OUString ODocumentDefinition::determineContentType() const { return lcl_determineContentType_nothrow( getContainerStorage(), m_pImpl->m_aProps.sPersistentName ); } @@ -1614,7 +1614,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ if ( xStorage.is() ) { Reference< XEmbeddedObjectCreator> xEmbedFactory = OOoEmbeddedObjectFactory::create(m_aContext); - ::rtl::OUString sDocumentService; + OUString sDocumentService; sal_Bool bSetSize = sal_False; sal_Int32 nEntryConnectionMode = EntryInitModes::DEFAULT_INIT; Sequence< sal_Int8 > aClassID = _aClassID; @@ -1632,7 +1632,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ { // we seem to be a "new style" report, check if report extension is present. Reference< XContentEnumerationAccess > xEnumAccess( m_aContext->getServiceManager(), UNO_QUERY ); - const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext); + const OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext); Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(sReportEngineServiceName); if ( !xEnumDrivers.is() || !xEnumDrivers->hasMoreElements() ) { @@ -1879,7 +1879,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor Reference< XComponent > xComponent; try { - ::rtl::OUString sName( impl_getHierarchicalName( false ) ); + OUString sName( impl_getHierarchicalName( false ) ); sal_Int32 nObjectType = m_bForm ? DatabaseObject::FORM : DatabaseObject::REPORT; aGuard.clear(); @@ -1891,7 +1891,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } return xComponent; } @@ -1938,7 +1938,7 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } } @@ -1955,27 +1955,27 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } return bSuccess; } -::rtl::OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException) +OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return impl_getHierarchicalName( false ); } -::rtl::OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const ::rtl::OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) +OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( getHierarchicalName() ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( i_rRelativeName ); return aBuffer.makeStringAndClear(); } -void SAL_CALL ODocumentDefinition::rename( const ::rtl::OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException) { try { @@ -2104,7 +2104,7 @@ void ODocumentDefinition::fillReportData( const Reference< XComponentContext >& void ODocumentDefinition::updateDocumentTitle() { - ::rtl::OUString sName = m_pImpl->m_aProps.aTitle; + OUString sName = m_pImpl->m_aProps.aTitle; if ( m_pImpl->m_pDataSource ) { if ( sName.isEmpty() ) @@ -2115,7 +2115,7 @@ void ODocumentDefinition::updateDocumentTitle() sName = DBACORE_RESSTRING( RID_STR_REPORT ); Reference< XUntitledNumbers > xUntitledProvider(m_pImpl->m_pDataSource->getModel_noCreate(), UNO_QUERY ); if ( xUntitledProvider.is() ) - sName += ::rtl::OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) ); + sName += OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) ); } Reference< XTitle > xDatabaseDocumentModel(m_pImpl->m_pDataSource->getModel_noCreate(),uno::UNO_QUERY); @@ -2159,7 +2159,7 @@ void ODocumentDefinition::firePropertyChange( sal_Int32 i_nHandle, const Any& i_ // ============================================================================= // NameChangeNotifier // ============================================================================= -NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, const ::rtl::OUString& i_rNewName, +NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, const OUString& i_rNewName, ::osl::ResettableMutexGuard& i_rClearForNotify ) :m_rDocumentDefinition( i_rDocumentDefinition ) ,m_aOldValue( makeAny( i_rDocumentDefinition.getCurrentName() ) ) diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index f9e6f71519eb..b3630dfb5f9f 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -121,8 +121,8 @@ public: virtual ::sal_Bool SAL_CALL close( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalName - virtual ::rtl::OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL composeHierarchicalName( const ::rtl::OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -131,7 +131,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::ucb::CommandAbortedException, ::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); // XCloseListener virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); @@ -173,20 +173,20 @@ public: static ::com::sun::star::uno::Sequence< sal_Int8 > getDefaultDocumentTypeClassId(); - static ::rtl::OUString GetDocumentServiceFromMediaType( - const ::rtl::OUString& _rMediaType, + static OUString GetDocumentServiceFromMediaType( + const OUString& _rMediaType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext, ::com::sun::star::uno::Sequence< sal_Int8 >& _rClassId ); - static ::rtl::OUString GetDocumentServiceFromMediaType( + static OUString GetDocumentServiceFromMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName, + const OUString& _rEntityName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext, ::com::sun::star::uno::Sequence< sal_Int8 >& _rClassId ); struct NotifierAccess { friend class NameChangeNotifier; private: NotifierAccess() { } }; - const ::rtl::OUString& getCurrentName() const { return m_pImpl->m_aProps.aTitle; } + const OUString& getCurrentName() const { return m_pImpl->m_aProps.aTitle; } void firePropertyChange( sal_Int32 i_nHandle, const ::com::sun::star::uno::Any& i_rNewValue, @@ -251,7 +251,7 @@ private: virtual void SAL_CALL disposing(); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; /** fills the load arguments */ @@ -339,7 +339,7 @@ private: //- commands void onCommandGetDocumentProperties( ::com::sun::star::uno::Any& _rProps ); - void onCommandInsert( const ::rtl::OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( ::com::sun::star::uno::Exception ); + void onCommandInsert( const OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( ::com::sun::star::uno::Exception ); void onCommandPreview( ::com::sun::star::uno::Any& _rImage ); ::com::sun::star::uno::Any onCommandOpenSomething( @@ -356,7 +356,7 @@ class NameChangeNotifier public: NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, - const ::rtl::OUString& i_rNewName, + const OUString& i_rNewName, ::osl::ResettableMutexGuard& i_rClearForNotify ); ~NameChangeNotifier(); diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index 063876e58439..f2d4c32f94a4 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -80,7 +80,7 @@ namespace dbaccess namespace { static void lcl_dispatchScriptURL_throw( DocumentEventExecutor_Data& _rDocExecData, - const ::rtl::OUString& _rScriptURL, const DocumentEvent& _rTrigger ) + const OUString& _rScriptURL, const DocumentEvent& _rTrigger ) { Reference< XModel > xDocument( _rDocExecData.xDocument.get(), UNO_QUERY_THROW ); @@ -104,7 +104,7 @@ namespace dbaccess // we lock the solar mutex here. SolarMutexGuard aSolarGuard; - Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aScriptURL, ::rtl::OUString(), 0 ) ); + Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aScriptURL, OUString(), 0 ) ); if ( !xDispatch.is() ) { OSL_FAIL( "lcl_dispatchScriptURL_throw: no dispatcher for the script URL!" ); @@ -171,10 +171,10 @@ namespace dbaccess const ::comphelper::NamedValueCollection aScriptDescriptor( xDocEvents->getByName( _Event.EventName ) ); - ::rtl::OUString sEventType; + OUString sEventType; bool bScriptAssigned = aScriptDescriptor.get_ensureType( "EventType", sEventType ); - ::rtl::OUString sScript; + OUString sScript; bScriptAssigned = bScriptAssigned && aScriptDescriptor.get_ensureType( "Script", sScript ); if ( !bScriptAssigned ) diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx index 651fb00ef720..18155d0a45a1 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx @@ -107,14 +107,14 @@ namespace dbaccess void onDocumentInitialized(); - void notifyDocumentEvent( const ::rtl::OUString& _EventName, const Reference< XController2 >& _ViewController, + void notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { impl_notifyEvent_nothrow( DocumentEvent( m_rDocument, _EventName, _ViewController, _Supplement ) ); } - void notifyDocumentEventAsync( const ::rtl::OUString& _EventName, const Reference< XController2 >& _ViewController, + void notifyDocumentEventAsync( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { impl_notifyEventAsync_nothrow( DocumentEvent( @@ -278,13 +278,13 @@ namespace dbaccess m_pImpl->removeDocumentEventListener( _Listener ); } - void DocumentEventNotifier::notifyDocumentEvent( const ::rtl::OUString& _EventName, + void DocumentEventNotifier::notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { m_pImpl->notifyDocumentEvent( _EventName, _ViewController, _Supplement ); } - void DocumentEventNotifier::notifyDocumentEventAsync( const ::rtl::OUString& _EventName, + void DocumentEventNotifier::notifyDocumentEventAsync( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { m_pImpl->notifyDocumentEventAsync( _EventName, _ViewController, _Supplement ); diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx index 4b4a68537ebf..cd365ed91d24 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx @@ -72,7 +72,7 @@ namespace dbaccess ->onDocumentInitialized has been called */ void notifyDocumentEvent( - const ::rtl::OUString& _EventName, + const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _rxViewController = NULL, const ::com::sun::star::uno::Any& _Supplement = ::com::sun::star::uno::Any() ); @@ -85,7 +85,7 @@ namespace dbaccess the mutex is locked */ void notifyDocumentEventAsync( - const ::rtl::OUString& _EventName, + const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController = NULL, const ::com::sun::star::uno::Any& _Supplement = ::com::sun::star::uno::Any() ); @@ -103,7 +103,7 @@ namespace dbaccess const ::com::sun::star::uno::Any& _rSupplement = ::com::sun::star::uno::Any() ) { - notifyDocumentEvent( ::rtl::OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); + notifyDocumentEvent( OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); } /** notifies a document event to all registered listeners, asynchronously @@ -119,7 +119,7 @@ namespace dbaccess const ::com::sun::star::uno::Any& _rSupplement = ::com::sun::star::uno::Any() ) { - notifyDocumentEventAsync( ::rtl::OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); + notifyDocumentEventAsync( OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); } private: diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 65f54ffa6f02..41a7e416ad37 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -117,7 +117,7 @@ namespace dbaccess const DocumentEventData* pEventData = lcl_getDocumentEventData(); while ( pEventData->pAsciiEventName ) { - ::rtl::OUString sEventName = ::rtl::OUString::createFromAscii( pEventData->pAsciiEventName ); + OUString sEventName = OUString::createFromAscii( pEventData->pAsciiEventName ); DocumentEventsData::iterator existingPos = m_pData->rEventsData.find( sEventName ); if ( existingPos == m_pData->rEventsData.end() ) m_pData->rEventsData[ sEventName ] = Sequence< PropertyValue >(); @@ -139,7 +139,7 @@ namespace dbaccess m_pData->rParent.release(); } - bool DocumentEvents::needsSynchronousNotification( const ::rtl::OUString& _rEventName ) + bool DocumentEvents::needsSynchronousNotification( const OUString& _rEventName ) { const DocumentEventData* pEventData = lcl_getDocumentEventData(); while ( pEventData->pAsciiEventName ) @@ -153,7 +153,7 @@ namespace dbaccess return false; } - void SAL_CALL DocumentEvents::replaceByName( const ::rtl::OUString& _Name, const Any& _Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + void SAL_CALL DocumentEvents::replaceByName( const OUString& _Name, const Any& _Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); @@ -170,14 +170,14 @@ namespace dbaccess ::comphelper::NamedValueCollection aCheck( aEventDescriptor ); if ( aCheck.has( "EventType" ) ) { - ::rtl::OUString sEventType = aCheck.getOrDefault( "EventType", ::rtl::OUString() ); + OUString sEventType = aCheck.getOrDefault( "EventType", OUString() ); OSL_ENSURE( !sEventType.isEmpty(), "DocumentEvents::replaceByName: doing a reset via an empty EventType is weird!" ); if ( sEventType.isEmpty() ) aEventDescriptor.realloc( 0 ); } if ( aCheck.has( "Script" ) ) { - ::rtl::OUString sScript = aCheck.getOrDefault( "Script", ::rtl::OUString() ); + OUString sScript = aCheck.getOrDefault( "Script", OUString() ); OSL_ENSURE( !sScript.isEmpty(), "DocumentEvents::replaceByName: doing a reset via an empty Script is weird!" ); if ( sScript.isEmpty() ) aEventDescriptor.realloc( 0 ); @@ -186,7 +186,7 @@ namespace dbaccess elementPos->second = aEventDescriptor; } - Any SAL_CALL DocumentEvents::getByName( const ::rtl::OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL DocumentEvents::getByName( const OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); @@ -201,11 +201,11 @@ namespace dbaccess return aReturn; } - Sequence< ::rtl::OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); - Sequence< ::rtl::OUString > aNames( m_pData->rEventsData.size() ); + Sequence< OUString > aNames( m_pData->rEventsData.size() ); ::std::transform( m_pData->rEventsData.begin(), m_pData->rEventsData.end(), @@ -215,7 +215,7 @@ namespace dbaccess return aNames; } - ::sal_Bool SAL_CALL DocumentEvents::hasByName( const ::rtl::OUString& _Name ) throw (RuntimeException) + ::sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& _Name ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index 1ed70b454283..12bd8b8fc5f4 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -32,7 +32,7 @@ namespace dbaccess { - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > + typedef ::std::map< OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > DocumentEventsData; //==================================================================== @@ -50,19 +50,19 @@ namespace dbaccess DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData ); ~DocumentEvents(); - static bool needsSynchronousNotification( const ::rtl::OUString& _rEventName ); + static bool needsSynchronousNotification( const OUString& _rEventName ); // XInterface virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // 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); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index cff678137762..af3587b16608 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -311,7 +311,7 @@ void SAL_CALL OInterceptor::removeStatusListener( //XInterceptorInfo -Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) +Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) { // now implemented as update return m_aInterceptedURL; @@ -320,12 +320,12 @@ Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) thro // XDispatchProvider -Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,const ::rtl::OUString& TargetFrameName,sal_Int32 SearchFlags ) +Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,const OUString& TargetFrameName,sal_Int32 SearchFlags ) throw (RuntimeException) { osl::MutexGuard aGuard(m_aMutex); - const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const OUString* pIter = m_aInterceptedURL.getConstArray(); + const OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( _URL.Complete == *pIter ) @@ -349,8 +349,8 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons for(sal_Int32 i = 0; i < Requests.getLength(); ++i) { - const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const OUString* pIter = m_aInterceptedURL.getConstArray(); + const OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( Requests[i].FeatureURL.Complete == *pIter ) diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 6229d55d8d6f..0bacec5a7aee 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -75,7 +75,7 @@ public: ); //XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getInterceptedURLs( ) throw ( ::com::sun::star::uno::RuntimeException @@ -86,7 +86,7 @@ public: ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( ::com::sun::star::uno::RuntimeException @@ -146,7 +146,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aInterceptedURL; + ::com::sun::star::uno::Sequence< OUString > m_aInterceptedURL; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; PropertyChangeListenerContainer* m_pStatCL; diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index b34e981e95df..a8aee2ad40ce 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -50,7 +50,7 @@ namespace dbaccess struct ResultListEntry { - rtl::OUString aId; + OUString aId; Reference< XContentIdentifier > xId; ::rtl::Reference< OContentHelper > xContent; Reference< XRow > xRow; @@ -125,13 +125,13 @@ DataSupplier::~DataSupplier() DBG_DTOR(DataSupplier,NULL); } -rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( (size_t)nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( !aId.isEmpty() ) { // Already cached. @@ -151,7 +151,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) m_pImpl->m_aResults[ nIndex ]->aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } Reference< XContentIdentifier > @@ -169,7 +169,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { Reference< XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aId ); @@ -200,7 +200,7 @@ DataSupplier::queryContent( sal_uInt32 _nIndex ) try { Reference< XContent > xContent; - ::rtl::OUString sName = xId->getContentIdentifier(); + OUString sName = xId->getContentIdentifier(); sal_Int32 nIndex = sName.lastIndexOf('/') + 1; sName = sName.getToken(0,'/',nIndex); @@ -239,11 +239,11 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) sal_uInt32 nPos = nOldCount; // @@@ Obtain data and put it into result list... - Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); + Sequence< OUString> aSeq = m_pImpl->m_xContent->getElementNames(); if ( nIndex < sal::static_int_cast< sal_uInt32 >( aSeq.getLength() ) ) { - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(pIter = pIter + nPos;pIter != pEnd;++pIter,++nPos) { m_pImpl->m_aResults.push_back( @@ -288,9 +288,9 @@ sal_uInt32 DataSupplier::totalCount() sal_uInt32 nOldCount = m_pImpl->m_aResults.size(); // @@@ Obtain data and put it into result list... - Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = m_pImpl->m_xContent->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) m_pImpl->m_aResults.push_back( new ResultListEntry( m_pImpl->m_xContent->getContent(*pIter)->getContentProperties() ) ); diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 0274d5cc2025..d5a8b2bb770a 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -38,7 +38,7 @@ public: sal_Int32 nOpenMode ); virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 4d0eeebc8f20..7ccdc646a0ee 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -41,7 +41,7 @@ namespace dbaccess { private: typedef ::rtl::Reference< OPropertyForward > TPropertyForward; - typedef ::std::map< ::rtl::OUString, TPropertyForward > PropertyForwardList; + typedef ::std::map< OUString, TPropertyForward > PropertyForwardList; PropertyForwardList m_aForwardList; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xSettings; // can not be weak ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak @@ -62,7 +62,7 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); - void notifyElementCreated(const ::rtl::OUString& _sElementName + void notifyElementCreated(const OUString& _sElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xElement); private: @@ -74,7 +74,7 @@ namespace dbaccess /** initializes the properties of the given object from its counterpart in our settings container */ void impl_initSettings_nothrow( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDestination ); }; diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 0c352f26ad3e..654d455022ba 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -46,13 +46,13 @@ namespace dbaccess class ODatabaseModelImpl; struct ContentProperties { - ::rtl::OUString aTitle; // Title - ::boost::optional< ::rtl::OUString > + OUString aTitle; // Title + ::boost::optional< OUString > aContentType; // ContentType (aka MediaType aka MimeType) sal_Bool bIsDocument; // IsDocument sal_Bool bIsFolder; // IsFolder sal_Bool bAsTemplate; // AsTemplate - ::rtl::OUString sPersistentName;// persistent name of the document + OUString sPersistentName;// persistent name of the document ContentProperties() :bIsDocument( sal_True ) @@ -75,8 +75,8 @@ namespace dbaccess typedef ::boost::shared_ptr<OContentHelper_Impl> TContentPtr; - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, - ::rtl::OUStringHash, + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, + OUStringHash, ::comphelper::UStringEqual > PropertyChangeListenerContainer; typedef ::comphelper::OBaseMutex OContentHelper_MBASE; @@ -103,7 +103,7 @@ namespace dbaccess getProperties( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - void impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify = true); + void impl_rename_throw(const OUString& _sNewName,bool _bNotify = true); protected: ::cppu::OInterfaceContainerHelper m_aContentListeners; @@ -128,7 +128,7 @@ namespace dbaccess */ void notifyPropertiesChange( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyChangeEvent >& evt ) const; - ::rtl::OUString impl_getHierarchicalName( bool _includingRootContainer ) const; + OUString impl_getHierarchicalName( bool _includingRootContainer ) const; public: @@ -141,13 +141,13 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // ::com::sun::star::lang::XServiceInfo - 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 ::rtl::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); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); // XContent virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getContentType( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getContentType( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL addContentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentEventListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL removeContentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentEventListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; @@ -157,12 +157,12 @@ namespace dbaccess virtual void SAL_CALL abort( sal_Int32 CommandId ) throw (::com::sun::star::uno::RuntimeException) ; // XPropertiesChangeNotifier - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException) ; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -176,7 +176,7 @@ namespace dbaccess virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::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); inline const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > @@ -188,7 +188,7 @@ namespace dbaccess inline TContentPtr getImpl() const { return m_pImpl; } protected: - virtual ::rtl::OUString determineContentType() const = 0; + virtual OUString determineContentType() const = 0; }; } // namespace dbaccess diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 5c20906b9ee0..c22ad531f2fd 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -57,8 +57,8 @@ public: explicit DatabaseDataProvider(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); @@ -71,65 +71,65 @@ private: { TDatabaseDataProvider::release(); } // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::chart2::data::XDataProvider: virtual ::sal_Bool SAL_CALL createDataSourcePossible(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aArguments) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xDataSource) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::chart2::data::XRangeXMLConversion: - virtual ::rtl::OUString SAL_CALL convertRangeToXML(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual ::rtl::OUString SAL_CALL convertRangeFromXML(const ::rtl::OUString & aXMLRange) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual OUString SAL_CALL convertRangeToXML(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual OUString SAL_CALL convertRangeFromXML(const OUString & aXMLRange) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); // ::com::sun::star::beans::XPropertySet: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); // ::com::sun::star::chart2::data::XDatabaseDataProvider: - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getMasterFields() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMasterFields(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDetailFields() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDetailFields(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCommand(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMasterFields(const ::com::sun::star::uno::Sequence< OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDetailFields(const ::com::sun::star::uno::Sequence< OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCommand(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCommandType() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setCommandType(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getApplyFilter() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setApplyFilter( ::sal_Bool _applyfilter ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHavingClause() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHavingClause( const ::rtl::OUString& _havingclause ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getGroupBy() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroupBy( const ::rtl::OUString& _groupby ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& _order ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHavingClause() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHavingClause( const OUString& _havingclause ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getGroupBy() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroupBy( const OUString& _groupby ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& _order ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getEscapeProcessing() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setEscapeProcessing(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getRowLimit() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRowLimit( ::sal_Int32 _rowlimit ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setActiveConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual ::rtl::OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataSourceName( const ::rtl::OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); // com::sun::star::sdbc::XParameters virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -137,7 +137,7 @@ private: virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -182,18 +182,18 @@ private: virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // ____ XComplexDescriptionAccess ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -214,11 +214,11 @@ private: void impl_fillRowSet_throw(); void impl_executeRowSet_throw(::osl::ResettableMutexGuard& _rClearForNotifies); bool impl_fillParameters_nothrow( ::osl::ResettableMutexGuard& _rClearForNotifies); - void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< ::rtl::OUString >& i_aColumnNames); + void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< OUString >& i_aColumnNames); void impl_invalidateParameter_nothrow(); - ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const; + ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const; - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -236,7 +236,7 @@ private: ::dbtools::ParameterManager m_aParameterManager; ::dbtools::FilterManager m_aFilterManager; - ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any> m_aNumberFormats; + ::std::map< OUString, ::com::sun::star::uno::Any> m_aNumberFormats; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; @@ -249,17 +249,17 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xAggregateSet; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_MasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_DetailFields; + ::com::sun::star::uno::Sequence< OUString > m_MasterFields; + ::com::sun::star::uno::Sequence< OUString > m_DetailFields; - ::rtl::OUString m_Command; - ::rtl::OUString m_DataSourceName; + OUString m_Command; + OUString m_DataSourceName; ::sal_Int32 m_CommandType; sal_Int32 m_RowLimit; - ::rtl::OUString m_Filter; - ::rtl::OUString m_HavingClause; - ::rtl::OUString m_Order; - ::rtl::OUString m_GroupBy; + OUString m_Filter; + OUString m_HavingClause; + OUString m_Order; + OUString m_GroupBy; ::sal_Bool m_EscapeProcessing; ::sal_Bool m_ApplyFilter; }; diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index 049bdbc15103..a166cf977338 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -51,7 +51,7 @@ namespace dbaccess /** returns a string denoting the only type of tables allowed in this container, or an empty string if there is no such restriction */ - virtual ::rtl::OUString getTableTypeRestriction() const = 0; + virtual OUString getTableTypeRestriction() const = 0; inline virtual void addMasterContainerListener(){} inline virtual void removeMasterContainerListener(){} @@ -59,7 +59,7 @@ namespace dbaccess // ::connectivity::sdbcx::OCollection virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject); + virtual OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject); /** tell the container to free all elements and all additional resources.<BR> After using this method the object may be reconstructed by calling one of the <code>constrcuct</code> methods. @@ -87,7 +87,7 @@ namespace dbaccess /** retrieve a table type filter to pass to <member scope="com::sun::star::sdbc">XDatabaseMetaData::getTables</member>, according to the current data source settings */ - void getAllTableTypeFilter( ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rFilter ) const; + void getAllTableTypeFilter( ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rFilter ) const; public: /** ctor of the container. The parent has to support the <type scope="com::sun::star::sdbc">XConnection</type> @@ -114,8 +114,8 @@ namespace dbaccess filters given (the connection is the parent object you passed in the ctor). */ void construct( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableTypeFilter + const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter, + const ::com::sun::star::uno::Sequence< OUString >& _rTableTypeFilter ); /** late ctor. The container will fill itself with wrapper objects for the tables returned by the given @@ -123,8 +123,8 @@ namespace dbaccess */ void construct( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxMasterContainer, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableTypeFilter + const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter, + const ::com::sun::star::uno::Sequence< OUString >& _rTableTypeFilter ); inline sal_Bool isInitialized() const { return m_bConstructed; } diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index a8edf951da03..df40f3383931 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -43,7 +43,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDestContainer; - ::rtl::OUString m_sName; + OUString m_sName; sal_Bool m_bInInsert; protected: @@ -52,8 +52,8 @@ namespace dbaccess public: OPropertyForward( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xDestContainer, - const ::rtl::OUString& _sName, - const ::std::vector< ::rtl::OUString >& _aPropertyList + const OUString& _sName, + const ::std::vector< OUString >& _aPropertyList ); // ::com::sun::star::beans::XPropertyChangeListener @@ -62,7 +62,7 @@ namespace dbaccess // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException); - inline void setName( const ::rtl::OUString& _sName ) { m_sName = _sName; } + inline void setName( const OUString& _sName ) { m_sName = _sName; } void setDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDest); inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDefinition() const { return m_xDest; } }; diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index b68cbc802854..314c05b18c2a 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -83,7 +83,7 @@ namespace dbaccess ::std::vector<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries ::std::vector<OPrivateTables*> m_aTablesCollection; - ::std::vector< ::rtl::OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement + ::std::vector< OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; @@ -97,15 +97,15 @@ namespace dbaccess ::std::vector<OPrivateColumns*> m_aCurrentColumns; OPrivateTables* m_pTables; // currently used tables - ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having - ::rtl::OUString m_sDecimalSep; - ::rtl::OUString m_sCommand; + OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having + OUString m_sDecimalSep; + OUString m_sCommand; ::com::sun::star::lang::Locale m_aLocale; sal_Int32 m_nBoolCompareMode; // how to compare bool values sal_Int32 m_nCommandType; // <properties> - ::rtl::OUString m_sOrignal; + OUString m_sOrignal; // </properties> @@ -116,8 +116,8 @@ namespace dbaccess sal_Bool setComparsionPredicate(::connectivity::OSQLParseNode* pCondition, ::connectivity::OSQLParseTreeIterator& _rIterator, ::std::vector < ::com::sun::star::beans::PropertyValue > & rFilters, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const; - ::rtl::OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator) const; - ::rtl::OUString getTableAlias(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) const; + OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator) const; + OUString getTableAlias(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) const; sal_Int32 getPredicateType(::connectivity::OSQLParseNode * _pPredicate) const; // clears all Columns,Parameters and tables and insert it to their vectors void clearCurrentCollections(); @@ -128,12 +128,12 @@ namespace dbaccess @param _rIterator the iterator to use. */ - ::rtl::OUString getStatementPart( TGetParseNode& _aGetFunctor, ::connectivity::OSQLParseTreeIterator& _rIterator ); - void setQuery_Impl( const ::rtl::OUString& command ); + OUString getStatementPart( TGetParseNode& _aGetFunctor, ::connectivity::OSQLParseTreeIterator& _rIterator ); + void setQuery_Impl( const OUString& command ); void setConditionByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column , sal_Bool andCriteria - ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,::rtl::OUString>& _aSetFunctor + ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString>& _aSetFunctor ,sal_Int32 filterOperator); /** getStructuredCondition returns the structured condition for the where or having clause @@ -150,8 +150,8 @@ namespace dbaccess setCurrentColumns( EColumnType _eType, const ::rtl::Reference< ::connectivity::OSQLColumns >& _rCols ); //helper methods for mem_fun_t - inline bool implSetFilter(::rtl::OUString _sFilter) { setFilter(_sFilter); return true;} - inline bool implSetHavingClause(::rtl::OUString _sFilter) { setHavingClause(_sFilter); return true;} + inline bool implSetFilter(OUString _sFilter) { setFilter(_sFilter); return true;} + inline bool implSetHavingClause(OUString _sFilter) { setHavingClause(_sFilter); return true;} /** returns the part of the seelect statement @param _ePart @@ -164,23 +164,23 @@ namespace dbaccess @return The part of the select statement. */ - ::rtl::OUString getSQLPart( SQLPart _ePart, ::connectivity::OSQLParseTreeIterator& _rIterator, sal_Bool _bWithKeyword ); + OUString getSQLPart( SQLPart _ePart, ::connectivity::OSQLParseTreeIterator& _rIterator, sal_Bool _bWithKeyword ); /** retrieves the keyword for the given SQLPart */ - ::rtl::OUString getKeyword( SQLPart _ePart ) const; + OUString getKeyword( SQLPart _ePart ) const; /** sets a single "additive" clause, means a filter/groupby/having/order clause */ - void setSingleAdditiveClause( SQLPart _ePart, const ::rtl::OUString& _rClause ); + void setSingleAdditiveClause( SQLPart _ePart, const OUString& _rClause ); /** composes a statement from m_aPureSelectSQL and the 4 usual clauses */ - ::rtl::OUString composeStatementFromParts( const ::std::vector< ::rtl::OUString >& _rParts ); + OUString composeStatementFromParts( const ::std::vector< OUString >& _rParts ); /** return the name of the column. */ - ::rtl::OUString impl_getColumnName_throw(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column); + OUString impl_getColumnName_throw(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column); protected: virtual ~OSingleSelectQueryComposer(); @@ -206,32 +206,32 @@ namespace dbaccess DECLARE_PROPERTYCONTAINER_DEFAULTS(); // ::com::sun::star::sdb::XSingleSelectQueryComposer - virtual ::rtl::OUString SAL_CALL getElementaryQuery() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setElementaryQuery( const ::rtl::OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter( const ::rtl::OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getElementaryQuery() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setElementaryQuery( const OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter( const OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setStructuredFilter( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendFilterByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendGroupByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroup( const ::rtl::OUString& group ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHavingClause( const ::rtl::OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroup( const OUString& group ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHavingClause( const OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setStructuredHavingClause( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendHavingClauseByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendOrderByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool ascending ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& order ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& order ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XSingleSelectQueryAnalyzer - virtual ::rtl::OUString SAL_CALL getQuery( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setQuery( const ::rtl::OUString& command ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCommand( const ::rtl::OUString& command,sal_Int32 CommandType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQuery( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setQuery( const OUString& command ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCommand( const OUString& command,sal_Int32 CommandType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getGroup( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getGroup( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getGroupColumns( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHavingClause( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHavingClause( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredHavingClause( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getOrderColumns( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getQueryWithSubstitution( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQueryWithSubstitution( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index e6b180c33c94..4e6b6b042e70 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -80,10 +80,10 @@ namespace dbaccess ::connectivity::sdbcx::OCollection* m_pTables; // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); virtual void refreshColumns(); @@ -142,15 +142,15 @@ namespace dbaccess // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XRename, - virtual void SAL_CALL rename( const ::rtl::OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XAlterTable, - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) 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 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); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx index c4a45a04b423..69d4f45975ce 100644 --- a/dbaccess/source/core/inc/View.hxx +++ b/dbaccess/source/core/inc/View.hxx @@ -43,9 +43,9 @@ namespace dbaccess View( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, sal_Bool _bCaseSensitive, - const ::rtl::OUString& _rCatalogName, - const ::rtl::OUString& _rSchemaName, - const ::rtl::OUString& _rName + const OUString& _rCatalogName, + const OUString& _rSchemaName, + const OUString& _rName ); // UNO @@ -53,7 +53,7 @@ namespace dbaccess DECLARE_XTYPEPROVIDER() // XAlterView - virtual void SAL_CALL alterCommand( const ::rtl::OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~View(); diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx index c01a58fa4f45..1e4ef26b63df 100644 --- a/dbaccess/source/core/inc/callablestatement.hxx +++ b/dbaccess/source/core/inc/callablestatement.hxx @@ -47,16 +47,16 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XOutParameters - virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index 1619c0429672..fb048127269f 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -74,7 +74,7 @@ namespace dbaccess protected: // <properties> - ::rtl::OUString m_sName; + OUString m_sName; // </properties> protected: @@ -99,21 +99,21 @@ namespace dbaccess virtual void SAL_CALL disposing(void); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& _rName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& _rName ) throw(::com::sun::star::uno::RuntimeException); virtual void fireValueChange( const ::connectivity::ORowSetValue& _rOldValue ); protected: // IPropertyContainer - virtual void registerProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType ); - virtual void registerMayBeVoidProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType ); - virtual void registerPropertyNoMember( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue ); + virtual void registerProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType ); + virtual void registerMayBeVoidProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType ); + virtual void registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue ); }; //============================================================ @@ -125,7 +125,7 @@ namespace dbaccess /** creates a OColumn object which should represent the column with a given name */ virtual OColumn* - createColumn( const ::rtl::OUString& _rName ) const = 0; + createColumn( const OUString& _rName ) const = 0; /** creates a column descriptor object. @@ -140,7 +140,7 @@ namespace dbaccess /** notifies that a column with a given name has been dropped */ - virtual void columnDropped( const ::rtl::OUString& _sName ) = 0; + virtual void columnDropped( const OUString& _sName ) = 0; protected: ~IColumnFactory() {} @@ -151,7 +151,7 @@ namespace dbaccess //= general columns map, could be used for readonly access //= no appending and dropping is supported //============================================================ - typedef ::boost::unordered_map<rtl::OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap; + typedef ::boost::unordered_map<OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap; typedef ::std::vector<OColumn*> OColumnArray; class OContainerMediator; @@ -175,13 +175,13 @@ namespace dbaccess sal_Bool m_bDropColumn : 1; virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::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 connectivity::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: - connectivity::sdbcx::ObjectType createBaseObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType createBaseObject(const OUString& _rName) { return OColumns_BASE::createObject(_rName); } @@ -203,7 +203,7 @@ namespace dbaccess ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, sal_Bool _bCaseSensitive, - const ::std::vector< ::rtl::OUString>& _rVector, + const ::std::vector< OUString>& _rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn = sal_False, @@ -215,7 +215,7 @@ namespace dbaccess ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns, sal_Bool _bCaseSensitive, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn = sal_False, @@ -231,15 +231,15 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - void append(const ::rtl::OUString& rName, OColumn*); + void append(const OUString& rName, OColumn*); void clearColumns(); // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx index fada42c84a34..7f37e12b4e11 100644 --- a/dbaccess/source/core/inc/columnsettings.hxx +++ b/dbaccess/source/core/inc/columnsettings.hxx @@ -30,7 +30,7 @@ namespace dbaccess { public: virtual void registerProperty( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, @@ -38,7 +38,7 @@ namespace dbaccess ) = 0; virtual void registerMayBeVoidProperty( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, @@ -46,7 +46,7 @@ namespace dbaccess ) = 0; virtual void registerPropertyNoMember( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 165148e49485..a1c2a9240a9c 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -36,11 +36,11 @@ public: // need public access // <properties> ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; - ::rtl::OUString m_sCommand; + OUString m_sCommand; sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer - ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sUpdateSchemaName; - ::rtl::OUString m_sUpdateCatalogName; + OUString m_sUpdateTableName; + OUString m_sUpdateSchemaName; + OUString m_sUpdateCatalogName; // </properties> protected: diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index 5549a7049152..1cd475b4833b 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -31,7 +31,7 @@ namespace dbaccess //==================================================================== //= TokenComposer //==================================================================== - struct TokenComposer : public ::std::unary_function< ::rtl::OUString, void > + struct TokenComposer : public ::std::unary_function< OUString, void > { private: #ifdef DBG_UTIL @@ -39,10 +39,10 @@ namespace dbaccess #endif protected: - ::rtl::OUStringBuffer m_aBuffer; + OUStringBuffer m_aBuffer; public: - ::rtl::OUString getComposedAndClear() + OUString getComposedAndClear() { #ifdef DBG_UTIL m_bUsed = true; @@ -70,12 +70,12 @@ namespace dbaccess { } - void operator() (const ::rtl::OUString& lhs) + void operator() (const OUString& lhs) { append(lhs); } - void append( const ::rtl::OUString& lhs ) + void append( const OUString& lhs ) { #ifdef DBG_UTIL OSL_ENSURE( !m_bUsed, "FilterCreator::append: already used up!" ); @@ -90,7 +90,7 @@ namespace dbaccess } /// append the given part. Only to be called when both the part and our buffer so far are not empty - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) = 0; + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) = 0; }; //==================================================================== @@ -98,7 +98,7 @@ namespace dbaccess //==================================================================== struct FilterCreator : public TokenComposer { - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) { m_aBuffer.insert( 0, (sal_Unicode)' ' ); m_aBuffer.insert( 0, (sal_Unicode)'(' ); @@ -113,7 +113,7 @@ namespace dbaccess //==================================================================== struct OrderCreator : public TokenComposer { - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) { m_aBuffer.appendAscii( ", " ); m_aBuffer.append( lhs ); diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx index d3a00c956c8e..0be528513450 100644 --- a/dbaccess/source/core/inc/containerapprove.hxx +++ b/dbaccess/source/core/inc/containerapprove.hxx @@ -53,7 +53,7 @@ namespace dbaccess into the container */ virtual void SAL_CALL approveElement( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; }; diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index 1061d79316c4..bf161ebf560d 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -40,10 +40,10 @@ class ODataSettings_Base { public: // <properties> - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; - ::rtl::OUString m_sOrder; + OUString m_sFilter; + OUString m_sHavingClause; + OUString m_sGroupBy; + OUString m_sOrder; sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! ::com::sun::star::awt::FontDescriptor m_aFont; ::com::sun::star::uno::Any m_aRowHeight; diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index 44d198cd431c..fef0d2c79f67 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -52,10 +52,10 @@ namespace dbaccess protected: // <properties> - rtl::OUString m_aTypeName; - rtl::OUString m_aDescription; - rtl::OUString m_aDefaultValue; - rtl::OUString m_aAutoIncrementValue; + OUString m_aTypeName; + OUString m_aDescription; + OUString m_aDefaultValue; + OUString m_aAutoIncrementValue; sal_Int32 m_nType; sal_Int32 m_nPrecision; sal_Int32 m_nScale; @@ -86,8 +86,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); @@ -118,13 +118,13 @@ namespace dbaccess virtual ~OTableColumn(); public: - OTableColumn(const ::rtl::OUString& _rName); + OTableColumn(const OUString& _rName); // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -142,11 +142,11 @@ namespace dbaccess ,public OQueryColumn_PBase { // <properties> - ::rtl::OUString m_sCatalogName; - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sTableName; - ::rtl::OUString m_sRealName; - ::rtl::OUString m_sLabel; + OUString m_sCatalogName; + OUString m_sSchemaName; + OUString m_sTableName; + OUString m_sRealName; + OUString m_sLabel; // </properties> ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xOriginalTableColumn; @@ -158,14 +158,14 @@ namespace dbaccess OQueryColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxParserColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString &i_sLabel + const OUString &i_sLabel ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // *Property* virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -221,7 +221,7 @@ namespace dbaccess virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); protected: - ::rtl::OUString impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const; + OUString impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const; protected: using OColumn::getFastPropertyValue; @@ -248,8 +248,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // OIdPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; @@ -298,8 +298,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // OIdPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index e1ab72f9d960..6a6b3bbb416d 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -46,7 +46,7 @@ namespace dbaccess class ODefinitionContainer_Impl : public OContentHelper_Impl { public: - typedef ::std::map< ::rtl::OUString, TContentPtr > NamedDefinitions; + typedef ::std::map< OUString, TContentPtr > NamedDefinitions; typedef NamedDefinitions::iterator iterator; typedef NamedDefinitions::const_iterator const_iterator; @@ -59,13 +59,13 @@ public: inline const_iterator begin() const { return m_aDefinitions.begin(); } inline const_iterator end() const { return m_aDefinitions.end(); } - inline const_iterator find( const ::rtl::OUString& _rName ) const { return m_aDefinitions.find( _rName ); } + inline const_iterator find( const OUString& _rName ) const { return m_aDefinitions.find( _rName ); } const_iterator find( TContentPtr _pDefinition ) const; - inline void erase( const ::rtl::OUString& _rName ) { m_aDefinitions.erase( _rName ); } + inline void erase( const OUString& _rName ) { m_aDefinitions.erase( _rName ); } void erase( TContentPtr _pDefinition ); - inline void insert( const ::rtl::OUString& _rName, TContentPtr _pDefinition ) + inline void insert( const OUString& _rName, TContentPtr _pDefinition ) { m_aDefinitions.insert( NamedDefinitions::value_type( _rName, _pDefinition ) ); } @@ -165,8 +165,8 @@ public: DECLARE_TYPEPROVIDER( ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); @@ -180,16 +180,16 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::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); // ::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); @@ -216,7 +216,7 @@ protected: @return the newly created object or an empty reference if somthing went wrong */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( - const ::rtl::OUString& _rName) = 0; + const OUString& _rName) = 0; /** get the object specified by the given name. If desired, the object will be read if not already done so.<BR> @param _rName the object name @@ -227,14 +227,14 @@ protected: @see createObject */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > - implGetByName(const ::rtl::OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); + implGetByName(const OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. @param _rName the object name to check @return sal_True if there already exists such an object */ - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const OUString& _rName); /** append a new object to the container. No plausibility checks are done, e.g. if the object is non-NULL or if the name is already used by another object or anything like this. This method is for derived classes @@ -248,7 +248,7 @@ protected: @see implRemove */ void implAppend( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -260,7 +260,7 @@ protected: @see implReplace @see implAppend */ - void implRemove(const ::rtl::OUString& _rName); + void implRemove(const OUString& _rName); /** remove a object in the container. No plausibility checks are done, e.g. whether or not there exists an object with the given name or the object is non-NULL. This is the responsibility of the caller.<BR> @@ -274,7 +274,7 @@ protected: @see implRemove */ void implReplace( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -282,7 +282,7 @@ protected: */ void notifyByName( ::osl::ResettableMutexGuard& _rGuard, - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewElement, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& xOldElement, ContainerOperation _eOperation, @@ -310,7 +310,7 @@ private: if another error occures which prevents insertion of the object into the container */ void approveNewObject( - const ::rtl::OUString& _sName, + const OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxObject ) const; diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index 68eff1be4637..8a2a077f1867 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -68,7 +68,7 @@ namespace dbaccess virtual ~ObjectNameApproval(); // IContainerApprove - virtual void SAL_CALL approveElement( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); + virtual void SAL_CALL approveElement( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); }; diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index 300153ce717e..06d8ac0f0a38 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -58,9 +58,9 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(void); @@ -79,7 +79,7 @@ namespace dbaccess // ::com::sun::star::sdbc::XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -87,7 +87,7 @@ namespace dbaccess virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 0cc4eea8ac75..2ba79a9ee57b 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -47,10 +47,10 @@ namespace dbaccess public OSubComponent, public OQueryComposer_BASE { - ::std::vector< ::rtl::OUString> m_aFilters; - ::std::vector< ::rtl::OUString> m_aOrders; - ::rtl::OUString m_sOrgFilter; - ::rtl::OUString m_sOrgOrder; + ::std::vector< OUString> m_aFilters; + ::std::vector< OUString> m_aOrders; + OUString m_sOrgFilter; + OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposer; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposerHelper; @@ -72,20 +72,20 @@ namespace dbaccess virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XSQLQueryComposer - virtual ::rtl::OUString SAL_CALL getQuery( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setQuery( const ::rtl::OUString& command ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getComposedQuery( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQuery( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setQuery( const OUString& command ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getComposedQuery( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendFilterByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendOrderByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool ascending ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter( const ::rtl::OUString& filter ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& order ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter( const OUString& filter ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& order ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XTablesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException); // XColumnsSupplier diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index dbd1a735287a..ff89cb4c3688 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -91,8 +91,8 @@ namespace dbaccess }; // ODefinitionContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName); - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const OUString& _rName); + virtual sal_Bool checkExistence(const OUString& _rName); // helper virtual void SAL_CALL disposing(); @@ -140,7 +140,7 @@ namespace dbaccess 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); // ::com::sun::star::sdbcx::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); // ::com::sun::star::container::XElementAccess @@ -148,11 +148,11 @@ namespace dbaccess // ::com::sun::star::container::XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); protected: // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: // helper @@ -160,7 +160,7 @@ namespace dbaccess container will be asked for the given name.<BR> The returned object is acquired once. */ - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::rtl::OUString& _rName); + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const OUString& _rName); /// create a query object wrapping a CommandDefinition. The returned object is acquired once. ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxCommandDesc); diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index 94b258976a78..2bbd99d823bc 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -38,7 +38,7 @@ namespace dbaccess /** retrieves a to-be-displayed string for a given caught exception; */ - ::rtl::OUString extractExceptionMessage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, const ::com::sun::star::uno::Any& _rError ); + OUString extractExceptionMessage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, const ::com::sun::star::uno::Any& _rError ); namespace tools { diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index 8f5d489bab05..936ab36de93c 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -152,21 +152,21 @@ public: DECLARE_XTYPEPROVIDER() // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); // XBatchExecution - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -176,7 +176,7 @@ private: /** does escape processing for the given SQL command, if the our EscapeProcessing property allows so. */ - ::rtl::OUString impl_doEscapeProcessing_nothrow( const ::rtl::OUString& _rSQL ) const; + OUString impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) const; bool impl_ensureComposer_nothrow() const; }; diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 51d1d19b7f4c..ff3e179d0114 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -70,10 +70,10 @@ namespace dbaccess virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); /** creates the column collection for the table @param _rNames @@ -107,11 +107,11 @@ namespace dbaccess */ ODBTable(connectivity::sdbcx::OCollection* _pTables ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn - ,const ::rtl::OUString& _rCatalog - , const ::rtl::OUString& _rSchema - , const ::rtl::OUString& _rName - ,const ::rtl::OUString& _rType - , const ::rtl::OUString& _rDesc + ,const OUString& _rCatalog + , const OUString& _rSchema + , const OUString& _rName + ,const OUString& _rType + , const OUString& _rDesc ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions) throw(::com::sun::star::sdbc::SQLException); @@ -137,10 +137,10 @@ namespace dbaccess virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; // ::com::sun::star::sdbcx::XRename, - virtual void SAL_CALL rename( const ::rtl::OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XAlterTable, - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 30152ddea9ae..f11dda2612ff 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -57,13 +57,13 @@ namespace dbaccess // OFilteredContainer virtual void addMasterContainerListener(); virtual void removeMasterContainerListener(); - virtual ::rtl::OUString getTableTypeRestriction() const; + virtual OUString getTableTypeRestriction() const; // ::connectivity::sdbcx::OCollection - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::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 connectivity::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 void SAL_CALL disposing(); diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx index 78c7bd137618..0f2a7a9bc5c0 100644 --- a/dbaccess/source/core/inc/veto.hxx +++ b/dbaccess/source/core/inc/veto.hxx @@ -37,13 +37,13 @@ namespace dbaccess class Veto : public Veto_Base { private: - const ::rtl::OUString m_sReason; + const OUString m_sReason; const ::com::sun::star::uno::Any m_aDetails; public: - Veto( const ::rtl::OUString& _rReason, const ::com::sun::star::uno::Any& _rDetails ); + Veto( const OUString& _rReason, const ::com::sun::star::uno::Any& _rDetails ); - virtual ::rtl::OUString SAL_CALL getReason() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getReason() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getDetails() throw (::com::sun::star::uno::RuntimeException); protected: diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index 4d53b542faa6..f91991416c09 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -74,7 +74,7 @@ namespace dbaccess protected: // OFilteredContainer overridables - virtual ::rtl::OUString getTableTypeRestriction() const; + virtual OUString getTableTypeRestriction() const; private: inline virtual void SAL_CALL acquire() throw(){ OFilteredContainer::acquire();} @@ -90,10 +90,10 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // ::connectivity::sdbcx::OCollection - virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual ::connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::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 connectivity::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); using OFilteredContainer::disposing; diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index de4dfa5bc710..d707a618b157 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -110,7 +110,7 @@ void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ::osl::MutexGuard aGuard(m_aMutex); if ( _rEvent.Source == m_xSettings && m_xSettings.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName); if ( aFind != m_aForwardList.end() ) @@ -127,7 +127,7 @@ void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent Reference< XContainer > xContainer = m_xContainer; if ( _rEvent.Source == xContainer && xContainer.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; m_aForwardList.erase(sElementName); try @@ -148,13 +148,13 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent Reference< XContainer > xContainer = m_xContainer; if ( _rEvent.Source == xContainer && xContainer.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.ReplacedElement >>= sElementName; PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName); if ( aFind != m_aForwardList.end() ) { - ::rtl::OUString sNewName; + OUString sNewName; _rEvent.Accessor >>= sNewName; try { @@ -184,7 +184,7 @@ void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) thr } // ----------------------------------------------------------------------------- -void OContainerMediator::impl_initSettings_nothrow( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDestination ) +void OContainerMediator::impl_initSettings_nothrow( const OUString& _rName, const Reference< XPropertySet >& _rxDestination ) { try { @@ -201,7 +201,7 @@ void OContainerMediator::impl_initSettings_nothrow( const ::rtl::OUString& _rNam } // ----------------------------------------------------------------------------- -void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, const Reference< XPropertySet >& _xDest ) +void OContainerMediator::notifyElementCreated( const OUString& _sName, const Reference< XPropertySet >& _xDest ) { if ( !m_xSettings.is() ) return; @@ -215,7 +215,7 @@ void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, co return; } - ::std::vector< ::rtl::OUString > aPropertyList; + ::std::vector< OUString > aPropertyList; try { // initially copy from the settings object (if existent) to the newly created object diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index e84a79df6469..5931c30b2bd6 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -57,7 +57,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex TDatabaseDataProvider(m_aMutex), ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >( context, static_cast< Implements >( - IMPLEMENTS_PROPERTY_SET), uno::Sequence< ::rtl::OUString >()), + IMPLEMENTS_PROPERTY_SET), uno::Sequence< OUString >()), m_aParameterManager( m_aMutex, context ), m_aFilterManager( uno::Reference< lang::XMultiServiceFactory >(context->getServiceManager(),uno::UNO_QUERY) ), m_xContext(context), @@ -112,13 +112,13 @@ OUString DatabaseDataProvider::getImplementationName_Static( ) throw(uno::Runti } // XServiceInfo -::rtl::OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- -sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } @@ -131,7 +131,7 @@ uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static( return aSNS; } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } @@ -200,8 +200,8 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat { uno::Reference< chart::XChartDataArray> xChartData( m_xInternal, uno::UNO_QUERY_THROW ); xChartData->setData( uno::Sequence< uno::Sequence< double > >() ); - xChartData->setColumnDescriptions( uno::Sequence< ::rtl::OUString >() ); - if ( m_xInternal->hasDataByRangeRepresentation( ::rtl::OUString::valueOf( sal_Int32(0) ) ) ) + xChartData->setColumnDescriptions( uno::Sequence< OUString >() ); + if ( m_xInternal->hasDataByRangeRepresentation( OUString::valueOf( sal_Int32(0) ) ) ) m_xInternal->deleteSequence(0); } catch( const uno::Exception& ) @@ -211,8 +211,8 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat ::comphelper::NamedValueCollection aArgs( _aArguments ); const sal_Bool bHasCategories = aArgs.getOrDefault( "HasCategories", sal_True ); - uno::Sequence< ::rtl::OUString > aColumnNames = - aArgs.getOrDefault( "ColumnDescriptions", uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aColumnNames = + aArgs.getOrDefault( "ColumnDescriptions", uno::Sequence< OUString >() ); bool bRet = false; if ( !m_Command.isEmpty() && m_xActiveConnection.is() ) @@ -280,20 +280,20 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum } // ----------------------------------------------------------------------------- -::sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const ::rtl::OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException) +::sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException) { return sal_True; } // ----------------------------------------------------------------------------- -uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const +uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const { - ::std::map< ::rtl::OUString,com::sun::star::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation); + ::std::map< OUString,com::sun::star::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation); if ( aFind != m_aNumberFormats.end() ) return aFind->second; return uno::makeAny(sal_Int32(0)); } // ----------------------------------------------------------------------------- -uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const ::rtl::OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) +uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); uno::Reference< chart2::data::XDataSequence > xData = m_xInternal->createDataSequenceByRangeRepresentation(_sRangeRepresentation); @@ -306,19 +306,19 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::cre return xData; } -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getComplexRowDescriptions(); } -void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setComplexRowDescriptions(aRowDescriptions); } -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getComplexColumnDescriptions(); } -void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setComplexColumnDescriptions(aColumnDescriptions); } @@ -333,22 +333,22 @@ void SAL_CALL DatabaseDataProvider::setData( const uno::Sequence< uno::Sequence< m_xComplexDescriptionAccess->setData(rDataInRows); } -void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< rtl::OUString >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< OUString >& aRowDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setRowDescriptions(aRowDescriptions); } -void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< rtl::OUString >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< OUString >& aColumnDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setColumnDescriptions(aColumnDescriptions); } -uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getRowDescriptions(); } -uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getColumnDescriptions(); } @@ -387,14 +387,14 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRange } // ----------------------------------------------------------------------------- // chart2::data::XRangeXMLConversion: -::rtl::OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const ::rtl::OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) +OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); return m_xRangeConversion->convertRangeToXML(_sRangeRepresentation); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const ::rtl::OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException) +OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); return m_xRangeConversion->convertRangeFromXML(_sXMLRange); @@ -408,72 +408,72 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getProp } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setPropertyValue(const ::rtl::OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::setPropertyValue(const OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::setPropertyValue(aPropertyName, aValue); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const ::rtl::OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertyValue(aPropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addPropertyChangeListener(aPropertyName, xListener); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removePropertyChangeListener(aPropertyName, xListener); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addVetoableChangeListener(aPropertyName, xListener); } -void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removeVetoableChangeListener(aPropertyName, xListener); } // chart2::data::XDatabaseDataProvider: -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_MasterFields; } -void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< ::rtl::OUString > & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException) { impl_invalidateParameter_nothrow(); set(OUString("MasterFields"),the_value,m_MasterFields); } -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_DetailFields; } -void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< ::rtl::OUString > & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException) { set("DetailFields",the_value,m_DetailFields); } -::rtl::OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_Command; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setCommand(const ::rtl::OUString & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -501,14 +501,14 @@ void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_aFilterManager.getFilterComponent( dbtools::FilterManager::fcPublicFilter ); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setFilter(const ::rtl::OUString & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -532,13 +532,13 @@ void SAL_CALL DatabaseDataProvider::setApplyFilter( ::sal_Bool the_value ) throw set(PROPERTY_APPLYFILTER,the_value,m_ApplyFilter); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_HavingClause; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setHavingClause( const ::rtl::OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -547,13 +547,13 @@ void SAL_CALL DatabaseDataProvider::setHavingClause( const ::rtl::OUString& the_ set(PROPERTY_HAVING_CLAUSE,the_value,m_HavingClause); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_GroupBy; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setGroupBy( const ::rtl::OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -562,13 +562,13 @@ void SAL_CALL DatabaseDataProvider::setGroupBy( const ::rtl::OUString& the_value set(PROPERTY_GROUP_BY,the_value,m_GroupBy); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_Order; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setOrder( const ::rtl::OUString& the_value ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -612,13 +612,13 @@ void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sd set(PROPERTY_ACTIVE_CONNECTION,the_value,m_xActiveConnection); } -::rtl::OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_DataSourceName; } -void SAL_CALL DatabaseDataProvider::setDataSourceName(const ::rtl::OUString& the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setDataSourceName(const OUString& the_value) throw (uno::RuntimeException) { set(PROPERTY_DATASOURCENAME,the_value,m_DataSourceName); } @@ -633,7 +633,7 @@ namespace { struct ColumnDescription { - ::rtl::OUString sName; + OUString sName; sal_Int32 nResultSetPosition; sal_Int32 nDataType; @@ -643,7 +643,7 @@ namespace ,nDataType( sdbc::DataType::VARCHAR ) { } - explicit ColumnDescription( const ::rtl::OUString& i_rName ) + explicit ColumnDescription( const OUString& i_rName ) :sName( i_rName ) ,nResultSetPosition( 0 ) ,nDataType( sdbc::DataType::VARCHAR ) @@ -651,29 +651,29 @@ namespace } }; - struct CreateColumnDescription : public ::std::unary_function< ::rtl::OUString, ColumnDescription > + struct CreateColumnDescription : public ::std::unary_function< OUString, ColumnDescription > { - ColumnDescription operator()( const ::rtl::OUString& i_rName ) + ColumnDescription operator()( const OUString& i_rName ) { return ColumnDescription( i_rName ); } }; - struct SelectColumnName : public ::std::unary_function< ColumnDescription, ::rtl::OUString > + struct SelectColumnName : public ::std::unary_function< ColumnDescription, OUString > { - const ::rtl::OUString& operator()( const ColumnDescription& i_rColumn ) + const OUString& operator()( const ColumnDescription& i_rColumn ) { return i_rColumn.sName; } }; } -void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const uno::Sequence< ::rtl::OUString >& i_aColumnNames) +void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const uno::Sequence< OUString >& i_aColumnNames) { // clear the data before fill the new one uno::Reference< sdbcx::XColumnsSupplier > xColSup(m_xRowSet,uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xColumns( xColSup->getColumns(), uno::UNO_SET_THROW ); - const uno::Sequence< ::rtl::OUString > aRowSetColumnNames( xColumns->getElementNames() ); + const uno::Sequence< OUString > aRowSetColumnNames( xColumns->getElementNames() ); typedef ::std::vector< ColumnDescription > ColumnDescriptions; ColumnDescriptions aColumns; @@ -681,7 +681,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat if ( i_aColumnNames.getLength() ) { // some normalizations ... - uno::Sequence< ::rtl::OUString > aImposedColumnNames( i_aColumnNames ); + uno::Sequence< OUString > aImposedColumnNames( i_aColumnNames ); // strangely, there exist documents where the ColumnDescriptions end with a number of empty strings. /me // thinks they're generated when you have a chart based on a result set with n columns, but remove some @@ -709,7 +709,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat const sal_Int32 nCount = aImposedColumnNames.getLength(); for ( sal_Int32 i = 0 ; i < nCount; ++i ) { - const ::rtl::OUString sColumnName( aImposedColumnNames[i] ); + const OUString sColumnName( aImposedColumnNames[i] ); if ( !xColumns->hasByName( sColumnName ) ) continue; @@ -754,11 +754,11 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_TYPE ) >>= col->nDataType ); const sal_Int32 columnIndex = col - aColumns.begin(); - const ::rtl::OUString sRangeName = ::rtl::OUString::valueOf( columnIndex ); - m_aNumberFormats.insert( ::std::map< ::rtl::OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) ); + const OUString sRangeName = OUString::valueOf( columnIndex ); + m_aNumberFormats.insert( ::std::map< OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) ); } - ::std::vector< ::rtl::OUString > aRowLabels; + ::std::vector< OUString > aRowLabels; ::std::vector< ::std::vector< double > > aDataValues; sal_Int32 nRowCount = 0; ::connectivity::ORowSetValue aValue; @@ -803,7 +803,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat 4.30, 9.02, 6.20 }; for(sal_Int32 h = 0,k = 0; h < nRowCount; ++h,++k ) { - aRowLabels.push_back(::rtl::OUString::valueOf(h+1)); + aRowLabels.push_back(OUString::valueOf(h+1)); ::std::vector< double > aRow; const sal_Int32 nSize = sizeof(fDefaultData)/sizeof(fDefaultData[0]); for (size_t j = 0; j < (aColumns.size()-1); ++j,++k) @@ -817,10 +817,10 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat } uno::Reference< chart::XChartDataArray> xData(m_xInternal,uno::UNO_QUERY); - xData->setRowDescriptions(uno::Sequence< ::rtl::OUString >(&(*aRowLabels.begin()),aRowLabels.size())); + xData->setRowDescriptions(uno::Sequence< OUString >(&(*aRowLabels.begin()),aRowLabels.size())); const size_t nOffset = bFirstColumnIsCategory ? 1 : 0; - uno::Sequence< ::rtl::OUString > aColumnDescriptions( aColumns.size() - nOffset ); + uno::Sequence< OUString > aColumnDescriptions( aColumns.size() - nOffset ); ::std::transform( aColumns.begin() + nOffset, aColumns.end(), @@ -866,7 +866,7 @@ void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 } //------------------------------------------------------------------------------ -void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw( SQLException, RuntimeException ) +void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException ) { m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName); } @@ -914,7 +914,7 @@ void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x } //------------------------------------------------------------------------------ -void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw( SQLException, RuntimeException ) +void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException ) { m_aParameterManager.setString(parameterIndex, x); } diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 2894a7fe73e8..09a3882f6bec 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -45,7 +45,7 @@ namespace dbaccess //------------------------------------------------------------------------ OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer, - const ::rtl::OUString& _sName, const ::std::vector< ::rtl::OUString>& _aPropertyList ) + const OUString& _sName, const ::std::vector< OUString>& _aPropertyList ) :m_xSource( _xSource, UNO_SET_THROW ) ,m_xDestContainer( _xDestContainer, UNO_SET_THROW ) ,m_sName( _sName ) @@ -57,11 +57,11 @@ namespace dbaccess try { if ( _aPropertyList.empty() ) - _xSource->addPropertyChangeListener( ::rtl::OUString(), this ); + _xSource->addPropertyChangeListener( OUString(), this ); else { - ::std::vector< ::rtl::OUString >::const_iterator aIter = _aPropertyList.begin(); - ::std::vector< ::rtl::OUString >::const_iterator aEnd = _aPropertyList.end(); + ::std::vector< OUString >::const_iterator aIter = _aPropertyList.begin(); + ::std::vector< OUString >::const_iterator aEnd = _aPropertyList.end(); for (; aIter != aEnd ; ++aIter ) _xSource->addPropertyChangeListener( *aIter, this ); } @@ -85,7 +85,7 @@ namespace dbaccess ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xDestContainer.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); try { @@ -128,9 +128,9 @@ namespace dbaccess ::osl::MutexGuard aGuard(m_aMutex); if ( !m_xSource.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); - m_xSource->removePropertyChangeListener( ::rtl::OUString(), this ); + m_xSource->removePropertyChangeListener( OUString(), this ); m_xSource = NULL; m_xDestContainer = NULL; m_xDestInfo = NULL; diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx index 6d1e59603864..0a9c241dfc62 100644 --- a/dbaccess/source/core/misc/objectnameapproval.cxx +++ b/dbaccess/source/core/misc/objectnameapproval.cxx @@ -71,7 +71,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL ObjectNameApproval::approveElement( const ::rtl::OUString& _rName, const Reference< XInterface >& /*_rxElement*/ ) + void SAL_CALL ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ ) { Reference< XConnection > xConnection( m_pImpl->aConnection ); if ( !xConnection.is() ) diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index 490f1bb5957d..1e3891fac5cd 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -80,9 +80,9 @@ namespace dbaccess } // ----------------------------------------------------------------------------- - ::rtl::OUString extractExceptionMessage( const Reference<XComponentContext> & _rContext, const Any& _rError ) + OUString extractExceptionMessage( const Reference<XComponentContext> & _rContext, const Any& _rError ) { - ::rtl::OUString sDisplayMessage; + OUString sDisplayMessage; try { @@ -91,7 +91,7 @@ namespace dbaccess ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rError ) ); ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove ); pRequest->addContinuation( pApprove.get() ); - Optional< ::rtl::OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() ); + Optional< OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() ); if ( aMessage.IsPresent ) sDisplayMessage = aMessage.Value; } @@ -105,7 +105,7 @@ namespace dbaccess Exception aExcept; _rError >>= aExcept; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( _rError.getValueTypeName() ); aBuffer.appendAscii( ":\n" ); aBuffer.append( aExcept.Message ); diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 5b42475750f1..ba98e212aedb 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -95,7 +95,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dba::DbaModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString::createFromAscii( pImplementationName ) ); } if (xRet.is()) diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx index a08e4116c0cf..732f924a2b7a 100644 --- a/dbaccess/source/core/misc/veto.cxx +++ b/dbaccess/source/core/misc/veto.cxx @@ -31,7 +31,7 @@ namespace dbaccess //= Veto //==================================================================== //-------------------------------------------------------------------- - Veto::Veto( const ::rtl::OUString& _rReason, const Any& _rDetails ) + Veto::Veto( const OUString& _rReason, const Any& _rDetails ) :m_sReason( _rReason ) ,m_aDetails( _rDetails ) { @@ -43,7 +43,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL Veto::getReason() throw (RuntimeException) + OUString SAL_CALL Veto::getReason() throw (RuntimeException) { return m_sReason; } diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 409784feccdf..d5b605f3ff5e 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -82,7 +82,7 @@ namespace dbaccess namespace { // ......................................................................... - static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, ::rtl::OUStringBuffer& o_rBuffer ) + static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer ) { o_rBuffer.append( i_rComponentDesc.first ); o_rBuffer.append( sal_Unicode( '=' ) ); @@ -92,7 +92,7 @@ namespace dbaccess } // ......................................................................... - static bool lcl_extractCompDesc( const ::rtl::OUString& i_rIniLine, ::rtl::OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc ) + static bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc ) { const sal_Int32 nEqualSignPos = i_rIniLine.indexOf( sal_Unicode( '=' ) ); if ( nEqualSignPos < 1 ) @@ -147,7 +147,7 @@ namespace dbaccess ++stor ) { - ::rtl::OUStringBuffer aLine; + OUStringBuffer aLine; lcl_getPersistentRepresentation( *stor, aLine ); aTextOutput.writeLine( aLine.makeStringAndClear() ); @@ -157,7 +157,7 @@ namespace dbaccess } // ......................................................................... - static bool lcl_isSectionStart( const ::rtl::OUString& i_rIniLine, ::rtl::OUString& o_rSectionName ) + static bool lcl_isSectionStart( const OUString& i_rIniLine, OUString& o_rSectionName ) { const sal_Int32 nLen = i_rIniLine.getLength(); if ( ( nLen > 0 ) && ( i_rIniLine.getStr()[0] == '[' ) && ( i_rIniLine.getStr()[ nLen - 1 ] == ']' ) ) @@ -169,7 +169,7 @@ namespace dbaccess } // ......................................................................... - static void lcl_stripTrailingLineFeed( ::rtl::OUString& io_rLine ) + static void lcl_stripTrailingLineFeed( OUString& io_rLine ) { const sal_Int32 nLen = io_rLine.getLength(); if ( ( nLen > 0 ) && ( io_rLine.getStr()[ nLen - 1 ] == '\n' ) ) @@ -194,11 +194,11 @@ namespace dbaccess xTextInput->setEncoding( lcl_getMapStreamEncodingName() ); xTextInput->setInputStream( xIniStream->getInputStream() ); - ::rtl::OUString sCurrentSection; + OUString sCurrentSection; bool bCurrentSectionIsKnownToBeUnsupported = true; while ( !xTextInput->isEOF() ) { - ::rtl::OUString sLine = xTextInput->readLine(); + OUString sLine = xTextInput->readLine(); lcl_stripTrailingLineFeed( sLine ); if ( sLine.isEmpty() ) @@ -220,7 +220,7 @@ namespace dbaccess continue; } - ::rtl::OUString sStorageName; + OUString sStorageName; SubComponentDescriptor aCompDesc; if ( !lcl_extractCompDesc( sLine, sStorageName, aCompDesc ) ) continue; @@ -370,15 +370,15 @@ namespace dbaccess ++stor ) { - const ::rtl::OUString sComponentName( stor->second.sName ); + const OUString sComponentName( stor->second.sName ); if ( !xComponentsStor->hasByName( stor->first ) ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer message; + OStringBuffer message; message.append( "DatabaseDocumentRecovery::recoverSubDocuments: inconsistent recovery storage: storage '" ); - message.append( ::rtl::OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) ); + message.append( OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) ); message.append( "' not found in '" ); - message.append( ::rtl::OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) ); + message.append( OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) ); message.append( "', but required per map file!" ); OSL_FAIL( message.getStr() ); #endif diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 5fd94023f954..bd9c8b2d09c8 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -82,14 +82,14 @@ namespace dbaccess { } - void SettingsImport::characters( const ::rtl::OUString& i_rCharacters ) + void SettingsImport::characters( const OUString& i_rCharacters ) { m_aCharacters.append( i_rCharacters ); } - void SettingsImport::split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName ) + void SettingsImport::split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName ) { - o_rNamespace = ::rtl::OUString(); + o_rNamespace = OUString(); o_rLocalName = i_rElementName; const sal_Int32 nSeparatorPos = i_rElementName.indexOf( ':' ); if ( nSeparatorPos > -1 ) @@ -107,7 +107,7 @@ namespace dbaccess //= IgnoringSettingsImport //==================================================================== //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const OUString& i_rElementName ) { (void)i_rElementName; return this; @@ -128,19 +128,19 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const OUString& i_rElementName ) { // separate the namespace part from the element name - ::rtl::OUString sNamespace; - ::rtl::OUString sLocalName; + OUString sNamespace; + OUString sLocalName; split( i_rElementName, sNamespace, sLocalName ); if ( sLocalName == "config-item-set" ) return new ConfigItemSetImport( m_rSettings ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "unknown (or unsupported at this place) element name '" ); - sMessage += ::rtl::OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "unknown (or unsupported at this place) element name '" ); + sMessage += OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); #endif @@ -162,7 +162,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const OUString& i_rElementName ) { OSL_FAIL( "ConfigItemImport::nextState: unexpected: this class is responsible for child-less items only!" ); (void)i_rElementName; @@ -174,7 +174,7 @@ namespace dbaccess { SettingsImport::endElement(); - const ::rtl::OUString sItemName( getItemName() ); + const OUString sItemName( getItemName() ); ENSURE_OR_RETURN_VOID( !sItemName.isEmpty(), "no item name -> no item value" ); Any aValue; getItemValue( aValue ); @@ -187,10 +187,10 @@ namespace dbaccess o_rValue.clear(); // the characters building up th evalue - ::rtl::OUStringBuffer aCharacters( getAccumulatedCharacters() ); - const ::rtl::OUString sValue = aCharacters.makeStringAndClear(); + OUStringBuffer aCharacters( getAccumulatedCharacters() ); + const OUString sValue = aCharacters.makeStringAndClear(); - const ::rtl::OUString& rItemType( getItemType() ); + const OUString& rItemType( getItemType() ); ENSURE_OR_RETURN_VOID( !rItemType.isEmpty(), "no item type -> no item value" ); if ( ::xmloff::token::IsXMLToken( rItemType, ::xmloff::token::XML_INT ) ) @@ -224,8 +224,8 @@ namespace dbaccess #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sMessage( "ConfigItemImport::getItemValue: unsupported item type '" ); - sMessage += ::rtl::OUStringToOString( rItemType, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "ConfigItemImport::getItemValue: unsupported item type '" ); + sMessage += OUStringToOString( rItemType, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); } @@ -247,11 +247,11 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const OUString& i_rElementName ) { // separate the namespace part from the element name - ::rtl::OUString sNamespace; - ::rtl::OUString sLocalName; + OUString sNamespace; + OUString sLocalName; split( i_rElementName, sNamespace, sLocalName ); if ( sLocalName == "config-item-set" ) @@ -260,8 +260,8 @@ namespace dbaccess return new ConfigItemImport( m_aChildSettings ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "unknown element name '" ); - sMessage += ::rtl::OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "unknown element name '" ); + sMessage += OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); #endif diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx index e0daac2f929b..accad5c714b0 100644 --- a/dbaccess/source/core/recovery/settingsimport.hxx +++ b/dbaccess/source/core/recovery/settingsimport.hxx @@ -50,33 +50,33 @@ namespace dbaccess // own overriables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ) = 0; virtual void startElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& i_rAttributes ); virtual void endElement(); - virtual void characters( const ::rtl::OUString& i_rCharacters ); + virtual void characters( const OUString& i_rCharacters ); protected: virtual ~SettingsImport(); protected: - static void split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName ); + static void split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName ); protected: - const ::rtl::OUString& getItemName() const { return m_sItemName; } - const ::rtl::OUString& getItemType() const { return m_sItemType; } - const ::rtl::OUStringBuffer& getAccumulatedCharacters() const { return m_aCharacters; } + const OUString& getItemName() const { return m_sItemName; } + const OUString& getItemType() const { return m_sItemType; } + const OUStringBuffer& getAccumulatedCharacters() const { return m_aCharacters; } private: oslInterlockedCount m_refCount; // value of the config:name attribute, if any - ::rtl::OUString m_sItemName; + OUString m_sItemName; // value of the config:type attribute, if any - ::rtl::OUString m_sItemType; + OUString m_sItemType; // accumulated characters, if any - ::rtl::OUStringBuffer m_aCharacters; + OUStringBuffer m_aCharacters; }; //==================================================================== @@ -91,7 +91,7 @@ namespace dbaccess // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); private: @@ -110,7 +110,7 @@ namespace dbaccess // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); protected: @@ -135,7 +135,7 @@ namespace dbaccess public: // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); virtual void endElement(); @@ -163,7 +163,7 @@ namespace dbaccess public: // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); protected: diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx index fec9492b22e7..bac839e28f09 100644 --- a/dbaccess/source/core/recovery/storagestream.cxx +++ b/dbaccess/source/core/recovery/storagestream.cxx @@ -52,7 +52,7 @@ namespace dbaccess //-------------------------------------------------------------------- StorageOutputStream::StorageOutputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :m_rContext( i_rContext ) { @@ -85,7 +85,7 @@ namespace dbaccess //-------------------------------------------------------------------- StorageInputStream::StorageInputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :m_rContext( i_rContext ) { diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 9f9fb0f013b1..8f655959d43f 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -41,7 +41,7 @@ namespace dbaccess StorageOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); virtual ~StorageOutputStream(); @@ -73,7 +73,7 @@ namespace dbaccess StorageInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); virtual ~StorageInputStream(); diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx index fcce399dd92a..241e336f2652 100644 --- a/dbaccess/source/core/recovery/storagetextstream.cxx +++ b/dbaccess/source/core/recovery/storagetextstream.cxx @@ -67,9 +67,9 @@ namespace dbaccess } //-------------------------------------------------------------------------------------------------------------- - static const ::rtl::OUString& lcl_getLineFeed() + static const OUString& lcl_getLineFeed() { - static const ::rtl::OUString s_sLineFeed( sal_Unicode( '\n' ) ); + static const OUString s_sLineFeed( sal_Unicode( '\n' ) ); return s_sLineFeed; } } @@ -80,7 +80,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageTextOutputStream::StorageTextOutputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageTextOutputStream_Data ) @@ -96,7 +96,7 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageTextOutputStream::writeLine( const ::rtl::OUString& i_rLine ) + void StorageTextOutputStream::writeLine( const OUString& i_rLine ) { m_pData->xTextOutput->writeString( i_rLine ); m_pData->xTextOutput->writeString( lcl_getLineFeed() ); diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 37119d264afa..57c4599a05ba 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -39,11 +39,11 @@ namespace dbaccess StorageTextOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageTextOutputStream(); - void writeLine( const ::rtl::OUString& i_rLine ); + void writeLine( const OUString& i_rLine ); void writeLine(); private: diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index d17593bc7a58..39a828ea589e 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -67,7 +67,7 @@ namespace dbaccess struct StorageXMLOutputStream_Data { Reference< XDocumentHandler > xHandler; - ::std::stack< ::rtl::OUString > aElements; + ::std::stack< OUString > aElements; ::rtl::Reference< SvXMLAttributeList > xAttributes; }; @@ -77,7 +77,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageXMLOutputStream::StorageXMLOutputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName ) + const OUString& i_rStreamName ) :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLOutputStream_Data ) { @@ -105,13 +105,13 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const + void StorageXMLOutputStream::addAttribute( const OUString& i_rName, const OUString& i_rValue ) const { m_pData->xAttributes->AddAttribute( i_rName, i_rValue ); } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::startElement( const ::rtl::OUString& i_rElementName ) const + void StorageXMLOutputStream::startElement( const OUString& i_rElementName ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -126,13 +126,13 @@ namespace dbaccess ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); ENSURE_OR_RETURN_VOID( !m_pData->aElements.empty(), "no element on the stack" ); - const ::rtl::OUString sElementName( m_pData->aElements.top() ); + const OUString sElementName( m_pData->aElements.top() ); m_pData->xHandler->endElement( sElementName ); m_pData->aElements.pop(); } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const + void StorageXMLOutputStream::ignorableWhitespace( const OUString& i_rWhitespace ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -140,7 +140,7 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::characters( const ::rtl::OUString& i_rCharacters ) const + void StorageXMLOutputStream::characters( const OUString& i_rCharacters ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -161,7 +161,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageXMLInputStream::StorageXMLInputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName ) + const OUString& i_rStreamName ) :StorageInputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLInputStream_Data ) { diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index a850b225b4fd..8fdb7305e274 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -42,20 +42,20 @@ namespace dbaccess StorageXMLOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageXMLOutputStream(); // StorageOutputStream overridables virtual void close(); - void addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const; + void addAttribute( const OUString& i_rName, const OUString& i_rValue ) const; - void startElement( const ::rtl::OUString& i_rElementName ) const; + void startElement( const OUString& i_rElementName ) const; void endElement() const; - void ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const; - void characters( const ::rtl::OUString& i_rCharacters ) const; + void ignorableWhitespace( const OUString& i_rWhitespace ) const; + void characters( const OUString& i_rCharacters ) const; private: StorageXMLOutputStream(); // never implemented @@ -76,7 +76,7 @@ namespace dbaccess StorageXMLInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageXMLInputStream(); diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index e70acbbf6561..af11780ea5fc 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -87,7 +87,7 @@ namespace dbaccess namespace { // ......................................................................... - static const ::rtl::OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType ) + static const OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType ) { static const OUString s_sFormBaseName( "form" ); static const OUString s_sReportBaseName( "report" ); @@ -109,7 +109,7 @@ namespace dbaccess } OSL_FAIL( "lcl_getComponentStorageBaseName: unimplemented case!" ); - static const ::rtl::OUString s_sFallback; + static const OUString s_sFallback; return s_sFallback; } @@ -147,7 +147,7 @@ namespace dbaccess // ......................................................................... static Reference< XCommandProcessor > lcl_getSubComponentDef_nothrow( const Reference< XDatabaseDocumentUI >& i_rAppUI, - const SubComponentType i_eType, const ::rtl::OUString& i_rName ) + const SubComponentType i_eType, const OUString& i_rName ) { Reference< XController > xController( i_rAppUI, UNO_QUERY_THROW ); ENSURE_OR_RETURN( ( i_eType == FORM ) || ( i_eType == REPORT ), "lcl_getSubComponentDef_nothrow: illegal controller", NULL ); @@ -206,19 +206,19 @@ namespace dbaccess } public: - virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ); + virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ); virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ); virtual void StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace ); virtual void EndElement ( const sal_Bool i_bIgnoreWhitespace ); - virtual void Characters( const ::rtl::OUString& i_rCharacters ); + virtual void Characters( const OUString& i_rCharacters ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const; private: - ::rtl::OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken ) + OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken ) { - ::rtl::OUStringBuffer aQualifiedName( m_aNamespace ); + OUStringBuffer aQualifiedName( m_aNamespace ); aQualifiedName.append( sal_Unicode( ':' ) ); aQualifiedName.append( ::xmloff::token::GetXMLToken( i_eToken ) ); return aQualifiedName.makeStringAndClear(); @@ -227,11 +227,11 @@ namespace dbaccess private: const Reference<XComponentContext>& m_rContext; const StorageXMLOutputStream& m_rDelegator; - const ::rtl::OUStringBuffer m_aNamespace; + const OUStringBuffer m_aNamespace; }; //-------------------------------------------------------------------- - void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ) + void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ) { m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue ); } @@ -260,7 +260,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SettingsExportContext::Characters( const ::rtl::OUString& i_rCharacters ) + void SettingsExportContext::Characters( const OUString& i_rCharacters ) { m_rDelegator.characters( i_rCharacters ); } @@ -292,11 +292,11 @@ namespace dbaccess // XDocumentHandler virtual void SAL_CALL startDocument( ) throw (SAXException, RuntimeException); virtual void SAL_CALL endDocument( ) throw (SAXException, RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (SAXException, RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (SAXException, RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (SAXException, RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException); virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException); const ::comphelper::NamedValueCollection& getSettings() const { return m_aSettings; } @@ -317,7 +317,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::startElement( const ::rtl::OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) { ::rtl::Reference< SettingsImport > pNewState; @@ -349,7 +349,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::endElement( const ::rtl::OUString& i_Name ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); (void)i_Name; @@ -360,7 +360,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::characters( const ::rtl::OUString& i_Chars ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); @@ -369,14 +369,14 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException) { // ignore them - that's why they're called "ignorable" (void)aWhitespaces; } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::processingInstruction( const ::rtl::OUString& i_Target, const ::rtl::OUString& i_Data ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException) { OSL_FAIL( "SettingsDocumentHandler::processingInstruction: unexpected ..." ); (void)i_Target; @@ -393,7 +393,7 @@ namespace dbaccess //= SubComponentRecovery //==================================================================== //-------------------------------------------------------------------- - const ::rtl::OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType ) + const OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType ) { static const OUString s_sFormsStorageName( "forms" ); static const OUString s_sReportsStorageName( "reports" ); @@ -418,7 +418,7 @@ namespace dbaccess } OSL_FAIL( "SubComponentRecovery::getComponentsStorageName: unimplemented case!" ); - static const ::rtl::OUString s_sFallback; + static const OUString s_sFallback; return s_sFallback; } @@ -431,13 +431,13 @@ namespace dbaccess return; // open the sub storage for the given kind of components - const ::rtl::OUString& rStorageName( getComponentsStorageName( m_eType ) ); + const OUString& rStorageName( getComponentsStorageName( m_eType ) ); const Reference< XStorage > xComponentsStorage( i_rRecoveryStorage->openStorageElement( rStorageName, ElementModes::READWRITE ), UNO_QUERY_THROW ); // find a free sub storage name, and create Yet Another Sub Storage - const ::rtl::OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) ); - const ::rtl::OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName, true ); + const OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) ); + const OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName, true ); const Reference< XStorage > xObjectStor( xComponentsStorage->openStorageElement( sStorName, ElementModes::READWRITE ), UNO_QUERY_THROW ); @@ -473,13 +473,13 @@ namespace dbaccess void SubComponentRecovery::impl_identifyComponent_throw() { // ask the controller - Pair< sal_Int32, ::rtl::OUString > aComponentIdentity = m_xDocumentUI->identifySubComponent( m_xComponent ); + Pair< sal_Int32, OUString > aComponentIdentity = m_xDocumentUI->identifySubComponent( m_xComponent ); m_eType = lcl_databaseObjectToSubComponentType( aComponentIdentity.First ); m_aCompDesc.sName = aComponentIdentity.Second; // what the controller didn't give us is the information whether this is in edit mode or not ... Reference< XModuleManager2 > xModuleManager( ModuleManager::create(m_rContext) ); - const ::rtl::OUString sModuleIdentifier = xModuleManager->identify( m_xComponent ); + const OUString sModuleIdentifier = xModuleManager->identify( m_xComponent ); switch ( m_eType ) { @@ -563,7 +563,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::impl_recoverSubDocument_throw( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; Reference< XCommandProcessor > xDocDefinition; @@ -613,7 +613,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::impl_recoverQueryDesign_throw( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; @@ -667,7 +667,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::recoverFromStorage( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; switch ( m_eType ) diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx index 8e70be04efca..6c4cac5f99f1 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx @@ -72,11 +72,11 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > recoverFromStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); - static const ::rtl::OUString getComponentsStorageName( const SubComponentType i_eType ); + static const OUString getComponentsStorageName( const SubComponentType i_eType ); private: void impl_saveSubDocument_throw( @@ -90,14 +90,14 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > impl_recoverSubDocument_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > impl_recoverQueryDesign_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index 3ff36d791b0c..2682ba81a28e 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -52,7 +52,7 @@ namespace dbaccess // ------------------------------------------------------------------- struct DBACCESS_DLLPRIVATE SubComponentDescriptor { - ::rtl::OUString sName; + OUString sName; bool bForEditing; SubComponentDescriptor() @@ -61,7 +61,7 @@ namespace dbaccess { } - SubComponentDescriptor( const ::rtl::OUString& i_rName, const bool i_bForEditing ) + SubComponentDescriptor( const OUString& i_rName, const bool i_bForEditing ) :sName( i_rName ) ,bForEditing( i_bForEditing ) { @@ -69,7 +69,7 @@ namespace dbaccess }; // ------------------------------------------------------------------- - typedef ::boost::unordered_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc; + typedef ::boost::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc; typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs; diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index 1caaec33fae8..98d4cd8273b7 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx @@ -52,7 +52,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( sal_Int32 nNumberFormat = 0; if ( i->maValue >>= nNumberFormat ) { - rtl::OUString sAttrValue = rODBExport.getDataStyleName(nNumberFormat); + OUString sAttrValue = rODBExport.getDataStyleName(nNumberFormat); if ( !sAttrValue.isEmpty() ) { GetExport().AddAttribute( diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index f5939174b184..c99b451751b2 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -44,7 +44,7 @@ DBG_NAME(OXMLColumn) OXMLColumn::OXMLColumn( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer ,const Reference< XPropertySet >& _xTable @@ -61,13 +61,13 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport const SvXMLTokenMap& rTokenMap = rImport.GetColumnElemTokenMap(); sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - ::rtl::OUString sType; + OUString sType; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx index abe4f956ae7e..95cd7266aa44 100644 --- a/dbaccess/source/filter/xml/xmlColumn.hxx +++ b/dbaccess/source/filter/xml/xmlColumn.hxx @@ -31,10 +31,10 @@ namespace dbaxml ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sName; - ::rtl::OUString m_sStyleName; - ::rtl::OUString m_sCellStyleName; - ::rtl::OUString m_sHelpMessage; + OUString m_sName; + OUString m_sStyleName; + OUString m_sCellStyleName; + OUString m_sHelpMessage; ::com::sun::star::uno::Any m_aDefaultValue; sal_Bool m_bHidden; @@ -43,7 +43,7 @@ namespace dbaxml OXMLColumn( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index a78561bd5901..e6626ff9d362 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -39,10 +39,10 @@ DBG_NAME(OXMLComponent) OXMLComponent::OXMLComponent( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sComponentServiceName ) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bAsTemplate(sal_False) @@ -54,13 +54,13 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport const SvXMLTokenMap& rTokenMap = rImport.GetComponentElemTokenMap(); sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 9bbe2815d803..55c69d8178a9 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -28,9 +28,9 @@ namespace dbaxml class ODBFilter; class OXMLComponent : public SvXMLImportContext { - ::rtl::OUString m_sName; - ::rtl::OUString m_sHREF; - ::rtl::OUString m_sComponentServiceName; + OUString m_sName; + OUString m_sHREF; + OUString m_sComponentServiceName; sal_Bool m_bAsTemplate; ODBFilter& GetOwnImport(); @@ -38,10 +38,10 @@ namespace dbaxml OXMLComponent( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sComponentServiceName ); virtual ~OXMLComponent(); }; diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 27b51d0a6cc9..cc8fbdba4791 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -38,7 +38,7 @@ namespace dbaxml DBG_NAME(OXMLConnectionData) OXMLConnectionData::OXMLConnectionData( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName) : + sal_uInt16 nPrfx, const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bFoundOne(false) { @@ -56,7 +56,7 @@ OXMLConnectionData::~OXMLConnectionData() SvXMLImportContext* OXMLConnectionData::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 132342cbd1a9..8bd938d43503 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -34,11 +34,11 @@ namespace dbaxml public: OXMLConnectionData( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLConnectionData(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index 710a6e9bb799..b371a3e6d86f 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLConnectionResource( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLConnectionResource(); }; diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index d6a4b8194613..d1a763cbf04a 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -38,13 +38,13 @@ namespace dbaxml }; OXMLDataSource( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const UsedFor _eUsedFor = eDataSource ); virtual ~OXMLDataSource(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index e7be61ffc82a..b7bc57506574 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -30,7 +30,7 @@ namespace dbaxml public: OXMLDataSourceInfo( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const sal_uInt16 _nToken); virtual ~OXMLDataSourceInfo(); diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index d5d5ff74e328..b9c779a07d25 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -41,7 +41,7 @@ DBG_NAME(OXMLDataSourceSetting) OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,OXMLDataSourceSetting* _pContainer) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) @@ -59,10 +59,10 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -78,7 +78,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< OUString* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); @@ -106,7 +106,7 @@ OXMLDataSourceSetting::~OXMLDataSourceSetting() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; @@ -140,19 +140,19 @@ void OXMLDataSourceSetting::EndElement() // if our property is of type string, but was empty, ensure that // we don't add a VOID value if ( !m_bIsList && ( m_aPropType.getTypeClass() == TypeClass_STRING ) && !m_aSetting.Value.hasValue() ) - m_aSetting.Value <<= ::rtl::OUString(); + m_aSetting.Value <<= OUString(); GetOwnImport().addInfo(m_aSetting); } } // ----------------------------------------------------------------------------- -void OXMLDataSourceSetting::Characters( const ::rtl::OUString& rChars ) +void OXMLDataSourceSetting::Characters( const OUString& rChars ) { if ( m_pContainer ) m_pContainer->addValue(rChars); } // ----------------------------------------------------------------------------- -void OXMLDataSourceSetting::addValue(const ::rtl::OUString& _sValue) +void OXMLDataSourceSetting::addValue(const OUString& _sValue) { Any aValue; if( TypeClass_VOID != m_aPropType.getTypeClass() ) @@ -173,7 +173,7 @@ ODBFilter& OXMLDataSourceSetting::GetOwnImport() return static_cast<ODBFilter&>(GetImport()); } // ----------------------------------------------------------------------------- -Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters) +Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters) { Any aReturn; switch (_rExpectedType.getTypeClass()) diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index b8b5a6b8d40d..e0206fe67e51 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -35,29 +35,29 @@ namespace dbaxml sal_Bool m_bIsList; ODBFilter& GetOwnImport(); - ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters); + ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); public: OXMLDataSourceSetting( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,OXMLDataSourceSetting* _pContainer = NULL); virtual ~OXMLDataSourceSetting(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); /** adds value to property @param _sValue The value to add. */ - void addValue(const ::rtl::OUString& _sValue); + void addValue(const OUString& _sValue); }; // ----------------------------------------------------------------------------- } // namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index 8495264834ca..4b15c4527662 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -38,7 +38,7 @@ DBG_NAME(OXMLDataSourceSettings) OXMLDataSourceSettings::OXMLDataSourceSettings( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName) : + ,const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) { DBG_CTOR(OXMLDataSourceSettings,NULL); @@ -54,7 +54,7 @@ OXMLDataSourceSettings::~OXMLDataSourceSettings() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index 30aa29f15b7c..35e8b45830d3 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -29,11 +29,11 @@ namespace dbaxml ODBFilter& GetOwnImport(); public: - OXMLDataSourceSettings( ODBFilter& rImport, sal_uInt16 nPrfx,const ::rtl::OUString& rLName); + OXMLDataSourceSettings( ODBFilter& rImport, sal_uInt16 nPrfx,const OUString& rLName); virtual ~OXMLDataSourceSettings(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index e848e9e5fdb3..26b727440ff8 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -41,7 +41,7 @@ namespace dbaxml DBG_NAME(OXMLDatabase) OXMLDatabase::OXMLDatabase( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName ) : + sal_uInt16 nPrfx, const OUString& rLName ) : SvXMLImportContext( rImport, nPrfx, rLName ) { DBG_CTOR(OXMLDatabase,NULL); @@ -58,7 +58,7 @@ OXMLDatabase::~OXMLDatabase() SvXMLImportContext* OXMLDatabase::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; @@ -74,7 +74,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"Forms",aValue); aValue >>= sService; if ( sService.isEmpty() ) @@ -89,7 +89,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"Reports",aValue); aValue >>= sService; if ( sService.isEmpty() ) @@ -104,7 +104,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"CommandDefinitions",aValue); aValue >>= sService; if ( sService.isEmpty() ) diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index 2859bc088492..42d170094057 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -30,11 +30,11 @@ namespace dbaxml public: OXMLDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~OXMLDatabase(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 34336c766fe5..ceb3e3c3d2b8 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -37,7 +37,7 @@ namespace dbaxml DBG_NAME(OXMLDatabaseDescription) OXMLDatabaseDescription::OXMLDatabaseDescription( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName) : + sal_uInt16 nPrfx, const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bFoundOne(false) { @@ -54,7 +54,7 @@ OXMLDatabaseDescription::~OXMLDatabaseDescription() SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 28ca38e304cd..a56d90dedb31 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -34,11 +34,11 @@ namespace dbaxml public: OXMLDatabaseDescription( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLDatabaseDescription(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 2b98e8a70e32..ddbae3725845 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -38,10 +38,10 @@ DBG_NAME(OXMLDocuments) OXMLDocuments::OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& rLName + , const OUString& rLName ,const Reference< XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName) : + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName) : SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xContainer(_xContainer) ,m_sCollectionServiceName(_sCollectionServiceName) @@ -53,9 +53,9 @@ OXMLDocuments::OXMLDocuments( ODBFilter& rImport // ----------------------------------------------------------------------------- OXMLDocuments::OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& rLName + , const OUString& rLName ,const Reference< XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName + ,const OUString& _sCollectionServiceName ) : SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xContainer(_xContainer) @@ -74,7 +74,7 @@ OXMLDocuments::~OXMLDocuments() SvXMLImportContext* OXMLDocuments::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 193fccee42af..d1f3617a2002 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -30,8 +30,8 @@ namespace dbaxml { private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + OUString m_sCollectionServiceName; + OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: @@ -39,23 +39,23 @@ namespace dbaxml // for forms and reports OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName); + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName); // for queries OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName = ::rtl::OUString() + ,const OUString& _sCollectionServiceName = OUString() ); virtual ~OXMLDocuments(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 67f2dd8db641..5f24a9fb2bef 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -38,7 +38,7 @@ namespace dbaxml DBG_NAME(OXMLFileBasedDatabase) OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName, + sal_uInt16 nPrfx, const OUString& _sLocalName, const Reference< XAttributeList > & _xAttrList) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) { @@ -53,15 +53,15 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, PropertyValue aProperty; const sal_Int16 nLength = (xDataSource.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0; - ::rtl::OUString sLocation,sMediaType,sFileTypeExtension; + OUString sLocation,sMediaType,sFileTypeExtension; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); - aProperty.Name = ::rtl::OUString(); + aProperty.Name = OUString(); aProperty.Value = Any(); switch( rTokenMap.Get( nPrefix, sLocalName ) ) @@ -69,7 +69,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, case XML_TOK_DB_HREF: { SvtPathOptions aPathOptions; - rtl::OUString sFileName = aPathOptions.SubstituteVariable(sValue); + OUString sFileName = aPathOptions.SubstituteVariable(sValue); if ( sValue == sFileName ) { const sal_Int32 nFileNameLength = sFileName.getLength(); @@ -101,7 +101,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, if ( !(sLocation.isEmpty() || sMediaType.isEmpty()) ) { ::dbaccess::ODsnTypeCollection aTypeCollection(rImport.GetComponentContext()); - ::rtl::OUString sURL(aTypeCollection.getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); + OUString sURL(aTypeCollection.getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); sURL += sLocation; try { diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index ebd30ff807c6..0a2626a9988d 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLFileBasedDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLFileBasedDatabase(); }; diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 24668516eea1..7c59d0e57168 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -33,31 +33,31 @@ namespace dbaxml ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sName; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + OUString m_sName; + OUString m_sCollectionServiceName; + OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName ); OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable ); virtual ~OXMLHierarchyCollection(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index 08164da65962..1059296a442c 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -30,7 +30,7 @@ namespace dbaxml public: OXMLLogin( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual ~OXMLLogin(); diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index cddb57a11aac..e2a64751e99b 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -40,7 +40,7 @@ DBG_NAME(OXMLQuery) OXMLQuery::OXMLQuery( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ) : @@ -56,10 +56,10 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -82,7 +82,7 @@ OXMLQuery::~OXMLQuery() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLQuery::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext* pContext = OXMLTable::CreateChildContext(nPrefix, rLocalName,xAttrList ); @@ -95,7 +95,7 @@ SvXMLImportContext* OXMLQuery::CreateChildContext( case XML_TOK_UPDATE_TABLE: { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - ::rtl::OUString s1; + OUString s1; fillAttributes(nPrefix, rLocalName,xAttrList,s1,m_sTable,m_sSchema,m_sCatalog); } break; diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index e9c138f3c080..e2aef52021c2 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -28,8 +28,8 @@ namespace dbaxml class ODBFilter; class OXMLQuery : public OXMLTable { - ::rtl::OUString m_sCommand; - ::rtl::OUString m_sTable; + OUString m_sCommand; + OUString m_sTable; sal_Bool m_bEscapeProcessing; protected: virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp); @@ -37,14 +37,14 @@ namespace dbaxml OXMLQuery( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ); virtual ~OXMLQuery(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index 22cd0b21df79..84c5272159fe 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLServerDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLServerDatabase(); }; diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 46a7f83d64c3..2d13149ff1e3 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -38,9 +38,9 @@ namespace dbaxml class OTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; + OUString m_sDataStyleName; + OUString sPageStyle; + const OUString sNumberFormat; SvXMLStylesContext* pStyles; com::sun::star::uno::Any aConditionalFormat; sal_Int32 m_nNumberFormat; @@ -50,15 +50,15 @@ namespace dbaxml protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); OTableStyleContext( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = sal_False ); @@ -77,9 +77,9 @@ namespace dbaxml class OTableStylesContext : public SvXMLStylesContext { - const ::rtl::OUString sTableStyleServiceName; - const ::rtl::OUString sColumnStyleServiceName; - const ::rtl::OUString sCellStyleServiceName; + const OUString sTableStyleServiceName; + const OUString sColumnStyleServiceName; + const OUString sCellStyleServiceName; sal_Int32 m_nNumberFormatIndex; sal_Int32 nMasterPageNameIndex; sal_Bool bAutoStyles : 1; @@ -96,7 +96,7 @@ namespace dbaxml virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -104,7 +104,7 @@ namespace dbaxml TYPEINFO(); OTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , - const ::rtl::OUString& rLName , + const OUString& rLName , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bAutoStyles ); virtual ~OTableStylesContext(); @@ -116,7 +116,7 @@ namespace dbaxml virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; sal_Int32 GetIndex(const sal_Int16 nContextID); }; diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index bce2ba477fd8..999c216459c3 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -31,13 +31,13 @@ namespace dbaxml protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sFilterStatement; - ::rtl::OUString m_sOrderStatement; - ::rtl::OUString m_sName; - ::rtl::OUString m_sSchema; - ::rtl::OUString m_sCatalog; - ::rtl::OUString m_sStyleName; - ::rtl::OUString m_sServiceName; + OUString m_sFilterStatement; + OUString m_sOrderStatement; + OUString m_sName; + OUString m_sSchema; + OUString m_sCatalog; + OUString m_sStyleName; + OUString m_sServiceName; sal_Bool m_bApplyFilter; sal_Bool m_bApplyOrder; @@ -45,12 +45,12 @@ namespace dbaxml ODBFilter& GetOwnImport(); void fillAttributes( sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - , ::rtl::OUString& _rsCommand - ,::rtl::OUString& _rsTableName - ,::rtl::OUString& _rsTableSchema - ,::rtl::OUString& _rsTableCatalog + , OUString& _rsCommand + ,OUString& _rsTableName + ,OUString& _rsTableSchema + ,OUString& _rsTableCatalog ); virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp); @@ -58,15 +58,15 @@ namespace dbaxml OXMLTable( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sServiceName + ,const OUString& _sServiceName ); virtual ~OXMLTable(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); }; diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 5e48f3742ada..de8e856ba182 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -37,7 +37,7 @@ namespace dbaxml using namespace ::com::sun::star::xml::sax; DBG_NAME(OXMLTableFilterList) -OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName ) +OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& _sLocalName ) :SvXMLImportContext( rImport, nPrfx, _sLocalName ) { DBG_CTOR(OXMLTableFilterList,NULL); @@ -53,7 +53,7 @@ OXMLTableFilterList::~OXMLTableFilterList() SvXMLImportContext* OXMLTableFilterList::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & /*xAttrList*/ ) { SvXMLImportContext *pContext = 0; @@ -87,9 +87,9 @@ void OXMLTableFilterList::EndElement() if ( xDataSource.is() ) { if ( !m_aPatterns.empty() ) - xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aPatterns.begin()),m_aPatterns.size()))); + xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< OUString>(&(*m_aPatterns.begin()),m_aPatterns.size()))); if ( !m_aTypes.empty() ) - xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aTypes.begin()),m_aTypes.size()))); + xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< OUString>(&(*m_aTypes.begin()),m_aTypes.size()))); } } //---------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index 3f0fddb3995a..ea8e3d826a46 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -27,19 +27,19 @@ namespace dbaxml class ODBFilter; class OXMLTableFilterList : public SvXMLImportContext { - ::std::vector< ::rtl::OUString> m_aPatterns; - ::std::vector< ::rtl::OUString> m_aTypes; + ::std::vector< OUString> m_aPatterns; + ::std::vector< OUString> m_aTypes; ODBFilter& GetOwnImport(); public: OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLTableFilterList(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); @@ -48,7 +48,7 @@ namespace dbaxml @param _sTableFilterPattern The new filter pattern. */ - inline void pushTableFilterPattern(const ::rtl::OUString& _sTableFilterPattern) + inline void pushTableFilterPattern(const OUString& _sTableFilterPattern) { m_aPatterns.push_back(_sTableFilterPattern); } @@ -57,7 +57,7 @@ namespace dbaxml @param _sTypeFilter The new type filter. */ - inline void pushTableTypeFilter(const ::rtl::OUString& _sTypeFilter) + inline void pushTableTypeFilter(const OUString& _sTypeFilter) { m_aTypes.push_back(_sTypeFilter); } diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx index c18528b27e65..2c8c0f6af2eb 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx @@ -29,7 +29,7 @@ DBG_NAME(OXMLTableFilterPattern) OXMLTableFilterPattern::OXMLTableFilterPattern( SvXMLImport& rImport, sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,sal_Bool _bNameFilter ,OXMLTableFilterList& _rParent) :SvXMLImportContext( rImport, nPrfx, _sLocalName ) @@ -47,7 +47,7 @@ OXMLTableFilterPattern::~OXMLTableFilterPattern() DBG_DTOR(OXMLTableFilterPattern,NULL); } // ----------------------------------------------------------------------------- -void OXMLTableFilterPattern::Characters( const ::rtl::OUString& rChars ) +void OXMLTableFilterPattern::Characters( const OUString& rChars ) { if ( m_bNameFilter ) m_rParent.pushTableFilterPattern(rChars); diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index c6ee32db2d4b..8402cc846a1e 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -31,13 +31,13 @@ namespace dbaxml public: OXMLTableFilterPattern( SvXMLImport& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,sal_Bool _bNameFilter ,OXMLTableFilterList& _rParent); virtual ~OXMLTableFilterPattern(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; // ----------------------------------------------------------------------------- } // namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 1b9e65595ab2..d8c29c57fc44 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -99,14 +99,14 @@ private: */ void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap); - SvXMLImportContext* CreateStylesContext(sal_uInt16 nPrefix,const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateStylesContext(sal_uInt16 nPrefix,const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ); - SvXMLImportContext* CreateScriptContext( const ::rtl::OUString& rLocalName ); + SvXMLImportContext* CreateScriptContext( const OUString& rLocalName ); protected: // SvXMLImport virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ODBFilter() throw(); diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 1dc576bf2723..613c9c9990a9 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -67,7 +67,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dbaxml::OModuleRegistration::getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), + OUString::createFromAscii(pImplementationName), static_cast< XMultiServiceFactory* >(pServiceManager)); } diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx index 39236c097644..2228b36b5505 100644 --- a/dbaccess/source/inc/OAuthenticationContinuation.hxx +++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx @@ -41,28 +41,28 @@ class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : sal_Bool m_bRemberPassword : 1; // remember the password for this session ? sal_Bool m_bCanSetUserName; - ::rtl::OUString m_sUser; // the user - ::rtl::OUString m_sPassword; // the user's password + OUString m_sUser; // the user + OUString m_sPassword; // the user's password public: OAuthenticationContinuation(); sal_Bool SAL_CALL canSetRealm( ) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL setRealm( const ::rtl::OUString& Realm ) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL setRealm( const OUString& Realm ) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL canSetUserName( ) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL setUserName( const ::rtl::OUString& UserName ) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL setUserName( const OUString& UserName ) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL canSetPassword( ) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL setPassword( const ::rtl::OUString& Password ) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL setPassword( const OUString& Password ) throw(com::sun::star::uno::RuntimeException); com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > SAL_CALL getRememberPasswordModes( com::sun::star::ucb::RememberAuthentication& Default ) throw(com::sun::star::uno::RuntimeException); void SAL_CALL setRememberPassword( com::sun::star::ucb::RememberAuthentication Remember ) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL canSetAccount( ) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL setAccount( const ::rtl::OUString& Account ) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL setAccount( const OUString& Account ) throw(com::sun::star::uno::RuntimeException); com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > SAL_CALL getRememberAccountModes( com::sun::star::ucb::RememberAuthentication& Default ) throw(com::sun::star::uno::RuntimeException); void SAL_CALL setRememberAccount( com::sun::star::ucb::RememberAuthentication Remember ) throw(com::sun::star::uno::RuntimeException); void setCanChangeUserName( sal_Bool bVal ) { m_bCanSetUserName = bVal; } - ::rtl::OUString getUser() const { return m_sUser; } - ::rtl::OUString getPassword() const { return m_sPassword; } + OUString getUser() const { return m_sUser; } + OUString getPassword() const { return m_sPassword; } sal_Bool getRememberPassword() const { return m_bRemberPassword; } }; diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 11fff17bf856..c9e663e170a0 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -68,26 +68,26 @@ public: //---------------------------------------------------------------------------------- // (internal - not to be used outside - usually) #define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - ::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); \ } \ #define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { \ return getImplementationName_Static(); \ } \ - ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ + OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ + return OUString::createFromAscii(implasciiname); \ } \ #define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - 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) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(getSupportedServiceNames()); \ + const OUString* pSupported = aSupported.getConstArray(); \ for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) \ if (pSupported->equals(_rServiceName)) \ return sal_True; \ @@ -96,54 +96,54 @@ public: } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ - ::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; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - ::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) \ { \ return getSupportedServiceNames_Static(); \ } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) 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; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ - ::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) \ { \ return getSupportedServiceNames_Static(); \ } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(2); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = OUString::createFromAscii(serviceasciiname2); \ return aSupported; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ - ::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(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(2); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = OUString::createFromAscii(serviceasciiname2); \ return aSupported; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ - ::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(3); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(3); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = OUString::createFromAscii(serviceasciiname2); \ + aSupported[2] = OUString::createFromAscii(serviceasciiname3); \ return aSupported; \ } \ @@ -157,14 +157,14 @@ public: //---------------------------------------------------------------------------------- // declare service info methods #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 DECLARE_SERVICE_INFO_STATIC() \ DECLARE_SERVICE_INFO(); \ - static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ + static OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx index 8670a9737bbd..f556d9da9971 100644 --- a/dbaccess/source/inc/registrationhelper.hxx +++ b/dbaccess/source/inc/registrationhelper.hxx @@ -24,18 +24,18 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, - const ::rtl::OUString & _rComponentName, + const OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, + const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames, rtl_ModuleCount* _p ); //========================================================================== class OModuleRegistration { - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >* s_pSupportedServices; static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; @@ -54,8 +54,8 @@ public: @see revokeComponent */ static void registerComponent( - const ::rtl::OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction); @@ -63,7 +63,7 @@ public: @param _rImplementationName the implementation name of the component */ static void revokeComponent( - const ::rtl::OUString& _rImplementationName); + const OUString& _rImplementationName); /** creates a Factory for the component with the given implementation name. Usually used from within component_getFactory. @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory @@ -71,7 +71,7 @@ public: @return the XInterface access to a factory for the component */ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager ); }; @@ -82,8 +82,8 @@ class OMultiInstanceAutoRegistration { public: /** assumed that the template argument has the three methods<BR> - <code>static ::rtl::OUString getImplementationName_Static()</code><BR> - <code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><BR> + <code>static OUString getImplementationName_Static()</code><BR> + <code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><BR> and<BR> <code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code><BR> @@ -118,8 +118,8 @@ class OOneInstanceAutoRegistration { public: /** provided that the template argument has three methods<BR> - <code>static ::rtl::OUString getImplementationName_Static()</code><BR> - <code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><BR> + <code>static OUString getImplementationName_Static()</code><BR> + <code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><BR> and<BR> <code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code><BR> diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index 504944cb14ae..08d9a82db32b 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx @@ -63,17 +63,17 @@ namespace sdbtools virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableName > SAL_CALL createTableName() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XObjectNames > SAL_CALL getObjectNames() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index 714156a9fafd..f05a417d796e 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -64,11 +64,11 @@ namespace sdbtools ); // XObjectNames - virtual ::rtl::OUString SAL_CALL suggestName( ::sal_Int32 CommandType, const ::rtl::OUString& BaseName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL convertToSQLName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isNameUsed( ::sal_Int32 CommandType, const ::rtl::OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isNameValid( ::sal_Int32 CommandType, const ::rtl::OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL checkNameForCreate( ::sal_Int32 CommandType, const ::rtl::OUString& Name ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL suggestName( ::sal_Int32 CommandType, const OUString& BaseName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL convertToSQLName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isNameUsed( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isNameValid( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~ObjectNames(); diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index 63c394a49402..653d176b573d 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -64,17 +64,17 @@ namespace sdbtools ); // XTableName - virtual ::rtl::OUString SAL_CALL getCatalogName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalogName( const ::rtl::OUString& _catalogname ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSchemaName( const ::rtl::OUString& _schemaname ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTableName( const ::rtl::OUString& _tablename ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameForSelect() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalogName( const OUString& _catalogname ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSchemaName( const OUString& _schemaname ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTableName( const OUString& _tablename ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNameForSelect() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getTable() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _table ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getComposedName( ::sal_Int32 Type, ::sal_Bool _Quote ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComposedName( const ::rtl::OUString& ComposedName, ::sal_Int32 Type ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getComposedName( ::sal_Int32 Type, ::sal_Bool _Quote ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) throw (::com::sun::star::uno::RuntimeException); protected: virtual ~TableName(); diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 7da24412dc9e..60230f39a445 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -52,7 +52,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::sdbtools::SdbtModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName)); + OUString::createFromAscii(pImplementationName)); } if (xRet.is()) diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx index e915337dfe73..9fdaf34e006e 100644 --- a/dbaccess/source/shared/registrationhelper.cxx +++ b/dbaccess/source/shared/registrationhelper.cxx @@ -27,15 +27,15 @@ using namespace ::com::sun::star; using namespace ::comphelper; using namespace ::cppu; -uno::Sequence< ::rtl::OUString >* OModuleRegistration::s_pImplementationNames = NULL; -uno::Sequence< uno::Sequence< ::rtl::OUString > >* OModuleRegistration::s_pSupportedServices = NULL; +uno::Sequence< OUString >* OModuleRegistration::s_pImplementationNames = NULL; +uno::Sequence< uno::Sequence< OUString > >* OModuleRegistration::s_pSupportedServices = NULL; uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL; uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OModuleRegistration::registerComponent( - const ::rtl::OUString& _rImplementationName, - const uno::Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const uno::Sequence< OUString >& _rServiceNames, ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction) { @@ -43,8 +43,8 @@ void OModuleRegistration::registerComponent( { OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers, "OModuleRegistration::registerComponent : inconsistent state (the pointers (1)) !"); - s_pImplementationNames = new uno::Sequence< ::rtl::OUString >; - s_pSupportedServices = new uno::Sequence< uno::Sequence< ::rtl::OUString > >; + s_pImplementationNames = new uno::Sequence< OUString >; + s_pSupportedServices = new uno::Sequence< uno::Sequence< OUString > >; s_pCreationFunctionPointers = new uno::Sequence< sal_Int64 >; s_pFactoryFunctionPointers = new uno::Sequence< sal_Int64 >; } @@ -69,7 +69,7 @@ void OModuleRegistration::registerComponent( } //-------------------------------------------------------------------------- -void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementationName) +void OModuleRegistration::revokeComponent(const OUString& _rImplementationName) { if (!s_pImplementationNames) { @@ -84,7 +84,7 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio "OModuleRegistration::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplNames = s_pImplementationNames->getConstArray(); + const OUString* pImplNames = s_pImplementationNames->getConstArray(); for (sal_Int32 i=0; i<nLen; ++i, ++pImplNames) { if (pImplNames->equals(_rImplementationName)) @@ -108,7 +108,7 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio //-------------------------------------------------------------------------- uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const uno::Reference< lang::XMultiServiceFactory >& _rxServiceManager) { OSL_ENSURE(_rxServiceManager.is(), "OModuleRegistration::getComponentFactory : invalid argument (service manager) !"); @@ -131,8 +131,8 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray(); - const uno::Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray(); + const OUString* pImplName = s_pImplementationNames->getConstArray(); + const uno::Sequence< OUString >* pServices = s_pSupportedServices->getConstArray(); const sal_Int64* pComponentFunction = s_pCreationFunctionPointers->getConstArray(); const sal_Int64* pFactoryFunction = s_pFactoryFunctionPointers->getConstArray(); diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 2b5d850affdb..f0623e798e9e 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -192,7 +192,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec Reference< XHierarchicalNameContainer > xHierarchyName( xNames, UNO_QUERY ); if ( xNames.is() ) { - rtl::OString sDialogPosition; + OString sDialogPosition; svtools::QueryDeleteResult_Impl eResult = _bConfirm ? svtools::QUERYDELETE_YES : svtools::QUERYDELETE_ALL; // The list of elements to delete is allowed to contain related elements: A given element may diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index ba3971f930d4..486ca96a8baa 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -151,7 +151,7 @@ namespace dbaui @return The new tree. */ - DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage); + DBTreeListBox* createSimpleTree( const OString& _sHelpId, const Image& _rImage); DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); DECL_LINK( OnEntrySelChange, void* ); @@ -221,7 +221,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; + void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ @@ -241,7 +241,7 @@ namespace dbaui * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); + void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); /** return the qualified name. @param _pEntry @@ -250,7 +250,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; + OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /// return the element of currently select entry ElementType getElementType() const; @@ -294,7 +294,7 @@ namespace dbaui If we insert a table, the connection must be set. */ SvTreeListEntry* elementAdded(ElementType eType - ,const ::rtl::OUString& _rName + ,const OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @@ -308,8 +308,8 @@ namespace dbaui If we insert a table, the connection must be set. */ void elementReplaced(ElementType eType - ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName ); + ,const OUString& _rOldName + ,const OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -320,7 +320,7 @@ namespace dbaui If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName ); + ,const OUString& _rName ); /// returns the preview mode @@ -352,8 +352,8 @@ namespace dbaui <TRUE/> if it is a table, otherwise <FALSE/> @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, - const ::rtl::OUString& _sName, + void showPreview( const OUString& _sDataSourceName, + const OUString& _sName, sal_Bool _bTable); protected: diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index f8bb55627901..67c9b57e9f96 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -89,7 +89,7 @@ namespace dbaui struct TaskEntry { - ::rtl::OUString sUNOCommand; + OUString sUNOCommand; sal_uInt16 nHelpID; String sTitle; bool bHideWhenDisabled; @@ -206,7 +206,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; + OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -257,7 +257,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames ) const; + void getSelectionElementNames(::std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ @@ -277,7 +277,7 @@ namespace dbaui * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); + void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); /** adds a new object to the detail page. @param _eType @@ -290,7 +290,7 @@ namespace dbaui If we insert a table, the connection must be set. */ SvTreeListEntry* elementAdded(ElementType eType - ,const ::rtl::OUString& _rName + ,const OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @@ -306,8 +306,8 @@ namespace dbaui The object which was replaced */ void elementReplaced(ElementType eType - ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName ); + ,const OUString& _rOldName + ,const OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -318,7 +318,7 @@ namespace dbaui If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName ); + ,const OUString& _rName ); /// returns the preview mode PreviewMode getPreviewMode(); @@ -348,8 +348,8 @@ namespace dbaui <TRUE/> if it is a table, otherwise <FALSE/> @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, - const ::rtl::OUString& _sName, + void showPreview( const OUString& _sDataSourceName, + const OUString& _sName, sal_Bool _bTable); SvTreeListEntry* getEntry( const Point& _aPoint ) const; diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 2157175cc906..568d585c5758 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -361,7 +361,7 @@ void OApplicationView::paste() pTest->paste(); } // ----------------------------------------------------------------------------- -::rtl::OUString OApplicationView::getQualifiedName( SvTreeListEntry* _pEntry ) const +OUString OApplicationView::getQualifiedName( SvTreeListEntry* _pEntry ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getQualifiedName( _pEntry ); @@ -427,7 +427,7 @@ sal_Int32 OApplicationView::getElementCount() return getDetailView()->getElementCount(); } // ----------------------------------------------------------------------------- -void OApplicationView::getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const +void OApplicationView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->getSelectionElementNames( _rNames ); @@ -445,27 +445,27 @@ void OApplicationView::describeCurrentSelectionForType( const ElementType _eType getDetailView()->describeCurrentSelectionForType( _eType, _out_rSelectedObjects ); } // ----------------------------------------------------------------------------- -void OApplicationView::selectElements(const Sequence< ::rtl::OUString>& _aNames) +void OApplicationView::selectElements(const Sequence< OUString>& _aNames) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->selectElements( _aNames ); } // ----------------------------------------------------------------------------- -SvTreeListEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject ) +SvTreeListEntry* OApplicationView::elementAdded(ElementType eType,const OUString& _rName, const Any& _rObject ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->elementAdded(eType,_rName,_rObject); } // ----------------------------------------------------------------------------- -void OApplicationView::elementRemoved(ElementType eType,const ::rtl::OUString& _rName ) +void OApplicationView::elementRemoved(ElementType eType,const OUString& _rName ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->elementRemoved(eType,_rName); } // ----------------------------------------------------------------------------- void OApplicationView::elementReplaced(ElementType _eType - ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName ) + ,const OUString& _rOldName + ,const OUString& _rNewName ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->elementReplaced(_eType, _rOldName, _rNewName ); @@ -517,9 +517,9 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent) getDetailView()->showPreview(_xContent); } // ----------------------------------------------------------------------------- -void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, +void OApplicationView::showPreview( const OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sName, + const OUString& _sName, sal_Bool _bTable) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 9c9cddf0e239..ed82d61ae3b1 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -141,7 +141,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; + OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -192,7 +192,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; + void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ @@ -212,7 +212,7 @@ namespace dbaui * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); + void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); /** adds a new object to the detail page. @param _eType @@ -225,7 +225,7 @@ namespace dbaui If we insert a table, the connection must be set. */ SvTreeListEntry* elementAdded(ElementType _eType - ,const ::rtl::OUString& _rName + ,const OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @@ -241,8 +241,8 @@ namespace dbaui The object which was replaced */ void elementReplaced(ElementType eType - ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName ); + ,const OUString& _rOldName + ,const OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -253,7 +253,7 @@ namespace dbaui If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName ); + ,const OUString& _rName ); /** changes the container which should be displayed. The select handler will also be called. @@ -291,9 +291,9 @@ namespace dbaui <TRUE/> if it is a table, otherwise <FALSE/> @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sName, + const OUString& _sName, sal_Bool _bTable); SvTreeListEntry* getEntry( const Point& _aPosPixel ) const; diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index 52981edb0bc3..15a3def5f7ac 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -64,7 +64,7 @@ namespace dbaui // container access void onSubComponentOpened( - const ::rtl::OUString& _rName, + const OUString& _rName, const sal_Int32 _nComponentType, const ElementOpenMode _eOpenMode, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& @@ -79,7 +79,7 @@ namespace dbaui previously */ bool activateSubFrame( - const ::rtl::OUString& _rName, + const OUString& _rName, const sal_Int32 _nComponentType, const ElementOpenMode _eOpenMode, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& o_rComponent @@ -95,7 +95,7 @@ namespace dbaui exist. */ bool closeSubFrames( - const ::rtl::OUString& _rName, + const OUString& _rName, const sal_Int32 _nComponentType ); @@ -112,7 +112,7 @@ namespace dbaui */ bool lookupSubComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& i_rComponent, - ::rtl::OUString& o_rName, + OUString& o_rName, sal_Int32& o_rComponentType ); diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index cf92e7fc68fd..52de673fb1f3 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -602,9 +602,9 @@ void OGenericUnoController::InvalidateFeature_Impl() #if OSL_DEBUG_LEVEL > 0 if ( m_aSupportedFeatures.end() == aFeaturePos ) { - ::rtl::OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " ); - sMessage += ::rtl::OString::valueOf( aNextFeature.nId ); - sMessage += ::rtl::OString( " has been invalidated, but is not supported!" ); + OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " ); + sMessage += OString::valueOf( aNextFeature.nId ); + sMessage += OString( " has been invalidated, but is not supported!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -774,9 +774,9 @@ void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyV // #i52602# #ifdef TIMELOG - ::rtl::OString sLog( "OGenericUnoController::dispatch( '" ); - sLog += ::rtl::OString( _aURL.Main.getStr(), _aURL.Main.getLength(), osl_getThreadTextEncoding() ); - sLog += ::rtl::OString( "' )" ); + OString sLog( "OGenericUnoController::dispatch( '" ); + sLog += OString( _aURL.Main.getStr(), _aURL.Main.getLength(), osl_getThreadTextEncoding() ); + sLog += OString( "' )" ); RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", sLog.getStr() ); #endif @@ -1325,7 +1325,7 @@ void OGenericUnoController::openHelpAgent(OUString const& _suHelpStringURL ) openHelpAgent( aURL ); } -void OGenericUnoController::openHelpAgent(const rtl::OString& _sHelpId) +void OGenericUnoController::openHelpAgent(const OString& _sHelpId) { openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _sHelpId ) ); } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index d37e7625323c..4a8eb5a0a6fb 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1907,7 +1907,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue break; case ID_TREE_CLOSE_CONN: - openHelpAgent( rtl::OString( HID_DSBROWSER_DISCONNECTING )); + openHelpAgent( OString( HID_DSBROWSER_DISCONNECTING )); closeConnection( m_pTreeView->getListBox().GetRootLevelParent( m_pTreeView->getListBox().GetCurEntry() ) ); break; diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 288515549f6b..0e0f60960e52 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -158,7 +158,7 @@ sal_Bool OColumnControlWindow::isAutoIncrementValueEnabled() const return m_bAutoIncrementEnabled; } // ----------------------------------------------------------------------------- -::rtl::OUString OColumnControlWindow::getAutoIncrementValue() const +OUString OColumnControlWindow::getAutoIncrementValue() const { return m_sAutoIncrementValue; } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index abe5d59f40e3..4e6bce8dc701 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -259,10 +259,10 @@ OFieldDescControl::~OFieldDescControl() String OFieldDescControl::BoolStringPersistent(const String& rUIString) const { if (rUIString == aNo) - return rtl::OUString('0'); + return OUString('0'); if (rUIString == aYes) - return rtl::OUString('1'); - return rtl::OUString(); + return OUString('1'); + return OUString(); } //------------------------------------------------------------------------------ @@ -526,7 +526,7 @@ String OFieldDescControl::GetControlText( sal_uInt16 nControlId ) break; case FIELD_PROPERTY_TEXTLEN: if (pTextLen) - return rtl::OUString::valueOf(static_cast<sal_Int64>(pTextLen->GetValue())); + return OUString::valueOf(static_cast<sal_Int64>(pTextLen->GetValue())); case FIELD_PROPERTY_NUMTYPE: if (pNumType) return pNumType->GetSelectEntry(); @@ -925,7 +925,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) m_nPos++; { sal_uInt32 nMax = EDIT_NOLIMIT; - ::rtl::OUString aTmpString; + OUString aTmpString; try { Reference< XDatabaseMetaData> xMetaData = getMetaData(); @@ -960,11 +960,11 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pNumType = new OPropListBoxCtrl( this, STR_HELP_NUMERIC_TYPE, FIELD_PROPERTY_NUMTYPE, WB_DROPDOWN ); pNumType->SetDropDownLineCount(5); - pNumType->InsertEntry( rtl::OUString("Byte") ); - pNumType->InsertEntry( rtl::OUString("SmallInt") ); - pNumType->InsertEntry( rtl::OUString("Integer") ); - pNumType->InsertEntry( rtl::OUString("Single") ); - pNumType->InsertEntry( rtl::OUString("Double") ); + pNumType->InsertEntry( OUString("Byte") ); + pNumType->InsertEntry( OUString("SmallInt") ); + pNumType->InsertEntry( OUString("Integer") ); + pNumType->InsertEntry( OUString("Single") ); + pNumType->InsertEntry( OUString("Double") ); pNumType->SelectEntryPos(2); InitializeControl(pNumType,HID_TAB_ENT_NUMTYP,true); break; @@ -1022,7 +1022,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) } } // ----------------------------------------------------------------------------- -void OFieldDescControl::InitializeControl(Control* _pControl,const ::rtl::OString& _sHelpId,bool _bAddChangeHandler) +void OFieldDescControl::InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler) { _pControl->SetHelpId(_sHelpId); if ( _bAddChangeHandler ) @@ -1041,7 +1041,7 @@ FixedText* OFieldDescControl::CreateText(sal_uInt16 _nTextRes) return pFixedText; } // ----------------------------------------------------------------------------- -OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const rtl::OString& _sHelpId) +OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId) { OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER ); pControl->SetDecimalDigits(0); @@ -1287,7 +1287,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) ActivateAggregate( tpScale ); pScale->SetMax(::std::max<sal_Int32>(pFieldType->nMaximumScale,pFieldDescr->GetScale())); pScale->SetMin(pFieldType->nMinimumScale); - static const ::rtl::OUString s_sPRECISION("PRECISION"); + static const OUString s_sPRECISION("PRECISION"); pScale->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty() || pFieldType->aCreateParams == s_sPRECISION); } else @@ -1430,7 +1430,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pBoolDefault ) { // If pRequired = sal_True then the sal_Bool field must NOT contain <<none>> - ::rtl::OUString sValue; + OUString sValue; pFieldDescr->GetControlDefault() >>= sValue; String sDef = BoolStringUI(sValue); @@ -1445,7 +1445,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) else pBoolDefault->SelectEntry(sDef); - pFieldDescr->SetControlDefault(makeAny(::rtl::OUString(BoolStringPersistent(pBoolDefault->GetSelectEntry())))); + pFieldDescr->SetControlDefault(makeAny(OUString(BoolStringPersistent(pBoolDefault->GetSelectEntry())))); } else if(pBoolDefault->GetEntryCount() < 3) { @@ -1614,7 +1614,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr ) ////////////////////////////////////////////////////////////////////// // Read out Controls - ::rtl::OUString sDefault; + OUString sDefault; if (pDefault) { sDefault = pDefault->GetText(); @@ -1786,7 +1786,7 @@ sal_Bool OFieldDescControl::isTextFormat(const OFieldDescription* _pFieldDescr,s // ----------------------------------------------------------------------------- String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDescr ,sal_Bool _bCheck) const { - ::rtl::OUString sDefault; + OUString sDefault; sal_Bool bCheck = !_bCheck || _pFieldDescr->GetControlDefault().hasValue(); if ( bCheck ) { @@ -1809,7 +1809,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes } catch(const Exception&) { - return ::rtl::OUString(); // return empty string for format example + return OUString(); // return empty string for format example } } } @@ -1821,13 +1821,13 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes Reference< ::com::sun::star::util::XNumberFormatter> xNumberFormatter = GetFormatter(); Reference<XPropertySet> xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); - ::rtl::OUString sFormat; - xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat; + OUString sFormat; + xFormSet->getPropertyValue(OUString("FormatString")) >>= sFormat; if ( !bTextFormat ) { Locale aLocale; - ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString("Locale")) >>= aLocale; + ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,OUString("Locale")) >>= aLocale; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey); if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index f1ce93fe2091..d61d39e9d986 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -311,7 +311,7 @@ namespace dbaui { DBG_CHKTHIS(ORelationControl,NULL); - rtl::OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL ); + OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL ); Reference< XPropertySet> xDef; switch ( getColumnIdent(nColumnId) ) @@ -390,9 +390,9 @@ namespace dbaui //sal_Int32 nRows = GetRowCount(); Reference<XColumnsSupplier> xSup(_xDest,UNO_QUERY); Reference<XNameAccess> xColumns = xSup->getColumns(); - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { m_pListCell->InsertEntry( *pIter ); diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 04e960292cf6..2e28ddd34684 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -21,7 +21,7 @@ namespace dbaui { //------------------------------------------------------------------ - sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars) + sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars) { return ( (_cChar >= 'A' && _cChar <= 'Z') || @@ -32,8 +32,8 @@ namespace dbaui ); } //------------------------------------------------------------------ - sal_Bool OSQLNameChecker::checkString(const ::rtl::OUString& _sToCheck, - ::rtl::OUString& _rsCorrected) + sal_Bool OSQLNameChecker::checkString(const OUString& _sToCheck, + OUString& _rsCorrected) { sal_Bool bCorrected = sal_False; if ( m_bCheck ) @@ -56,7 +56,7 @@ namespace dbaui //------------------------------------------------------------------ void OSQLNameEdit::Modify() { - ::rtl::OUString sCorrected; + OUString sCorrected; if ( checkString( GetText(),sCorrected ) ) { Selection aSel = GetSelection(); @@ -70,7 +70,7 @@ namespace dbaui //------------------------------------------------------------------ void OSQLNameComboBox::Modify() { - ::rtl::OUString sCorrected; + OUString sCorrected; if ( checkString( GetText(),sCorrected ) ) { Selection aSel = GetSelection(); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 5a27288425a9..9aca17493a21 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -222,7 +222,7 @@ sal_Bool OTableGrantControl::SaveModified() if(nRow == -1 || nRow >= m_aTableNames.getLength()) return sal_False; - ::rtl::OUString sTableName = m_aTableNames[nRow]; + OUString sTableName = m_aTableNames[nRow]; sal_Bool bErg = sal_True; try { @@ -365,7 +365,7 @@ sal_Bool OTableGrantControl::isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivile return bAllowed; } // ----------------------------------------------------------------------------- -void OTableGrantControl::setUserName(const ::rtl::OUString _sUserName) +void OTableGrantControl::setUserName(const OUString _sUserName) { m_sUserName = _sUserName; m_aPrivMap = TTablePrivilegeMap(); diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 41a458c1961b..5723af67c355 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -62,14 +62,14 @@ namespace dbaui using ::com::sun::star::frame::UICommandDescription; using ::com::sun::star::graphic::XGraphic; - String GetCommandText( const sal_Char* _pCommandURL, const ::rtl::OUString& _rModuleName ) + String GetCommandText( const sal_Char* _pCommandURL, const OUString& _rModuleName ) { - ::rtl::OUString sLabel; + OUString sLabel; if ( !_pCommandURL || !*_pCommandURL ) return sLabel; Reference< XNameAccess > xUICommandLabels; - ::rtl::OUString sCommandURL = ::rtl::OUString::createFromAscii( _pCommandURL ); + OUString sCommandURL = OUString::createFromAscii( _pCommandURL ); try { @@ -93,7 +93,7 @@ namespace dbaui sal_Int32 nCount( aProperties.getLength() ); for ( sal_Int32 i=0; i<nCount; ++i ) { - ::rtl::OUString sPropertyName( aProperties[i].Name ); + OUString sPropertyName( aProperties[i].Name ); if ( sPropertyName == "Label" ) { aProperties[i].Value >>= sLabel; @@ -111,14 +111,14 @@ namespace dbaui return sLabel; } - Image GetCommandIcon( const sal_Char* _pCommandURL, const ::rtl::OUString& _rModuleName ) + Image GetCommandIcon( const sal_Char* _pCommandURL, const OUString& _rModuleName ) { Image aIcon; if ( !_pCommandURL || !*_pCommandURL ) return aIcon; Reference< XNameAccess > xUICommandLabels; - ::rtl::OUString sCommandURL = ::rtl::OUString::createFromAscii( _pCommandURL ); + OUString sCommandURL = OUString::createFromAscii( _pCommandURL ); try { do @@ -138,7 +138,7 @@ namespace dbaui if ( !xImageManager.is() ) break; - Sequence< ::rtl::OUString > aCommandList( &sCommandURL, 1 ); + Sequence< OUString > aCommandList( &sCommandURL, 1 ); Sequence<Reference< XGraphic> > xIconList( xImageManager->getImages( 0, aCommandList ) ); if ( !xIconList.hasElements() ) break; @@ -179,7 +179,7 @@ namespace dbaui void OpenDocumentButton::impl_init( const sal_Char* _pAsciiModuleName ) { OSL_ENSURE( _pAsciiModuleName, "OpenDocumentButton::impl_init: invalid module name!" ); - m_sModule = ::rtl::OUString::createFromAscii( _pAsciiModuleName ); + m_sModule = OUString::createFromAscii( _pAsciiModuleName ); // our label should equal the UI text of the "Open" command String sLabel( GetCommandText( ".uno:Open", m_sModule ) ); @@ -220,7 +220,7 @@ namespace dbaui Sequence< Sequence< PropertyValue> > aHistory = SvtHistoryOptions().GetList( ePICKLIST ); Reference< XNameAccess > xFilterFactory; xFilterFactory = xFilterFactory.query( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( "com.sun.star.document.FilterFactory" ) ) ); + OUString( "com.sun.star.document.FilterFactory" ) ) ); sal_uInt32 nCount = aHistory.getLength(); for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem ) @@ -229,10 +229,10 @@ namespace dbaui { // Get the current history item's properties. ::comphelper::SequenceAsHashMap aItemProperties( aHistory[ nItem ] ); - ::rtl::OUString sURL = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_URL, ::rtl::OUString() ); - ::rtl::OUString sFilter = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_FILTER, ::rtl::OUString() ); - String sTitle = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_TITLE, ::rtl::OUString() ); - ::rtl::OUString sPassword = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_PASSWORD, ::rtl::OUString() ); + OUString sURL = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_URL, OUString() ); + OUString sFilter = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_FILTER, OUString() ); + String sTitle = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_TITLE, OUString() ); + OUString sPassword = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_PASSWORD, OUString() ); // If the entry is an impress file then insert it into the // history list and the list box. @@ -240,8 +240,8 @@ namespace dbaui xFilterFactory->getByName( sFilter ) >>= aProps; ::comphelper::SequenceAsHashMap aFilterProperties( aProps ); - ::rtl::OUString sDocumentService = aFilterProperties.getUnpackedValueOrDefault( - ::rtl::OUString( "DocumentService" ), ::rtl::OUString() ); + OUString sDocumentService = aFilterProperties.getUnpackedValueOrDefault( + OUString( "DocumentService" ), OUString() ); if ( sDocumentService.equalsAscii( _pAsciiModuleName ) ) { // yes, it's a Base document diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 349a50fa3506..11446c9008c0 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -94,9 +94,9 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : osl::MutexGuard g(m_mutex); m_notifier = n; } - css::uno::Sequence< rtl::OUString > s(2); - s[0] = rtl::OUString("FontHeight"); - s[1] = rtl::OUString("FontName"); + css::uno::Sequence< OUString > s(2); + s[0] = OUString("FontHeight"); + s[1] = OUString("FontName"); n->addPropertiesChangeListener(s, m_listener.get()); m_ColorConfig.AddListener(this); @@ -242,9 +242,9 @@ void OSqlEdit::ImplSetFont() { AllSettings aSettings = GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - rtl::OUString sFontName( + OUString sFontName( officecfg::Office::Common::Font::SourceViewFont::FontName::get(). - get_value_or( rtl::OUString() ) ); + get_value_or( OUString() ) ); if ( sFontName.isEmpty() ) { Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) ); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 3535ab0d52f1..7d635e324186 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -159,7 +159,7 @@ void OTableTreeListBox::implOnNewConnection( const Reference< XConnection >& _rx //------------------------------------------------------------------------ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection ) throw(SQLException) { - Sequence< ::rtl::OUString > sTables, sViews; + Sequence< OUString > sTables, sViews; String sCurrentActionError; try @@ -204,16 +204,16 @@ namespace { struct OViewSetter : public ::std::unary_function< OTableTreeListBox::TNames::value_type, bool> { - const Sequence< ::rtl::OUString> m_aViews; + const Sequence< OUString> m_aViews; ::comphelper::TStringMixEqualFunctor m_aEqualFunctor; - OViewSetter(const Sequence< ::rtl::OUString>& _rViews,sal_Bool _bCase) : m_aViews(_rViews),m_aEqualFunctor(_bCase){} - OTableTreeListBox::TNames::value_type operator() (const ::rtl::OUString& lhs) + OViewSetter(const Sequence< OUString>& _rViews,sal_Bool _bCase) : m_aViews(_rViews),m_aEqualFunctor(_bCase){} + OTableTreeListBox::TNames::value_type operator() (const OUString& lhs) { OTableTreeListBox::TNames::value_type aRet; aRet.first = lhs; - const ::rtl::OUString* pIter = m_aViews.getConstArray(); - const ::rtl::OUString* pEnd = m_aViews.getConstArray() + m_aViews.getLength(); + const OUString* pIter = m_aViews.getConstArray(); + const OUString* pEnd = m_aViews.getConstArray() + m_aViews.getLength(); aRet.second = (::std::find_if(pIter,pEnd,::std::bind2nd(m_aEqualFunctor,lhs)) != pEnd); return aRet; @@ -224,14 +224,14 @@ namespace // ----------------------------------------------------------------------------- void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection, - const Sequence< ::rtl::OUString>& _rTables, - const Sequence< ::rtl::OUString>& _rViews + const Sequence< OUString>& _rTables, + const Sequence< OUString>& _rViews ) { TNames aTables; aTables.resize(_rTables.getLength()); - const ::rtl::OUString* pIter = _rTables.getConstArray(); - const ::rtl::OUString* pEnd = _rTables.getConstArray() + _rTables.getLength(); + const OUString* pIter = _rTables.getConstArray(); + const OUString* pEnd = _rTables.getConstArray() + _rTables.getLength(); try { Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW ); @@ -248,9 +248,9 @@ void OTableTreeListBox::UpdateTableList( //------------------------------------------------------------------------ namespace { - ::std::vector< ::rtl::OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex ) + ::std::vector< OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex ) { - ::std::vector< ::rtl::OUString > aStrings; + ::std::vector< OUString > aStrings; Reference< XRow > xRow( _rxMetaDataResult, UNO_QUERY_THROW ); while ( _rxMetaDataResult->next() ) aStrings.push_back( xRow->getString( _nColumnIndex ) ); @@ -322,12 +322,12 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn // implAddEntry) bool bCatalogs = bSupportsCatalogs && xMeta->isCatalogAtStart(); - ::std::vector< ::rtl::OUString > aFolderNames( lcl_getMetaDataStrings_throw( + ::std::vector< OUString > aFolderNames( lcl_getMetaDataStrings_throw( bCatalogs ? xMeta->getCatalogs() : xMeta->getSchemas(), 1 ) ); sal_Int32 nFolderType = bCatalogs ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; SvTreeListEntry* pRootEntry = getAllObjectsEntry(); - for ( ::std::vector< ::rtl::OUString >::const_iterator folder = aFolderNames.begin(); + for ( ::std::vector< OUString >::const_iterator folder = aFolderNames.begin(); folder != aFolderNames.end(); ++folder ) @@ -439,7 +439,7 @@ void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rSt //------------------------------------------------------------------------ SvTreeListEntry* OTableTreeListBox::implAddEntry( const Reference< XDatabaseMetaData >& _rxMeta, - const ::rtl::OUString& _rTableName, + const OUString& _rTableName, sal_Bool _bCheckName ) { @@ -448,7 +448,7 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry( return NULL; // split the complete name into it's components - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; qualifiedNameComponents( _rxMeta, _rTableName, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); SvTreeListEntry* pParentEntry = getAllObjectsEntry(); @@ -462,9 +462,9 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry( // +- catalog // +- table sal_Bool bCatalogAtStart = _rxMeta->isCatalogAtStart(); - const ::rtl::OUString& rFirstName = bCatalogAtStart ? sCatalog : sSchema; + const OUString& rFirstName = bCatalogAtStart ? sCatalog : sSchema; const sal_Int32 nFirstFolderType = bCatalogAtStart ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; - const ::rtl::OUString& rSecondName = bCatalogAtStart ? sSchema : sCatalog; + const OUString& rSecondName = bCatalogAtStart ? sSchema : sCatalog; const sal_Int32 nSecondFolderType = bCatalogAtStart ? DatabaseObjectContainer::SCHEMA : DatabaseObjectContainer::CATALOG; if ( !rFirstName.isEmpty() ) @@ -515,7 +515,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry SvTreeListEntry* pParent = GetParent( _pEntry ); sal_Int32 nParentEntryType = pParent ? reinterpret_cast< sal_IntPtr >( pParent->GetUserData() ) : -1; - ::rtl::OUStringBuffer buffer; + OUStringBuffer buffer; if ( nEntryType == DatabaseObjectContainer::CATALOG ) { if ( nParentEntryType == DatabaseObjectContainer::SCHEMA ) @@ -545,7 +545,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry } //------------------------------------------------------------------------ -SvTreeListEntry* OTableTreeListBox::addedTable( const ::rtl::OUString& _rName ) +SvTreeListEntry* OTableTreeListBox::addedTable( const OUString& _rName ) { try { @@ -580,9 +580,9 @@ String OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) cons if ( !impl_getAndAssertMetaData( xMeta ) ) return String(); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + OUString sCatalog; + OUString sSchema; + OUString sTable; SvTreeListEntry* pSchema = GetParent( _pEntry ); if ( pSchema ) @@ -616,7 +616,7 @@ String OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) cons } //------------------------------------------------------------------------ -SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUString& _rName ) +SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const OUString& _rName ) { try { @@ -625,7 +625,7 @@ SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUStri return NULL; // split the complete name into it's components - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; qualifiedNameComponents(xMeta, _rName, sCatalog, sSchema, sName,::dbtools::eInDataManipulation); SvTreeListEntry* pParent = getAllObjectsEntry(); @@ -654,7 +654,7 @@ SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUStri return NULL; } //------------------------------------------------------------------------ -void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName ) +void OTableTreeListBox::removedTable( const OUString& _rName ) { try { diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 6baf9d09bbf3..0bbae366ef9f 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -56,7 +56,7 @@ namespace dbaui namespace { - void lcl_copy(Menu* _pMenu,sal_uInt16 _nMenuId,sal_uInt16 _nMenuPos,ToolBox* _pToolBox,sal_uInt16 _nToolId,const ::rtl::OUString& _sCommand) + void lcl_copy(Menu* _pMenu,sal_uInt16 _nMenuId,sal_uInt16 _nMenuPos,ToolBox* _pToolBox,sal_uInt16 _nToolId,const OUString& _sCommand) { if ( _pMenu->GetItemType(_nMenuPos) != MENUITEM_STRING ) _pToolBox->SetItemImage(_nToolId, _pMenu->GetItemImage(_nMenuId)); @@ -106,19 +106,19 @@ namespace dbaui if ( m_aCommandURL == ".uno:DBNewForm" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewForm") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewView") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewViewSQL") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuery") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuerySql") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReport") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReportAutoPilot"),sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewTable") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewForm") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewView") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewViewSQL") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewQuery") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewQuerySql") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewReport") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewReportAutoPilot"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewTable") ,sal_True)); } else { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Refresh") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBRebuildData") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:Refresh") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBRebuildData") ,sal_True)); } TCommandState::iterator aIter = m_aStates.begin(); @@ -187,13 +187,13 @@ namespace dbaui try { Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getServiceManager()))); - Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument")); + Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(OUString("com.sun.star.sdb.OfficeDatabaseDocument")); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT; - Sequence< ::rtl::OUString> aSeq(1); + Sequence< OUString> aSeq(1); sal_uInt16 nCount = pMenu->GetItemCount(); for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos) { diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 202c54f9c991..6937b06af57b 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -63,7 +63,7 @@ using namespace comphelper; DBG_NAME(OCollectionView) OCollectionView::OCollectionView( Window * pParent ,const Reference< XContent>& _xContent - ,const ::rtl::OUString& _sDefaultName + ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) : ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW)) , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) @@ -115,12 +115,12 @@ Reference< XContent> OCollectionView::getSelectedFolder() const // ----------------------------------------------------------------------------- IMPL_LINK_NOARG(OCollectionView, Save_Click) { - ::rtl::OUString sName = m_aName.GetText(); + OUString sName = m_aName.GetText(); if ( sName.isEmpty() ) return 0; try { - ::rtl::OUString sSubFolder = m_aView.GetCurrentURL(); + OUString sSubFolder = m_aView.GetCurrentURL(); sal_Int32 nIndex = sName.lastIndexOf('/') + 1; if ( nIndex ) { @@ -154,17 +154,17 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) { Sequence< Any > aValues(2); PropertyValue aValue; - aValue.Name = ::rtl::OUString("ResourceName"); + aValue.Name = OUString("ResourceName"); aValue.Value <<= sSubFolder; aValues[0] <<= aValue; - aValue.Name = ::rtl::OUString("ResourceType"); - aValue.Value <<= ::rtl::OUString("folder"); + aValue.Name = OUString("ResourceType"); + aValue.Value <<= OUString("folder"); aValues[1] <<= aValue; InteractionClassification eClass = InteractionClassification_ERROR; ::com::sun::star::ucb::IOErrorCode eError = IOErrorCode_NOT_EXISTING_PATH; - ::rtl::OUString sTemp; + OUString sTemp; InteractiveAugmentedIOException aException(sTemp,Reference<XInterface>(),eClass,eError,aValues); @@ -253,7 +253,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) Reference<XNameAccess> xNameAccess(m_xContent,UNO_QUERY); if ( xNameAccess.is() ) { - ::rtl::OUString sSubFolder = m_aView.GetCurrentURL(); + OUString sSubFolder = m_aView.GetCurrentURL(); sal_Int32 nIndex = sSubFolder.lastIndexOf('/') + 1; sSubFolder = sSubFolder.getToken(0,'/',nIndex); if ( !sSubFolder.isEmpty() ) @@ -284,11 +284,11 @@ void OCollectionView::initCurrentPath() { if ( m_xContent.is() ) { - const ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier(); - const static ::rtl::OUString s_sFormsCID("private:forms"); - const static ::rtl::OUString s_sReportsCID("private:reports"); + const OUString sCID = m_xContent->getIdentifier()->getContentIdentifier(); + const static OUString s_sFormsCID("private:forms"); + const static OUString s_sReportsCID("private:reports"); m_bCreateForm = s_sFormsCID == sCID ; - ::rtl::OUString sPath("/"); + OUString sPath("/"); if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength()) sPath = sCID.copy(s_sFormsCID.getLength()); else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() ) @@ -306,7 +306,7 @@ void OCollectionView::initCurrentPath() m_aUp.Enable(bEnable); } // ----------------------------------------------------------------------------- -::rtl::OUString OCollectionView::getName() const +OUString OCollectionView::getName() const { return m_aName.GetText(); } diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 442eac5ee225..1423ee136f6c 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -227,7 +227,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS: { - const ::rtl::OUString sExt("*.mdb"); + const OUString sExt("*.mdb"); String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -239,7 +239,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS_2007: { - const ::rtl::OUString sAccdb("*.accdb"); + const OUString sAccdb("*.accdb"); String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -253,8 +253,8 @@ DBG_NAME(OConnectionHelper) case ::dbaccess::DST_ODBC: { // collect all ODBC data source names - ::rtl::OUString sCurrDatasource = getURLNoPrefix(); - ::rtl::OUString sDataSource; + OUString sCurrDatasource = getURLNoPrefix(); + OUString sDataSource; if ( getSelectedDataSource(sDataSource,sCurrDatasource) && !sDataSource.isEmpty() ) { setURLNoPrefix(sDataSource); @@ -268,8 +268,8 @@ DBG_NAME(OConnectionHelper) #ifdef _ADO_DATALINK_BROWSE_ case ::dbaccess::DST_ADO: { - ::rtl::OUString sOldDataSource=getURLNoPrefix(); - ::rtl::OUString sNewDataSource; + OUString sOldDataSource=getURLNoPrefix(); + OUString sNewDataSource; HWND hWnd = GetParent()->GetSystemData()->hWnd; sNewDataSource = getAdoDatalink((long)hWnd,sOldDataSource); if ( !sNewDataSource.isEmpty() ) @@ -294,10 +294,10 @@ DBG_NAME(OConnectionHelper) Reference<XMozillaBootstrap> xMozillaBootstrap = MozillaBootstrap::create(xContext); // collect all Mozilla Profiles - ::com::sun::star::uno::Sequence< ::rtl::OUString > list; + ::com::sun::star::uno::Sequence< OUString > list; xMozillaBootstrap->getProfileList( profileType, list ); - const ::rtl::OUString * pArray = list.getConstArray(); + const OUString * pArray = list.getConstArray(); sal_Int32 count = list.getLength(); @@ -308,7 +308,7 @@ DBG_NAME(OConnectionHelper) // execute the select dialog ODatasourceSelectDialog aSelector(GetParent(), aProfiles); - ::rtl::OUString sOldProfile=getURLNoPrefix(); + OUString sOldProfile=getURLNoPrefix(); if (!sOldProfile.isEmpty()) aSelector.Select(sOldProfile); @@ -504,7 +504,7 @@ DBG_NAME(OConnectionHelper) } // ----------------------------------------------------------------------------- - IS_PATH_EXIST OConnectionHelper::pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const + IS_PATH_EXIST OConnectionHelper::pathExists(const OUString& _rURL, sal_Bool bIsFile) const { ::ucbhelper::Content aCheckExistence; sal_Bool bExists = sal_False; @@ -564,7 +564,7 @@ DBG_NAME(OConnectionHelper) INetProtocol eProtocol = aParser.GetProtocol(); - ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels + ::std::vector< OUString > aToBeCreated; // the to-be-created levels // search a level which exists IS_PATH_EXIST eParentExists = PATH_NOT_EXIST; @@ -585,27 +585,27 @@ DBG_NAME(OConnectionHelper) Reference< XCommandEnvironment > xEmptyEnv; ::ucbhelper::Content aParent(aParser.GetMainURL(INetURLObject::NO_DECODE), xEmptyEnv, comphelper::getProcessComponentContext()); - ::rtl::OUString sContentType; + OUString sContentType; if ( INET_PROT_FILE == eProtocol ) { - sContentType = ::rtl::OUString("application/vnd.sun.staroffice.fsys-folder"); + sContentType = OUString("application/vnd.sun.staroffice.fsys-folder"); // the file UCP currently does not support the ContentType property } else { - Any aContentType = aParent.getPropertyValue( ::rtl::OUString("ContentType") ); + Any aContentType = aParent.getPropertyValue( OUString("ContentType") ); aContentType >>= sContentType; } // the properties which need to be set on the new content - Sequence< ::rtl::OUString > aNewDirectoryProperties(1); - aNewDirectoryProperties[0] = ::rtl::OUString("Title"); + Sequence< OUString > aNewDirectoryProperties(1); + aNewDirectoryProperties[0] = OUString("Title"); // the values to be set Sequence< Any > aNewDirectoryAttributes(1); // loop - for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); + for ( ::std::vector< OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); aLocalName != aToBeCreated.rend(); ++aLocalName ) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 1497db425d44..2b9e4980f1d5 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -47,7 +47,7 @@ namespace dbaui FixedText m_aFT_Connection; OConnectionURLEdit m_aConnectionURL; PushButton m_aPB_Connection; - ::rtl::OUString m_eType; // the type can't be changed in this class, so we hold it as member. + OUString m_eType; // the type can't be changed in this class, so we hold it as member. public: @@ -78,7 +78,7 @@ namespace dbaui sal_Int32 checkPathExistence(const String& _rURL); - IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; + IS_PATH_EXIST pathExists(const OUString& _rURL, sal_Bool bIsFile) const; sal_Bool createDirectoryDeep(const String& _rPathNormalized); sal_Bool commitURL(); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index f1cfea4ef953..d46a3504bb8d 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -192,7 +192,7 @@ DBG_NAME(OTextConnectionPageSetup) pCollection = pCollectionItem->getCollection(); OSL_ENSURE(pCollection, "OLDAPConnectionPageSetup::FillItemSet : really need a DSN type collection !"); - OUString sUrl = pCollection->getPrefix( ::rtl::OUString("sdbc:address:ldap:")); + OUString sUrl = pCollection->getPrefix( OUString("sdbc:address:ldap:")); sUrl += m_aETHostServer.GetText(); _rSet.Put(SfxStringItem(DSID_CONNECTURL, sUrl)); bChangedSomething = sal_True; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 405ec96bee38..bcee91b604bc 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -117,9 +117,9 @@ namespace catch(Exception&) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage("ODbAdminDialog::implTranslateProperty: could not set the property "); - sMessage += ::rtl::OString(_rName.getStr(), _rName.getLength(), RTL_TEXTENCODING_ASCII_US); - sMessage += ::rtl::OString("!"); + OString sMessage("ODbAdminDialog::implTranslateProperty: could not set the property "); + sMessage += OString(_rName.getStr(), _rName.getLength(), RTL_TEXTENCODING_ASCII_US); + sMessage += OString("!"); OSL_FAIL(sMessage.getStr()); #endif } @@ -589,9 +589,9 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr catch(Exception&) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString aMessage("ODbDataSourceAdministrationHelper::translateProperties: could not extract the property "); - aMessage += ::rtl::OString(aDirect->second.getStr(), aDirect->second.getLength(), RTL_TEXTENCODING_ASCII_US); - aMessage += ::rtl::OString("!"); + OString aMessage("ODbDataSourceAdministrationHelper::translateProperties: could not extract the property "); + aMessage += OString(aDirect->second.getStr(), aDirect->second.getLength(), RTL_TEXTENCODING_ASCII_US); + aMessage += OString("!"); OSL_FAIL(aMessage.getStr()); #endif } @@ -902,7 +902,7 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< X #if OSL_DEBUG_LEVEL > 0 //------------------------------------------------------------------------- -::rtl::OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) +OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) { OUString aString; @@ -918,7 +918,7 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< X aString = indirectPos->second; } - ::rtl::OString aReturn( aString.getStr(), aString.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString aReturn( aString.getStr(), aString.getLength(), RTL_TEXTENCODING_ASCII_US ); return aReturn; } #endif @@ -937,9 +937,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no string)!" ) ).getStr() ); } @@ -967,9 +967,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no boolean)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no boolean)!" ) ).getStr() ); } @@ -984,9 +984,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no int)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no int)!" ) ).getStr() ); } @@ -1017,9 +1017,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string sequence)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no string sequence)!" ) ).getStr() ); } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 983878c1c3ba..e72c40fe9828 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -168,7 +168,7 @@ namespace dbaui sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString translatePropertyId( sal_Int32 _nId ); + OString translatePropertyId( sal_Int32 _nId ); #endif }; diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index e60236d7608b..b613cd697590 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::NamedValue; using namespace dbaui; -void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) +void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) { // for a number of settings, we do not need to use hard-coded here, but can ask a // central DataSourceUI instance. @@ -67,30 +67,30 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR } } #endif - typedef ::std::pair<sal_uInt16, ::rtl::OUString> TProperties; - TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString("ShowDeleted")) - ,TProperties(DSID_CHARSET,::rtl::OUString("CharSet")) - ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString("FieldDelimiter")) - ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString("StringDelimiter")) - ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString("DecimalDelimiter")) - ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString("ThousandDelimiter")) - ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString("Extension")) - ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString("HeaderLine")) - ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString("SystemDriverSettings")) - ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString("ShutdownDatabase")) - ,TProperties(DSID_CONN_DATAINC,::rtl::OUString("DataCacheSizeIncrement")) - ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString("DataCacheSize")) - ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString("ControlUser")) - ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString("ControlPassword")) - ,TProperties(DSID_USECATALOG,::rtl::OUString("UseCatalog")) - ,TProperties(DSID_CONN_SOCKET,::rtl::OUString("LocalSocket")) - ,TProperties(DSID_NAMED_PIPE,::rtl::OUString("NamedPipe")) - ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString("JavaDriverClass")) - ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString("BaseDN")) - ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString("MaxRowCount")) - ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString("UseSSL")) - ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString("IgnoreCurrency")) - ,TProperties(0,::rtl::OUString()) + typedef ::std::pair<sal_uInt16, OUString> TProperties; + TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,OUString("ShowDeleted")) + ,TProperties(DSID_CHARSET,OUString("CharSet")) + ,TProperties(DSID_FIELDDELIMITER,OUString("FieldDelimiter")) + ,TProperties(DSID_TEXTDELIMITER,OUString("StringDelimiter")) + ,TProperties(DSID_DECIMALDELIMITER,OUString("DecimalDelimiter")) + ,TProperties(DSID_THOUSANDSDELIMITER,OUString("ThousandDelimiter")) + ,TProperties(DSID_TEXTFILEEXTENSION,OUString("Extension")) + ,TProperties(DSID_TEXTFILEHEADER,OUString("HeaderLine")) + ,TProperties(DSID_ADDITIONALOPTIONS,OUString("SystemDriverSettings")) + ,TProperties(DSID_CONN_SHUTSERVICE,OUString("ShutdownDatabase")) + ,TProperties(DSID_CONN_DATAINC,OUString("DataCacheSizeIncrement")) + ,TProperties(DSID_CONN_CACHESIZE,OUString("DataCacheSize")) + ,TProperties(DSID_CONN_CTRLUSER,OUString("ControlUser")) + ,TProperties(DSID_CONN_CTRLPWD,OUString("ControlPassword")) + ,TProperties(DSID_USECATALOG,OUString("UseCatalog")) + ,TProperties(DSID_CONN_SOCKET,OUString("LocalSocket")) + ,TProperties(DSID_NAMED_PIPE,OUString("NamedPipe")) + ,TProperties(DSID_JDBCDRIVERCLASS,OUString("JavaDriverClass")) + ,TProperties(DSID_CONN_LDAP_BASEDN,OUString("BaseDN")) + ,TProperties(DSID_CONN_LDAP_ROWCOUNT,OUString("MaxRowCount")) + ,TProperties(DSID_CONN_LDAP_USESSL,OUString("UseSSL")) + ,TProperties(DSID_IGNORECURRENCY,OUString("IgnoreCurrency")) + ,TProperties(0,OUString()) }; // TODO: This mapping between IDs and property names already exists - in ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper. // Another mapping (which is also duplicated in ODbDataSourceAdministrationHelper) exists in dsmeta.cxx. We should diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 219dfa106200..21854d52a8a8 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -40,7 +40,7 @@ namespace dbaui @param _out_rDetailsIds Will be filled. */ - static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); + static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for Dbase */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 0d1dad07d5d9..05b6bd961bce 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -437,9 +437,9 @@ DBG_NAME(OTextConnectionHelper) { String sExtension; if (m_aRBAccessTextFiles.IsChecked()) - sExtension = rtl::OUString("txt"); + sExtension = OUString("txt"); else if (m_aRBAccessCSVFiles.IsChecked()) - sExtension = rtl::OUString("csv"); + sExtension = OUString("csv"); else { sExtension = m_aETOwnExtension.GetText(); @@ -458,11 +458,11 @@ DBG_NAME(OTextConnectionHelper) return rBox.GetText().copy(0); if ( !( &m_aTextSeparator == &rBox && nPos == (rBox.GetEntryCount()-1) ) ) - return rtl::OUString( + return OUString( static_cast< sal_Unicode >( rList.GetToken(((nPos*2)+1), nTok ).ToInt32())); // somewhat strange ... translates for instance an "32" into " " - return rtl::OUString(); + return OUString(); } void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ) @@ -473,7 +473,7 @@ DBG_NAME(OTextConnectionHelper) for( i=0 ; i<nCnt ; i+=2 ) { - rtl::OUString sTVal( + OUString sTVal( static_cast< sal_Unicode >( rList.GetToken( (i+1), nTok ).ToInt32())); diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index a0d074e87aa9..ad921e5e97e5 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -175,8 +175,8 @@ void OUserAdmin::FillUserNames() m_LB_USER.Clear(); m_aUserNames = m_xUsers->getElementNames(); - const ::rtl::OUString* pBegin = m_aUserNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); + const OUString* pBegin = m_aUserNames.getConstArray(); + const OUString* pEnd = pBegin + m_aUserNames.getLength(); for(;pBegin != pEnd;++pBegin) m_LB_USER.InsertEntry(*pBegin); @@ -223,8 +223,8 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) Reference<XPropertySet> xNewUser = xUserFactory->createDataDescriptor(); if(xNewUser.is()) { - xNewUser->setPropertyValue(PROPERTY_NAME,makeAny(rtl::OUString(aPwdDlg.GetUser()))); - xNewUser->setPropertyValue(PROPERTY_PASSWORD,makeAny(rtl::OUString(aPwdDlg.GetPassword()))); + xNewUser->setPropertyValue(PROPERTY_NAME,makeAny(OUString(aPwdDlg.GetUser()))); + xNewUser->setPropertyValue(PROPERTY_PASSWORD,makeAny(OUString(aPwdDlg.GetPassword()))); Reference<XAppend> xAppend(m_xUsers,UNO_QUERY); if(xAppend.is()) xAppend->appendByDescriptor(xNewUser); @@ -241,7 +241,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) m_xUsers->getByName(sName) >>= xUser; if(xUser.is()) { - ::rtl::OUString sNewPassword,sOldPassword; + OUString sNewPassword,sOldPassword; OPasswordDialog aDlg(this,sName); if(aDlg.Execute() == RET_OK) { diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 6fa2288c6e8b..1764d77895b5 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -52,7 +52,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; + ::com::sun::star::uno::Sequence< OUString> m_aUserNames; String m_UserName; diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 404cefcf5a9c..3da067f29509 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -110,7 +110,7 @@ DBG_NAME(OUserAdminDlg) if ( !aMetaData.supportsUserAdministration( getORB() ) ) { String sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); + throw SQLException(sError,NULL,OUString("S1000") ,0,Any()); } } catch(const SQLException&) @@ -172,7 +172,7 @@ DBG_NAME(OUserAdminDlg) return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const + OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -182,7 +182,7 @@ DBG_NAME(OUserAdminDlg) m_pImpl->clearPassword(); } // ----------------------------------------------------------------------------- - void OUserAdminDlg::setTitle(const ::rtl::OUString& _sTitle) + void OUserAdminDlg::setTitle(const OUString& _sTitle) { SetText(_sTitle); } diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 250a431d6f86..fd2c978b502c 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -168,7 +168,7 @@ namespace dbaui m_aControlDependencies.enableOnRadioCheck( m_aNamedPipeRadio, m_aNamedPipe ); m_aControlDependencies.addController( ::svt::PDialogController( - new TextResetOperatorController( m_aHostName, rtl::OUString("localhost") ) + new TextResetOperatorController( m_aHostName, OUString("localhost") ) ) ); // sockets are available on Unix systems only, named pipes only on Windows diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 558dd9919a9f..3fbebe0a9cd7 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -78,7 +78,7 @@ namespace dbaui } //------------------------------------------------------------------------- - OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const rtl::OString& _rId, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, _rAttrSet) ,m_abEnableRoadmap(sal_False) ,m_pAdminDialog(NULL) @@ -147,7 +147,7 @@ namespace dbaui return 0L; } // ----------------------------------------------------------------------- - sal_Bool OGenericAdministrationPage::getSelectedDataSource(::rtl::OUString& _sReturn,::rtl::OUString& _sCurr) + sal_Bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn,OUString& _sCurr) { // collect all ODBC data source names StringBag aOdbcDatasources; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index e9e11c8a853e..2a9d08c4e741 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -109,7 +109,7 @@ namespace dbaui m_xORB; public: OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet); - OGenericAdministrationPage(Window* _pParent, const rtl::OString& _rId, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); + OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); ~OGenericAdministrationPage(); /// set a handler which gets called every time something on the page has been modified @@ -146,7 +146,7 @@ namespace dbaui @return <FALSE/> if an error occurred, otherwise <TRUE/> */ - sal_Bool getSelectedDataSource(::rtl::OUString& _sReturn,::rtl::OUString& _sCurr); + sal_Bool getSelectedDataSource(OUString& _sReturn,OUString& _sCurr); // svt::IWizardPageController virtual void initializePage(); diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index dcbd89c38dc7..a6dcb45b0f97 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -48,9 +48,9 @@ const CLSID CLSID_DataLinks = { 0x2206CDB2, 0x19C1, 0x11D1, { 0x89, 0xE0, 0x00, BSTR PromptEdit(long hWnd,BSTR connstr); BSTR PromptNew(long hWnd); -::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink) +OUString getAdoDatalink(long hWnd,OUString& oldLink) { - ::rtl::OUString dataLink; + OUString dataLink; if (!oldLink.isEmpty()) { dataLink=reinterpret_cast<sal_Unicode *>(PromptEdit(hWnd,(BSTR)oldLink.getStr())); diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index 523e9a1df854..e5de6c289a28 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -23,6 +23,6 @@ #include <osl/module.h> #include "commontypes.hxx" -::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink); +OUString getAdoDatalink(long hWnd,OUString& oldLink); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 216d8902aaf9..68c5c1a6969c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -100,7 +100,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const if ( !pEntry ) return String(); - ::rtl::OUString aCatalog, aSchema, aTableName; + OUString aCatalog, aSchema, aTableName; SvTreeListEntry* pSchema = m_rTableList.GetParent(pEntry); if(pSchema && pSchema != m_rTableList.getAllObjectsEntry()) { @@ -111,7 +111,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const } aTableName = m_rTableList.GetEntryText(pEntry); - ::rtl::OUString aComposedName; + OUString aComposedName; try { Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW ); @@ -121,7 +121,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const && !xMeta->supportsSchemasInDataManipulation() ) { aCatalog = aSchema; - aSchema = ::rtl::OUString(); + aSchema = OUString(); } aComposedName = ::dbtools::composeTableName( @@ -160,7 +160,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) Reference< XViewsSupplier > xViewSupp; Reference< XNameAccess > xTables, xViews; - Sequence< ::rtl::OUString > sTables, sViews; + Sequence< OUString > sTables, sViews; xTables = xTableSupp->getTables(); if ( xTables.is() ) @@ -185,18 +185,18 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) // if no views are allowed remove the views also out the table name filter if ( !_bAllowViews ) { - const ::rtl::OUString* pTableBegin = sTables.getConstArray(); - const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); - ::std::vector< ::rtl::OUString > aTables(pTableBegin,pTableEnd); + const OUString* pTableBegin = sTables.getConstArray(); + const OUString* pTableEnd = pTableBegin + sTables.getLength(); + ::std::vector< OUString > aTables(pTableBegin,pTableEnd); - const ::rtl::OUString* pViewBegin = sViews.getConstArray(); - const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); + const OUString* pViewBegin = sViews.getConstArray(); + const OUString* pViewEnd = pViewBegin + sViews.getLength(); ::comphelper::TStringMixEqualFunctor aEqualFunctor; for(;pViewBegin != pViewEnd;++pViewBegin) aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end()); - ::rtl::OUString* pTables = aTables.empty() ? 0 : &aTables[0]; - sTables = Sequence< ::rtl::OUString>(pTables, aTables.size()); - sViews = Sequence< ::rtl::OUString>(); + OUString* pTables = aTables.empty() ? 0 : &aTables[0]; + sTables = Sequence< OUString>(pTables, aTables.size()); + sViews = Sequence< OUString>(); } m_rTableList.UpdateTableList( m_xConnection, sTables, sViews ); @@ -258,7 +258,7 @@ QueryListFacade::~QueryListFacade() void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; if ( _rEvent.Accessor >>= sName ) m_rQueryList.InsertEntry( sName ); } @@ -290,10 +290,10 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ ) Reference< XContainer> xContainer(xQueries,UNO_QUERY_THROW); m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer); } - Sequence< ::rtl::OUString > aQueryNames = xQueries->getElementNames(); + Sequence< OUString > aQueryNames = xQueries->getElementNames(); - const ::rtl::OUString* pQuery = aQueryNames.getConstArray(); - const ::rtl::OUString* pQueryEnd = aQueryNames.getConstArray() + aQueryNames.getLength(); + const OUString* pQuery = aQueryNames.getConstArray(); + const OUString* pQueryEnd = aQueryNames.getConstArray() + aQueryNames.getLength(); while ( pQuery != pQueryEnd ) m_rQueryList.InsertEntry( *pQuery++ ); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 0230697af9d3..868d8a82119c 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -463,7 +463,7 @@ namespace dbaui delete pExampleSet; pExampleSet = new SfxItemSet(*GetInputSetImpl()); - const ::rtl::OUString eType = m_pImpl->getDatasourceType(*_pItems); + const OUString eType = m_pImpl->getDatasourceType(*_pItems); DataSourceMetaData aMeta( eType ); const FeatureSet& rFeatures( aMeta.getFeatureSet() ); @@ -489,7 +489,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( const ::rtl::OUString& _sURL ) + bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( const OUString& _sURL ) { DataSourceMetaData aMeta( _sURL ); const FeatureSet& rFeatures( aMeta.getFeatureSet() ); @@ -556,7 +556,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const + OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -568,7 +568,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - void AdvancedSettingsDialog::setTitle(const ::rtl::OUString& _sTitle) + void AdvancedSettingsDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 759c45faacf8..865e2c80565f 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -240,7 +240,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou SetUpdateMode(sal_True); } // ----------------------------------------------------------------------------- -void ODbAdminDialog::setTitle(const ::rtl::OUString& _sTitle) +void ODbAdminDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } @@ -307,7 +307,7 @@ Reference< XDriver > ODbAdminDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -324,30 +324,30 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp _rpPool = NULL; _rppDefaults = NULL; - const ::rtl::OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); + const OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); // create and initialize the defaults _rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1]; SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults - *pCounter++ = new SfxStringItem(DSID_NAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONNECTURL, rtl::OUString()); - *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< ::rtl::OUString >(&sFilterAll, 1)); + *pCounter++ = new SfxStringItem(DSID_NAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONNECTURL, OUString()); + *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< OUString >(&sFilterAll, 1)); *pCounter++ = new DbuTypeCollectionItem(DSID_TYPECOLLECTION, _pTypeCollection); *pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, sal_False); *pCounter++ = new SfxBoolItem(DSID_READONLY, sal_False); - *pCounter++ = new SfxStringItem(DSID_USER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_PASSWORD, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CHARSET, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_USER, OUString()); + *pCounter++ = new SfxStringItem(DSID_PASSWORD, OUString()); + *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, OUString()); + *pCounter++ = new SfxStringItem(DSID_CHARSET, OUString()); *pCounter++ = new SfxBoolItem(DSID_PASSWORDREQUIRED, sal_False); *pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False); *pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False); - *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, rtl::OUString(',')); - *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, rtl::OUString('"')); - *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, rtl::OUString('.')); - *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, rtl::OUString("txt")); + *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, OUString()); + *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, OUString(',')); + *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, OUString('"')); + *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, OUString('.')); + *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, OUString()); + *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, OUString("txt")); *pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True); *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100); @@ -356,16 +356,16 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_DATAINC, 20); *pCounter++ = new SfxInt32Item(DSID_CONN_CACHESIZE, 20); - *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, OUString()); *pCounter++ = new SfxBoolItem(DSID_USECATALOG, sal_False); - *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, OUString()); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100); *pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False); - *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, OUString()); + *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, OUString()); *pCounter++ = new SfxBoolItem(DSID_AUTORETRIEVEENABLED, sal_False); *pCounter++ = new SfxBoolItem(DSID_APPEND_TABLE_ALIAS, sal_False); *pCounter++ = new SfxInt32Item(DSID_MYSQL_PORTNUMBER, 3306); @@ -377,15 +377,15 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_SCHEMA, sal_True); *pCounter++ = new SfxBoolItem(DSID_INDEXAPPENDIX, sal_True); *pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, sal_False); - *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, OUString()); *pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False); - *pCounter++ = new SfxStringItem(DSID_DATABASENAME, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_DATABASENAME, OUString()); *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True); *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True); *pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False); - *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, OUString()); *pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True); - *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, OUString()); *pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT ); *pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100); *pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,sal_False ); @@ -457,7 +457,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp }; OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invalid Ids!"); - _rpPool = new SfxItemPool(rtl::OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, + _rpPool = new SfxItemPool(OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index f600a38335b3..574d18063247 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::svt; -const rtl::OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III")); +const OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III")); // ODbaseIndexDialog ---------------------------------------------------------- DBG_NAME(ODbaseIndexDialog) @@ -309,22 +309,22 @@ void ODbaseIndexDialog::Init() // first assume for all indexes they're free - Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); + Sequence< OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); - ::rtl::OUString aIndexExt("ndx"); - ::rtl::OUString aTableExt("dbf"); + OUString aIndexExt("ndx"); + OUString aTableExt("dbf"); ::std::vector< String > aUsedIndexes; - const ::rtl::OUString *pBegin = aFolderContent.getConstArray(); - const ::rtl::OUString *pEnd = pBegin + aFolderContent.getLength(); + const OUString *pBegin = aFolderContent.getConstArray(); + const OUString *pEnd = pBegin + aFolderContent.getLength(); aURL.SetSmartProtocol(INET_PROT_FILE); for(;pBegin != pEnd;++pBegin) { - rtl::OUString aName; + OUString aName; ::utl::LocalFileHelper::ConvertURLToPhysicalName(pBegin->getStr(),aName); aURL.SetSmartURL(aName); - rtl::OUString aExt = aURL.getExtension(); + OUString aExt = aURL.getExtension(); if (aExt == aIndexExt) { m_aFreeIndexList.push_back( OTableIndex(aURL.getName()) ); @@ -335,15 +335,15 @@ void ODbaseIndexDialog::Init() OTableInfo& rTabInfo = m_aTableInfoList.back(); // open the INF file - aURL.setExtension(rtl::OUString::createFromAscii("inf")); + aURL.setExtension(OUString::createFromAscii("inf")); OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL); Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) ); aInfFile.SetGroup( aGroupIdent ); // fill the indexes list - rtl::OString aNDX; + OString aNDX; sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); - rtl::OString aKeyName; + OString aKeyName; String aEntry; for( sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++ ) @@ -355,7 +355,7 @@ void ODbaseIndexDialog::Init() // yes -> add to the tables index list if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX"))) { - aEntry = rtl::OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding()); + aEntry = OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding()); rTabInfo.aIndexList.push_back( OTableIndex( aEntry ) ); // and remove it from the free index list @@ -439,21 +439,21 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const } aURL.SetSmartURL(aDsn); aURL.Append(aTableName); - aURL.setExtension(rtl::OUString::createFromAscii("inf")); + aURL.setExtension(OUString::createFromAscii("inf")); OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL); Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) ); aInfFile.SetGroup( aGroupIdent ); // first, delete all table indizes - rtl::OString aNDX; + OString aNDX; sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); sal_uInt16 nKey = 0; while( nKey < nKeyCnt ) { // Does the key point to an index file?... - rtl::OString aKeyName = aInfFile.GetKeyName( nKey ); + OString aKeyName = aInfFile.GetKeyName( nKey ); aNDX = aKeyName.copy(0,3); //...if yes, delete index file, nKey is at subsequent key @@ -474,12 +474,12 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const ++aIndex, ++nPos ) { - rtl::OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX")); + OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX")); if( nPos > 0 ) // first index contains no number aKeyName.append(static_cast<sal_Int32>(nPos)); aInfFile.WriteKey( aKeyName.makeStringAndClear(), - rtl::OUStringToOString(aIndex->GetIndexFileName(), + OUStringToOString(aIndex->GetIndexFileName(), osl_getThreadTextEncoding())); } @@ -491,7 +491,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const try { ::ucbhelper::Content aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext()); - aContent.executeCommand( rtl::OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); + aContent.executeCommand( OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); } catch (const Exception& e ) { diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index b8e5273be615..639febdf98f7 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -231,7 +231,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -320,7 +320,7 @@ sal_Bool ODbTypeWizDialog::leaveState(WizardState _nState) return sal_True; } // ----------------------------------------------------------------------------- -void ODbTypeWizDialog::setTitle(const ::rtl::OUString& _sTitle) +void ODbTypeWizDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } @@ -342,7 +342,7 @@ sal_Bool ODbTypeWizDialog::saveDatasource() if ( pPage ) pPage->FillItemSet(*m_pOutSet); - ::rtl::OUString sOldURL; + OUString sOldURL; if ( m_pImpl->getCurrentDataSource().is() ) m_pImpl->getCurrentDataSource()->getPropertyValue(PROPERTY_URL) >>= sOldURL; DataSourceInfoConverter::convert( getORB(), m_pCollection,sOldURL,m_eType,m_pImpl->getCurrentDataSource()); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index a0e8983c68f1..89aebb22b3df 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -176,7 +176,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent ::dbaccess::ODsnTypeCollection::TypeIterator aEnd = m_pCollection->end(); for(PathId i = 1;aIter != aEnd;++aIter,++i) { - const ::rtl::OUString sURLPrefix = aIter.getURLPrefix(); + const OUString sURLPrefix = aIter.getURLPrefix(); svt::RoadmapWizardTypes::WizardPath aPath; aPath.push_back(PAGE_DBSETUPWIZARD_INTRO); m_pCollection->fillPageIds(sURLPrefix,aPath); @@ -199,7 +199,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent ActivatePage(); } -void ODbTypeWizDialogSetup::declareAuthDepPath( const ::rtl::OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths) +void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths) { bool bHasAuthentication = DataSourceMetaData::getAuthentication( _sURL ) != AuthNone; @@ -313,7 +313,7 @@ void lcl_removeUnused(const ::comphelper::NamedValueCollection& _aOld,const ::co } } // ----------------------------------------------------------------------------- -void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const ::rtl::OUString& _sOldURLPrefix,const ::rtl::OUString& _sNewURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource) +void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const OUString& _sOldURLPrefix,const OUString& _sNewURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource) { if ( _pCollection->getPrefix(_sOldURLPrefix) == _pCollection->getPrefix(_sNewURLPrefix) ) return ; @@ -339,7 +339,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() { sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() ); if ( nCreateNewDBIndex == -1 ) - nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString("sdbc:dbase:") ); + nCreateNewDBIndex = m_pCollection->getIndexOf( OUString("sdbc:dbase:") ); OSL_ENSURE( nCreateNewDBIndex != -1, "ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have prevented this!" ); activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), sal_True ); @@ -349,7 +349,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() break; case OGeneralPageWizard::eConnectExternal: { - ::rtl::OUString sOld = m_sURL; + OUString sOld = m_sURL; m_sURL = m_pGeneralPage->GetSelectedType(); DataSourceInfoConverter::convert(getORB(), m_pCollection,sOld,m_sURL,m_pImpl->getCurrentDataSource()); ::dbaccess::DATASOURCE_TYPE eType = VerifyDataSourceType(m_pCollection->determineType(m_sURL)); @@ -469,21 +469,21 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const { - ::rtl::OUString sRet = m_pImpl->getDatasourceType(_rSet); + OUString sRet = m_pImpl->getDatasourceType(_rSet); if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() ) { switch( m_pMySQLIntroPage->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_JDBC: - sRet = ::rtl::OUString("sdbc:mysql:jdbc:"); + sRet = OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sRet = ::rtl::OUString("sdbc:mysql:mysqlc:"); + sRet = OUString("sdbc:mysql:mysqlc:"); break; case OMySQLIntroPageSetup::VIA_ODBC: - sRet = ::rtl::OUString("sdbc:mysql:odbc:"); + sRet = OUString("sdbc:mysql:odbc:"); break; } } @@ -534,16 +534,16 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) break; case PAGE_DBSETUPWIZARD_MYSQL_ODBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:odbc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:odbc:")))); pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet); break; case PAGE_DBSETUPWIZARD_MYSQL_JDBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:jdbc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:jdbc:")))); pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( this, *m_pOutSet); break; case PAGE_DBSETUPWIZARD_MYSQL_NATIVE: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:mysqlc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:mysqlc:")))); pPage = MySQLNativeSetupPage::Create( this, *m_pOutSet); break; @@ -618,17 +618,17 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _ // ----------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup) { - ::rtl::OUString sURLPrefix; + OUString sURLPrefix; switch( _pMySQLIntroPageSetup->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_ODBC: - sURLPrefix = ::rtl::OUString("sdbc:mysql:odbc:"); + sURLPrefix = OUString("sdbc:mysql:odbc:"); break; case OMySQLIntroPageSetup::VIA_JDBC: - sURLPrefix = ::rtl::OUString("sdbc:mysql:jdbc:"); + sURLPrefix = OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sURLPrefix = ::rtl::OUString("sdbc:mysql:mysqlc:"); + sURLPrefix = OUString("sdbc:mysql:mysqlc:"); break; } activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True); @@ -699,7 +699,7 @@ sal_Bool ODbTypeWizDialogSetup::leaveState(WizardState _nState) } // ----------------------------------------------------------------------------- -void ODbTypeWizDialogSetup::setTitle(const ::rtl::OUString& /*_sTitle*/) +void ODbTypeWizDialogSetup::setTitle(const OUString& /*_sTitle*/) { OSL_FAIL( "ODbTypeWizDialogSetup::setTitle: not implemented!" ); // why? @@ -746,7 +746,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aArgs.put( "InteractionHandler", xHandler ); aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); - ::rtl::OUString sPath = m_pImpl->getDocumentUrl( *m_pOutSet ); + OUString sPath = m_pImpl->getDocumentUrl( *m_pOutSet ); xStore->storeAsURL( sPath, aArgs.getPropertyValues() ); if ( !m_pFinalPage || m_pFinalPage->IsDatabaseDocumentToBeRegistered() ) @@ -802,18 +802,18 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //------------------------------------------------------------------------- - ::rtl::OUString ODbTypeWizDialogSetup::getDefaultDatabaseType() const + OUString ODbTypeWizDialogSetup::getDefaultDatabaseType() const { - ::rtl::OUString sEmbeddedURL = m_pCollection->getEmbeddedDatabase(); + OUString sEmbeddedURL = m_pCollection->getEmbeddedDatabase(); ::connectivity::DriversConfig aDriverConfig(getORB()); try { if ( aDriverConfig.getDriverFactoryName(sEmbeddedURL).isEmpty() || !m_pImpl->getDriver(sEmbeddedURL).is() ) - sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); + sEmbeddedURL = OUString("sdbc:dbase:"); } catch(const Exception&) { - sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); + sEmbeddedURL = OUString("sdbc:dbase:"); } return sEmbeddedURL; @@ -822,8 +822,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() //------------------------------------------------------------------------- void ODbTypeWizDialogSetup::CreateDatabase() { - ::rtl::OUString sUrl; - ::rtl::OUString eType = getDefaultDatabaseType(); + OUString sUrl; + OUString eType = getDefaultDatabaseType(); if ( m_pCollection->isEmbeddedDatabase(eType) ) { sUrl = eType; @@ -839,7 +839,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() INetURLObject aDBPathURL(m_sWorkPath); aDBPathURL.Append(m_aDocURL.getBase()); createUniqueFolderName(&aDBPathURL); - ::rtl::OUString sPrefix = eType; + OUString sPrefix = eType; sUrl = aDBPathURL.GetMainURL( INetURLObject::NO_DECODE); xSimpleFileAccess->createFolder(sUrl); sUrl = sPrefix.concat(sUrl); @@ -849,14 +849,14 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //------------------------------------------------------------------------- - void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const ::rtl::OUString& _sPath) + void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const OUString& _sPath) { Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); Reference< XDatabaseContext > xDatabaseContext( DatabaseContext::create(getORB()) ); Reference< XNameAccess > xNameAccessDatabaseContext(xDatabaseContext, UNO_QUERY_THROW ); INetURLObject aURL( _sPath ); - ::rtl::OUString sFilename = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - ::rtl::OUString sDatabaseName = ::dbtools::createUniqueName(xNameAccessDatabaseContext, sFilename,sal_False); + OUString sFilename = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString sDatabaseName = ::dbtools::createUniqueName(xNameAccessDatabaseContext, sFilename,sal_False); xDatabaseContext->registerObject(sDatabaseName, xDatasource); } @@ -874,9 +874,9 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() INetURLObject aWorkURL( m_sWorkPath ); aFileDlg.SetDisplayFolder( aWorkURL.GetMainURL( INetURLObject::NO_DECODE )); - ::rtl::OUString sDefaultName = String( ModuleRes( STR_DATABASEDEFAULTNAME ) ); - ::rtl::OUString sExtension = pFilter->GetDefaultExtension(); - sDefaultName += sExtension.replaceAt( 0, 1, ::rtl::OUString() ); + OUString sDefaultName = String( ModuleRes( STR_DATABASEDEFAULTNAME ) ); + OUString sExtension = pFilter->GetDefaultExtension(); + sDefaultName += sExtension.replaceAt( 0, 1, OUString() ); aWorkURL.Append( sDefaultName ); sDefaultName = createUniqueFileName( aWorkURL ); aFileDlg.SetFileName( sDefaultName ); @@ -890,7 +890,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() if( m_aDocURL.GetProtocol() != INET_PROT_NOT_VALID ) { - ::rtl::OUString sFileName = m_aDocURL.GetMainURL( INetURLObject::NO_DECODE ); + OUString sFileName = m_aDocURL.GetMainURL( INetURLObject::NO_DECODE ); if ( ::utl::UCBContentHelper::IsDocument(sFileName) ) ::utl::UCBContentHelper::Kill(sFileName); m_pOutSet->Put(SfxStringItem(DSID_DOCUMENT_URL, sFileName)); @@ -904,7 +904,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void ODbTypeWizDialogSetup::createUniqueFolderName(INetURLObject* pURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); - :: rtl::OUString sLastSegmentName = pURL->getName(); + :: OUString sLastSegmentName = pURL->getName(); sal_Bool bFolderExists = sal_True; sal_Int32 i = 1; while (bFolderExists == sal_True) @@ -913,7 +913,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() if (bFolderExists == sal_True) { i++; - pURL->setName(sLastSegmentName.concat(::rtl::OUString::valueOf(i))); + pURL->setName(sLastSegmentName.concat(OUString::valueOf(i))); } } } @@ -922,7 +922,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); - ::rtl::OUString BaseName = _rURL.getBase(); + OUString BaseName = _rURL.getBase(); sal_Bool bElementExists = sal_True; @@ -932,7 +932,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() bElementExists = xSimpleFileAccess->exists( aExistenceCheck.GetMainURL( INetURLObject::NO_DECODE ) ); if ( bElementExists ) { - aExistenceCheck.setBase( BaseName.concat( ::rtl::OUString::valueOf( i ) ) ); + aExistenceCheck.setBase( BaseName.concat( OUString::valueOf( i ) ) ); ++i; } } @@ -957,11 +957,11 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() Reference< XComponentLoader > m_xFrameLoader; Reference< XDesktop2 > m_xDesktop; Reference< XInteractionHandler2 > m_xInteractionHandler; - ::rtl::OUString m_sURL; + OUString m_sURL; OAsyncronousLink m_aAsyncCaller; public: - AsyncLoader( const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rURL ); + AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ); void doLoadAsync(); @@ -976,7 +976,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() }; // ............................................................................. - AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rURL ) + AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ) :m_sURL( _rURL ) ,m_aAsyncCaller( LINK( this, AsyncLoader, OnOpenDocument ) ) { @@ -1023,7 +1023,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aLoadArgs >>= aLoadArgPV; m_xFrameLoader->loadComponentFromURL( m_sURL, - ::rtl::OUString( "_default" ), + OUString( "_default" ), FrameSearchFlag::ALL, aLoadArgPV ); diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 61392de4d379..fe5c9721b90f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -38,7 +38,6 @@ namespace dbaui using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; - using ::rtl::OStringBuffer; //==================================================================== //= LargeEntryListBox @@ -226,7 +225,7 @@ DBG_NAME(DirectSQLDialog) OSL_ENSURE(xStatement.is(), "DirectSQLDialog::implExecuteStatement: no statement returned by the connection!"); // clear the output box - m_aOutput.SetText(rtl::OUString()); + m_aOutput.SetText(OUString()); if (xStatement.is()) { if (OUString(_rStatement).toAsciiUpperCase().startsWith("SELECT") && m_pShowOutput->IsChecked()) @@ -239,7 +238,7 @@ DBG_NAME(DirectSQLDialog) while (xResultSet->next()) { // initialise the output line for each row - String out = ::rtl::OUString(""); + String out = OUString(""); // work along the columns until that are none left int i = 1; try @@ -247,7 +246,7 @@ DBG_NAME(DirectSQLDialog) for (;;) { // be dumb, treat everything as a string - out += xRow->getString(i) + ::rtl::OUString(","); + out += xRow->getString(i) + OUString(","); i++; } } @@ -256,7 +255,7 @@ DBG_NAME(DirectSQLDialog) { } // report the output - addOutputText(::rtl::OUString(out)); + addOutputText(OUString(out)); } } else { // execute it @@ -298,7 +297,7 @@ DBG_NAME(DirectSQLDialog) void DirectSQLDialog::addOutputText(const String& _rMessage) { String sAppendMessage = _rMessage; - sAppendMessage += rtl::OUString("\n"); + sAppendMessage += OUString("\n"); String sCompleteMessage = m_aOutput.GetText(); sCompleteMessage += sAppendMessage; diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index bcb599f97952..18d934094ccc 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -92,11 +92,11 @@ OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, sal_Int32 _nFlags) :m_aDescription(_pParent, ModuleRes (FT_DESCRIPTION)) ,m_aCatalogLbl(_pParent, ModuleRes (FT_CATALOG)) - ,m_aCatalog(_pParent, ModuleRes (ET_CATALOG), ::rtl::OUString()) + ,m_aCatalog(_pParent, ModuleRes (ET_CATALOG), OUString()) ,m_aSchemaLbl(_pParent, ModuleRes (FT_SCHEMA)) - ,m_aSchema(_pParent, ModuleRes (ET_SCHEMA), ::rtl::OUString()) + ,m_aSchema(_pParent, ModuleRes (ET_SCHEMA), OUString()) ,m_aLabel(_pParent, ModuleRes (FT_TITLE)) - ,m_aTitle(_pParent, ModuleRes (ET_TITLE), ::rtl::OUString()) + ,m_aTitle(_pParent, ModuleRes (ET_TITLE), OUString()) ,m_aPB_OK(_pParent, ModuleRes( PB_OK ) ) ,m_aPB_CANCEL(_pParent, ModuleRes( PB_CANCEL )) ,m_aPB_HELP(_pParent, ModuleRes( PB_HELP)) @@ -112,7 +112,7 @@ OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, if ( m_xMetaData.is() ) { - ::rtl::OUString sExtraNameChars( m_xMetaData->getExtraNameCharacters() ); + OUString sExtraNameChars( m_xMetaData->getExtraNameCharacters() ); m_aCatalog.setAllowedChars( sExtraNameChars ); m_aSchema.setAllowedChars( sExtraNameChars ); m_aTitle.setAllowedChars( sExtraNameChars ); @@ -156,7 +156,7 @@ namespace typedef Reference< XResultSet > (SAL_CALL XDatabaseMetaData::*FGetMetaStrings)(); void lcl_fillComboList( ComboBox& _rList, const Reference< XConnection >& _rxConnection, - FGetMetaStrings _GetAll, const ::rtl::OUString& _rCurrent ) + FGetMetaStrings _GetAll, const OUString& _rCurrent ) { try { @@ -164,7 +164,7 @@ namespace Reference< XResultSet > xRes = (xMetaData.get()->*_GetAll)(); Reference< XRow > xRow( xRes, UNO_QUERY_THROW ); - ::rtl::OUString sValue; + OUString sValue; while ( xRes->next() ) { sValue = xRow->getString( 1 ); @@ -248,7 +248,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, OSL_ENSURE(m_pImpl->m_xMetaData.is(),"The metadata can not be null!"); if(m_pImpl->m_aName.Search('.') != STRING_NOTFOUND) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData, m_pImpl->m_aName, sCatalog, @@ -327,7 +327,7 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton) { m_pImpl->m_aName = m_pImpl->m_aTitle.GetText(); - ::rtl::OUString sNameToCheck( m_pImpl->m_aName ); + OUString sNameToCheck( m_pImpl->m_aName ); if ( m_pImpl->m_nType == CommandType::TABLE ) { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index db56e6af9465..3fe579f10139 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -142,7 +142,7 @@ IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ ) // ----------------------------------------------------------------------------- void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { - ::rtl::OUString sSelected; + OUString sSelected; if (m_aDatasource.GetEntryCount()) sSelected = m_aDatasource.GetSelectEntry(); m_aDatasource.Clear(); diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 5117f2ec50bd..fb3bbf162da1 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -58,7 +58,7 @@ namespace dbaui //= OGeneralPage //========================================================================= //------------------------------------------------------------------------- - OGeneralPage::OGeneralPage( Window* pParent, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) + OGeneralPage::OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) :OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems ) ,m_pSpecialMessage ( NULL ) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN ) diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index a10e5ff10c38..197b1bc5dc22 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -38,7 +38,7 @@ namespace dbaui class OGeneralPage : public OGenericAdministrationPage { protected: - OGeneralPage( Window* pParent, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); + OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); ~OGeneralPage(); private: diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 50c874248831..0530b1f9cb1e 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -97,9 +97,9 @@ namespace dbaui { } - extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars); + extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars); //------------------------------------------------------------------ - sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const rtl::OUString& _rNewText ) + sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const OUString& _rNewText ) { // first check if this is valid SQL92 name if ( isSQL92CheckEnabled(m_xConnection) ) @@ -107,7 +107,7 @@ namespace dbaui Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData(); if ( xMeta.is() ) { - ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(_rNewText, xMeta->getExtraNameCharacters()); + OUString sAlias = ::dbtools::convertName2SQLName(_rNewText, xMeta->getExtraNameCharacters()); if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() ) ? sAlias != _rNewText @@ -173,13 +173,13 @@ namespace dbaui //================================================================== DBG_NAME(DbaIndexDialog) //------------------------------------------------------------------ - DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, + DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames, const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) ,m_xConnection(_rxConnection) - ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString("dbaccess.tabledesign.indexdialog")) + ,m_aGeometrySettings(E_DIALOG, OUString("dbaccess.tabledesign.indexdialog")) ,m_aActions (this, ModuleRes(TLB_ACTIONS)) ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 4bb717831cad..74b6acd6fd8c 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -219,13 +219,13 @@ DBG_NAME(IndexFieldsControl) sal_Int32 nWidthAsc = GetTextWidth(m_sAscendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); sal_Int32 nWidthDesc = GetTextWidth(m_sDescendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); // maximum plus some additional space - return (nWidthAsc > nWidthDesc ? nWidthAsc : nWidthDesc) + GetTextWidth(rtl::OUString('0')) * 2; + return (nWidthAsc > nWidthDesc ? nWidthAsc : nWidthDesc) + GetTextWidth(OUString('0')) * 2; } return EditBrowseBox::GetTotalCellWidth(_nRow, _nColId); } //------------------------------------------------------------------ - void IndexFieldsControl::Init(const Sequence< ::rtl::OUString >& _rAvailableFields) + void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields) { RemoveColumns(); @@ -249,7 +249,7 @@ DBG_NAME(IndexFieldsControl) nOther = GetTextWidth(m_sDescendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); nSortOrderColumnWidth = nSortOrderColumnWidth > nOther ? nSortOrderColumnWidth : nOther; // (plus some additional space) - nSortOrderColumnWidth += GetTextWidth(rtl::OUString('0')) * 2; + nSortOrderColumnWidth += GetTextWidth(OUString('0')) * 2; InsertDataColumn(COLUMN_ID_ORDER, sColumnName, nSortOrderColumnWidth, HIB_STDSTYLE, 1); m_pSortingCell = new ListBoxControl(&GetDataWindow()); @@ -271,8 +271,8 @@ DBG_NAME(IndexFieldsControl) m_pFieldNameCell = new ListBoxControl(&GetDataWindow()); m_pFieldNameCell->InsertEntry(String()); m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); - const ::rtl::OUString* pFields = _rAvailableFields.getConstArray(); - const ::rtl::OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); + const OUString* pFields = _rAvailableFields.getConstArray(); + const OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); for (;pFields < pFieldsEnd; ++pFields) m_pFieldNameCell->InsertEntry(*pFields); } diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index e4a589e8e5b0..d6434010e1ab 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -122,7 +122,7 @@ OOdbcLibWrapper::OOdbcLibWrapper() //------------------------------------------------------------------------- sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) { - m_sLibPath = ::rtl::OUString::createFromAscii(_pLibPath); + m_sLibPath = OUString::createFromAscii(_pLibPath); #ifdef HAVE_ODBC_SUPPORT // load the module m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); @@ -147,7 +147,7 @@ void OOdbcLibWrapper::unload() //------------------------------------------------------------------------- oslGenericFunction OOdbcLibWrapper::loadSymbol(const sal_Char* _pFunctionName) { - return osl_getFunctionSymbol(m_pOdbcLib, ::rtl::OUString::createFromAscii(_pFunctionName).pData); + return osl_getFunctionSymbol(m_pOdbcLib, OUString::createFromAscii(_pFunctionName).pData); } //------------------------------------------------------------------------- @@ -281,7 +281,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) break; else { - ::rtl::OUString aCurrentDsn(reinterpret_cast<const char*>(szDSN),pcbDSN, nTextEncoding); + OUString aCurrentDsn(reinterpret_cast<const char*>(szDSN),pcbDSN, nTextEncoding); _rNames.insert(aCurrentDsn); } } @@ -343,7 +343,7 @@ bool OOdbcManagement::manageDataSources_async() // this is done in an external process, due to #i78733# // (and note this whole functionality is supported on Windows only, ATM) - ::rtl::OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); + OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); ::rtl::Bootstrap::expandMacros( sExecutableName ); //TODO: detect failure oslProcess hProcessHandle(0); oslProcessError eError = osl_executeProcess( sExecutableName.pData, NULL, 0, 0, NULL, NULL, NULL, 0, &hProcessHandle ); diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 7ecadd29c9e9..1feeab014c40 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -48,7 +48,7 @@ namespace dbaui class OOdbcLibWrapper { oslModule m_pOdbcLib; // the library handle - ::rtl::OUString m_sLibPath; // the path to the library + OUString m_sLibPath; // the path to the library public: #ifdef HAVE_ODBC_SUPPORT @@ -56,7 +56,7 @@ public: #else sal_Bool isLoaded() const { return sal_False; } #endif - ::rtl::OUString getLibraryName() const { return m_sLibPath; } + OUString getLibraryName() const { return m_sLibPath; } protected: #ifndef HAVE_ODBC_SUPPORT diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 130ee03ab2a9..381291e661f8 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -107,9 +107,9 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, try { // ... also write it into the remaining fields - Sequence< ::rtl::OUString> aNames = m_xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = m_xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); Reference<XPropertySet> xColumn; for(;pIter != pEnd;++pIter) { @@ -306,7 +306,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom sal_Bool bHaving = sal_False; try { - ::rtl::OUString sTableName; + OUString sTableName; sal_Bool bFunction = sal_False; _rFilter.Name = _rField.GetSelectEntry(); Reference< XPropertySet > xColumn = getQueryColumn(_rFilter.Name); @@ -322,26 +322,26 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom { // properly quote all parts of the table name, so // e.g. <schema>.<table> becomes "<schema>"."<table>" - ::rtl::OUString aCatlog,aSchema,aTable; + OUString aCatlog,aSchema,aTable; ::dbtools::qualifiedNameComponents( m_xMetaData, sTableName, aCatlog, aSchema, aTable, ::dbtools::eInDataManipulation ); sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, sal_True, ::dbtools::eInDataManipulation ); } } xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; - static ::rtl::OUString sAgg("AggregateFunction"); + static OUString sAgg("AggregateFunction"); if ( xInfo->hasPropertyByName(sAgg) ) xColumn->getPropertyValue(sAgg) >>= bHaving; - static ::rtl::OUString sFunction("Function"); + static OUString sFunction("Function"); if ( xInfo->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } if ( !bFunction ) { - const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + const OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : OUString(); _rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name); if ( !sTableName.isEmpty() ) { - static ::rtl::OUString sSep("."); + static OUString sSep("."); sTableName += sSep; sTableName += _rFilter.Name; _rFilter.Name = sTableName; @@ -360,12 +360,12 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom if ( _rFilter.Handle == SQLFilterOperator::LIKE || _rFilter.Handle == SQLFilterOperator::NOT_LIKE ) ::Replace_OS_PlaceHolder( sPredicateValue ); - _rFilter.Value <<= ::rtl::OUString(sPredicateValue); + _rFilter.Value <<= OUString(sPredicateValue); } return bHaving; } -Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFieldName ) const +Reference< XPropertySet > DlgFilterCrit::getColumn( const OUString& _rFieldName ) const { Reference< XPropertySet > xColumn; try @@ -376,15 +376,15 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns(); if ( xColumns.is() && !xColumn.is() ) { - Sequence< ::rtl::OUString> aSeq = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = xColumns->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xProp(xColumns->getByName(*pIter),UNO_QUERY); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { - ::rtl::OUString sRealName; + OUString sRealName; xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; if ( sRealName == _rFieldName ) { @@ -404,7 +404,7 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie return xColumn; } -Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const ::rtl::OUString& _rFieldName ) const +Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const OUString& _rFieldName ) const { Reference< XPropertySet > xColumn; try @@ -424,7 +424,7 @@ Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const ::rtl::OUString& Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueInput ) const { // the name - ::rtl::OUString sField; + OUString sField; if ( &_rValueInput == &aET_WHEREVALUE1 ) { sField = aLB_WHEREFIELD1.GetSelectEntry(); @@ -455,7 +455,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) // and normalize it's content if ( xColumn.is() ) { - ::rtl::OUString sText( _pField->GetText() ); + OUString sText( _pField->GetText() ); m_aPredicateInput.normalizePredicateString( sText, xColumn ); _pField->SetText( sText ); } @@ -467,7 +467,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr ) { DBG_CHKTHIS(DlgFilterCrit,NULL); - ::rtl::OUString aCondition; + OUString aCondition; _rItem.Value >>= aCondition; String aStr = aCondition; if ( _rItem.Handle == SQLFilterOperator::LIKE || @@ -542,7 +542,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo if ( pColumnListControl && pPredicateListControl && pPredicateValueControl ) { - ::rtl::OUString sName; + OUString sName; if ( xColumn.is() ) xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; else @@ -555,7 +555,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo pPredicateListControl->SelectEntryPos( GetSelectionPos( (sal_Int32)_rItem.Handle, *pPredicateListControl ) ); // initially normalize this value - ::rtl::OUString aString( aStr ); + OUString aString( aStr ); m_aPredicateInput.normalizePredicateString( aString, xColumn ); pPredicateValueControl->SetText( aString ); } diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 33d1bef259c3..60860c32d4cc 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -99,9 +99,9 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent, try { // ... also the remaining fields - Sequence< ::rtl::OUString> aNames = m_xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = m_xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); Reference<XPropertySet> xColumn; for(;pIter != pEnd;++pIter) { @@ -154,8 +154,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { try { - const ::rtl::OUString sNameProperty = ::rtl::OUString( "Name" ); - const ::rtl::OUString sAscendingProperty = ::rtl::OUString( "IsAscending" ); + const OUString sNameProperty = OUString( "Name" ); + const OUString sAscendingProperty = OUString( "IsAscending" ); Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW ); sal_Int32 nColumns = xOrderColumns->getCount(); @@ -166,7 +166,7 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { Reference< XPropertySet > xColumn( xOrderColumns->getByIndex( i ), UNO_QUERY_THROW ); - ::rtl::OUString sColumnName; + OUString sColumnName; sal_Bool bIsAscending( sal_True ); xColumn->getPropertyValue( sNameProperty ) >>= sColumnName; @@ -215,23 +215,23 @@ void DlgOrderCrit::EnableLines() } } -::rtl::OUString DlgOrderCrit::GetOrderList( ) const +OUString DlgOrderCrit::GetOrderList( ) const { DBG_CHKTHIS(DlgOrderCrit,NULL); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); - ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); - static const ::rtl::OUString sDESC(" DESC "); - static const ::rtl::OUString sASC(" ASC "); + OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : OUString(); + static const OUString sDESC(" DESC "); + static const OUString sASC(" ASC "); Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns(); - ::rtl::OUString sOrder; + OUString sOrder; for( sal_uInt16 i=0 ; i<DOG_ROWS; i++ ) { if(m_aColumnList[i]->GetSelectEntryPos() != 0) { if(!sOrder.isEmpty()) - sOrder += ::rtl::OUString(","); + sOrder += OUString(","); String sName = m_aColumnList[i]->GetSelectEntry(); try @@ -242,10 +242,10 @@ void DlgOrderCrit::EnableLines() { if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { - ::rtl::OUString sRealName; + OUString sRealName; xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; sName = sRealName; - static ::rtl::OUString sFunction("Function"); + static OUString sFunction("Function"); if ( xColumn->getPropertySetInfo()->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 4b3c1a51ee2d..d263417cb5e6 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -216,11 +216,11 @@ namespace //------------------------------------------------------------------------------ /// strips the [OOoBase] vendor identifier from the given error message, if applicable - ::rtl::OUString lcl_stripOOoBaseVendor( const ::rtl::OUString& _rErrorMessage ) + OUString lcl_stripOOoBaseVendor( const OUString& _rErrorMessage ) { - ::rtl::OUString sErrorMessage( _rErrorMessage ); + OUString sErrorMessage( _rErrorMessage ); - const ::rtl::OUString sVendorIdentifier( ::connectivity::SQLError::getMessagePrefix() ); + const OUString sVendorIdentifier( ::connectivity::SQLError::getMessagePrefix() ); if ( sErrorMessage.indexOf( sVendorIdentifier ) == 0 ) { // characters to strip @@ -630,14 +630,14 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) { lcl_addButton( *this, BUTTON_HELP, false ); - rtl::OUString aTmp; + OUString aTmp; INetURLObject aHID( m_sHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) aTmp = aHID.GetURLPath(); else aTmp = m_sHelpURL; - SetHelpId( rtl::OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) ); + SetHelpId( OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) ); } } @@ -679,7 +679,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) { SetText( utl::ConfigManager::getProductName() + - rtl::OUString( " Base" ) ); + OUString( " Base" ) ); // position and size the controls and the dialog, depending on whether we have one or two texts to display impl_positionControls(); @@ -704,7 +704,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) } //------------------------------------------------------------------------------ -OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const ::rtl::OUString& _rHelpURL ) +OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) ,m_aTitle( this, WB_WORDBREAK | WB_LEFT ) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 7817ddff32c6..d8996a85045f 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -154,7 +154,7 @@ DBG_NAME(OTableSubscriptionPage) } } //------------------------------------------------------------------------ - void OTableSubscriptionPage::implCheckTables(const Sequence< ::rtl::OUString >& _rTables) + void OTableSubscriptionPage::implCheckTables(const Sequence< OUString >& _rTables) { // the meta data for the current connection, used for splitting up table names Reference< XDatabaseMetaData > xMeta; @@ -172,13 +172,13 @@ DBG_NAME(OTableSubscriptionPage) CheckAll(sal_False); // check the ones which are in the list - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; SvTreeListEntry* pRootEntry = m_aTablesList.getAllObjectsEntry(); sal_Bool bAllTables = sal_False; sal_Bool bAllSchemas = sal_False; - const ::rtl::OUString* pIncludeTable = _rTables.getConstArray(); + const OUString* pIncludeTable = _rTables.getConstArray(); for (sal_Int32 i=0; i<_rTables.getLength(); ++i, ++pIncludeTable) { if (xMeta.is()) @@ -221,7 +221,7 @@ DBG_NAME(OTableSubscriptionPage) } //------------------------------------------------------------------------ - void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ) + void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ) { if (!_rTableFilter.getLength()) { // no tables visible @@ -304,11 +304,11 @@ DBG_NAME(OTableSubscriptionPage) Reference<XModifiable> xModi(getDataSourceOrModel(xProp),UNO_QUERY); sal_Bool bModified = ( xModi.is() && xModi->isModified() ); - Sequence< ::rtl::OUString > aNewTableFilter(1); - aNewTableFilter[0] = ::rtl::OUString("%"); + Sequence< OUString > aNewTableFilter(1); + aNewTableFilter[0] = OUString("%"); xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter)); - xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< ::rtl::OUString >() ) ); + xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< OUString >() ) ); Reference< ::com::sun::star::lang::XEventListener> xEvt; aErrorInfo = ::dbaui::createConnection(xProp, m_xORB, xEvt, m_xCurrentConnection); @@ -351,7 +351,7 @@ DBG_NAME(OTableSubscriptionPage) else { // in addition, we need some infos about the connection used - m_sCatalogSeparator = ::rtl::OUString("."); // (default) + m_sCatalogSeparator = OUString("."); // (default) m_bCatalogAtStart = sal_True; // (default) try { @@ -376,7 +376,7 @@ DBG_NAME(OTableSubscriptionPage) // get the current table filter SFX_ITEMSET_GET(_rSet, pTableFilter, OStringListItem, DSID_TABLEFILTER, sal_True); - Sequence< ::rtl::OUString > aTableFilter; + Sequence< OUString > aTableFilter; if (pTableFilter) aTableFilter = pTableFilter->getList(); @@ -464,13 +464,13 @@ DBG_NAME(OTableSubscriptionPage) } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > OTableSubscriptionPage::collectDetailedSelection() const + Sequence< OUString > OTableSubscriptionPage::collectDetailedSelection() const { - Sequence< ::rtl::OUString > aTableFilter; - static const ::rtl::OUString sDot("."); - static const ::rtl::OUString sWildcard("%"); + Sequence< OUString > aTableFilter; + static const OUString sDot("."); + static const OUString sWildcard("%"); - ::rtl::OUString sComposedName; + OUString sComposedName; const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry(); if (!pAllObjectsEntry) return aTableFilter; @@ -484,7 +484,7 @@ DBG_NAME(OTableSubscriptionPage) if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChildren(pEntry)) { // checked and a leaf, which means it's no catalog, no schema, but a real table - ::rtl::OUString sCatalog; + OUString sCatalog; if(m_aTablesList.GetModel()->HasParent(pEntry)) { pSchema = m_aTablesList.GetModel()->GetParent(pEntry); @@ -516,7 +516,7 @@ DBG_NAME(OTableSubscriptionPage) if (bCatalogWildcard) sCatalog = sWildcard; else - sCatalog = ::rtl::OUString(); + sCatalog = OUString(); sCatalog += m_sCatalogSeparator; sCatalog += m_aTablesList.GetEntryText( pCatalog ); } @@ -543,7 +543,7 @@ DBG_NAME(OTableSubscriptionPage) aTableFilter[nOldLen] = sComposedName; // reset the composed name - sComposedName = ::rtl::OUString(); + sComposedName = OUString(); } if (bCatalogWildcard) @@ -584,11 +584,11 @@ DBG_NAME(OTableSubscriptionPage) // create the output string which contains all the table names if ( m_xCurrentConnection.is() ) { // collect the table filter data only if we have a connection - else no tables are displayed at all - Sequence< ::rtl::OUString > aTableFilter; + Sequence< OUString > aTableFilter; if (m_aTablesList.isWildcardChecked(m_aTablesList.getAllObjectsEntry())) { aTableFilter.realloc(1); - aTableFilter[0] = ::rtl::OUString("%", 1, RTL_TEXTENCODING_ASCII_US); + aTableFilter[0] = OUString("%", 1, RTL_TEXTENCODING_ASCII_US); } else { diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 6a64c2e2c31c..9bc084b1e12f 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -46,7 +46,7 @@ namespace dbaui OTableTreeListBox m_aTablesList; FixedText m_aExplanation; - ::rtl::OUString m_sCatalogSeparator; + OUString m_sCatalogSeparator; sal_Bool m_bCatalogAtStart : 1; ::osl::Mutex m_aNotifierMutex; @@ -85,14 +85,14 @@ namespace dbaui /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> */ - void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables); + void implCheckTables(const ::com::sun::star::uno::Sequence< OUString >& _rTables); /// returns the next sibling, if not available, the next sibling of the parent, a.s.o. SvTreeListEntry* implNextSibling(SvTreeListEntry* _pEntry) const; /** return the current selection in <member>m_aTablesList</member> */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > collectDetailedSelection() const; + ::com::sun::star::uno::Sequence< OUString > collectDetailedSelection() const; /// (un)check all entries void CheckAll( sal_Bool bCheck = sal_True ); @@ -101,7 +101,7 @@ namespace dbaui // checks the tables according to the filter given // in oppsofite to implCheckTables, this method handles the case of an empty sequence, too ... - void implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ); + void implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ); }; //......................................................................... diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index cb16f12149c4..6ec8a4140117 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -62,12 +62,12 @@ namespace dbaui public: OCollectionView( Window * pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent - ,const ::rtl::OUString& _sDefaultName + ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); virtual ~OCollectionView(); ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getSelectedFolder() const; - ::rtl::OUString getName() const; + OUString getName() const; }; //......................................................................... } // namespace dbaui diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 81c7d8e20f23..76c290e5f840 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -43,7 +43,7 @@ namespace dbaui mutable TOTypeInfoSP m_pTypeInfo; // default type String m_sTypeNames; // these type names are the ones out of the resource file - ::rtl::OUString m_sAutoIncrementValue; + OUString m_sAutoIncrementValue; sal_Bool m_bAutoIncrementEnabled; protected: virtual void ActivateAggregate( EControlType eType ); @@ -53,7 +53,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual OUString getAutoIncrementValue() const; virtual void CellModified(long nRow, sal_uInt16 nColId ); public: diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 88fb3f938a03..8b532c2933b1 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -63,9 +63,9 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); @@ -75,7 +75,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleComponent diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index bbcdc7f95b62..4ddb87927606 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -45,8 +45,8 @@ namespace dbaui **/ class OConnectionLineData : public ::salhelper::SimpleReferenceObject { - ::rtl::OUString m_aSourceFieldName; - ::rtl::OUString m_aDestFieldName; + OUString m_aSourceFieldName; + OUString m_aDestFieldName; friend bool operator==(const OConnectionLineData& lhs, const OConnectionLineData& rhs); friend bool operator!=(const OConnectionLineData& lhs, const OConnectionLineData& rhs) { return !(lhs == rhs); } @@ -54,29 +54,29 @@ namespace dbaui virtual ~OConnectionLineData(); public: OConnectionLineData(); - OConnectionLineData( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ); + OConnectionLineData( const OUString& rSourceFieldName, const OUString& rDestFieldName ); OConnectionLineData( const OConnectionLineData& rConnLineData ); // provide a copy of own instance (this is somehow more acceptable for me compared to a virtual assignment operator void CopyFrom(const OConnectionLineData& rSource); // member access (write) - void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName) + void SetFieldName(EConnectionSide nWhich, const OUString& strFieldName) { if (nWhich==JTCS_FROM) m_aSourceFieldName = strFieldName; else m_aDestFieldName = strFieldName; } - void SetSourceFieldName( const ::rtl::OUString& rSourceFieldName){ SetFieldName(JTCS_FROM, rSourceFieldName); } - void SetDestFieldName( const ::rtl::OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); } + void SetSourceFieldName( const OUString& rSourceFieldName){ SetFieldName(JTCS_FROM, rSourceFieldName); } + void SetDestFieldName( const OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); } - inline bool clearSourceFieldName() { SetSourceFieldName(::rtl::OUString()); return true;} - inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;} + inline bool clearSourceFieldName() { SetSourceFieldName(OUString()); return true;} + inline bool clearDestFieldName() { SetDestFieldName(OUString()); return true;} // member access (read) - ::rtl::OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; } - ::rtl::OUString GetSourceFieldName() const { return GetFieldName(JTCS_FROM); } - ::rtl::OUString GetDestFieldName() const { return GetFieldName(JTCS_TO); } + OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; } + OUString GetSourceFieldName() const { return GetFieldName(JTCS_FROM); } + OUString GetDestFieldName() const { return GetFieldName(JTCS_TO); } bool Reset(); OConnectionLineData& operator=( const OConnectionLineData& rConnLineData ); diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 60553194015e..27d27a074eaa 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -55,7 +55,7 @@ namespace dbaui class ODatabaseExport { public: - DECLARE_STL_MAP(::rtl::OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns); + DECLARE_STL_MAP(OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns); typedef ::std::vector<TColumns::const_iterator> TColumnVector; typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions; @@ -82,7 +82,7 @@ namespace dbaui SvNumberFormatter* m_pFormatter; SvStream& m_rInputStream; /// for saving the selected tablename - ::rtl::OUString m_sDefaultTableName; + OUString m_sDefaultTableName; String m_sTextToken; ///< cell content String m_sNumToken; ///< SDNUM value @@ -108,7 +108,7 @@ namespace dbaui virtual TypeSelectionPageFactory getTypeSelectionPageFactory() = 0; - void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); + void CreateDefaultColumn(const OUString& _rColumnName); sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); void adjustFormat(); void eraseTokens(); @@ -125,7 +125,7 @@ namespace dbaui @return true when an error occurs */ - sal_Bool executeWizard( const ::rtl::OUString& _sTableName, + sal_Bool executeWizard( const OUString& _sTableName, const ::com::sun::star::uno::Any& _aTextColor, const ::com::sun::star::awt::FontDescriptor& _rFont); @@ -155,7 +155,7 @@ namespace dbaui void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); - inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } + inline void SetTableName(const OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } virtual void release() = 0; diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index c571a111c8ca..1f2648973dbb 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -46,7 +46,7 @@ namespace dbaui short m_nPos; String m_strHelpText; public: - inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + inline OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); } @@ -60,7 +60,7 @@ namespace dbaui } }; inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, - ::rtl::OUString& _rAllowedChars, + OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 715160b7a5dd..54409082f284 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -133,9 +133,9 @@ namespace dbaui sal_Bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; void Contruct(); - OPropNumericEditCtrl* CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const rtl::OString& _sHelpId); + OPropNumericEditCtrl* CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId); FixedText* CreateText(sal_uInt16 _nTextRes); - void InitializeControl(Control* _pControl,const rtl::OString& _sHelpId,bool _bAddChangeHandler); + void InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler); protected: inline void setRightAligned() { m_bRightAligned = true; } @@ -163,7 +163,7 @@ namespace dbaui virtual const OTypeInfoMap* getTypeInfo() const = 0; virtual sal_Bool isAutoIncrementValueEnabled() const = 0; - virtual ::rtl::OUString getAutoIncrementValue() const = 0; + virtual OUString getAutoIncrementValue() const = 0; String BoolStringPersistent(const String& rUIString) const; String BoolStringUI(const String& rPersistentString) const; diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 176541510465..56c5c1a1ec4a 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -41,12 +41,12 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; - ::rtl::OUString m_sName; - ::rtl::OUString m_sTypeName; - ::rtl::OUString m_sDescription; - ::rtl::OUString m_sHelpText; + OUString m_sName; + OUString m_sTypeName; + OUString m_sDescription; + OUString m_sHelpText; - ::rtl::OUString m_sAutoIncrementValue; + OUString m_sAutoIncrementValue; sal_Int32 m_nType; // only used when m_pType is null sal_Int32 m_nPrecision; sal_Int32 m_nScale; @@ -65,15 +65,15 @@ namespace dbaui ,sal_Bool _bUseAsDest = sal_False); ~OFieldDescription(); - void SetName(const ::rtl::OUString& _rName); - void SetDescription(const ::rtl::OUString& _rDescription); - void SetHelpText(const ::rtl::OUString& _sHelptext); + void SetName(const OUString& _rName); + void SetDescription(const OUString& _rDescription); + void SetHelpText(const OUString& _sHelptext); void SetDefaultValue(const ::com::sun::star::uno::Any& _rDefaultValue); void SetControlDefault(const ::com::sun::star::uno::Any& _rControlDefault); - void SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue); + void SetAutoIncrementValue(const OUString& _sAutoIncValue); void SetType(TOTypeInfoSP _pType); void SetTypeValue(sal_Int32 _nType); - void SetTypeName(const ::rtl::OUString& _sTypeName); + void SetTypeName(const OUString& _sTypeName); void SetPrecision(const sal_Int32& _rPrecision); void SetScale(const sal_Int32& _rScale); void SetIsNullable(const sal_Int32& _rIsNullable); @@ -90,13 +90,13 @@ namespace dbaui void FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bForce,sal_Bool _bReset); - ::rtl::OUString GetName() const; - ::rtl::OUString GetDescription() const; - ::rtl::OUString GetHelpText() const; + OUString GetName() const; + OUString GetDescription() const; + OUString GetHelpText() const; ::com::sun::star::uno::Any GetControlDefault() const; - ::rtl::OUString GetAutoIncrementValue() const; + OUString GetAutoIncrementValue() const; sal_Int32 GetType() const; - ::rtl::OUString GetTypeName() const; + OUString GetTypeName() const; sal_Int32 GetPrecision() const; sal_Int32 GetScale() const; sal_Int32 GetIsNullable() const; diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 7bb0c2942300..6a1a60f8de72 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -39,7 +39,7 @@ namespace dbaui TYPEINFO(); OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = String(ModuleRes(nCommentID)); } - virtual rtl::OUString GetComment() const { return m_strComment; } + virtual OUString GetComment() const { return m_strComment; } }; } #endif // DBAUI_GENERALUNDO_HXX diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index b4831ecffc48..537814713b95 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -53,10 +53,10 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const = 0; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; virtual void clearPassword() = 0; virtual sal_Bool saveDatasource() = 0; - virtual void setTitle(const ::rtl::OUString& _sTitle) = 0; + virtual void setTitle(const OUString& _sTitle) = 0; /** enables or disables the user's possibility to confirm the settings diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx b/dbaccess/source/ui/inc/IUpdateHelper.hxx index a09b429b2173..c3036cd3dfee 100644 --- a/dbaccess/source/ui/inc/IUpdateHelper.hxx +++ b/dbaccess/source/ui/inc/IUpdateHelper.hxx @@ -28,7 +28,7 @@ namespace dbaui class SAL_NO_VTABLE IUpdateHelper { public: - virtual void updateString(sal_Int32 _nPos, const ::rtl::OUString& _sValue) = 0; + virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) = 0; virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) = 0; virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) = 0; virtual void updateNull(sal_Int32 _nPos, ::sal_Int32 sqlType) = 0; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index f1aca64ad5cb..0c73e722d489 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -49,9 +49,9 @@ namespace dbaui DECLARE_XTYPEPROVIDER( ) // XServiceInfo - static methods - static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index e10c59782b10..f7477d9ba134 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -151,7 +151,7 @@ namespace dbaui } protected: - TTableWindowData::value_type createTableWindowData(const ::rtl::OUString& _sComposedName,const ::rtl::OUString& _sTableName,const ::rtl::OUString& _sWindowName); + TTableWindowData::value_type createTableWindowData(const OUString& _sComposedName,const OUString& _sTableName,const OUString& _sWindowName); // ask the user if the design should be saved when it is modified virtual short saveModified() = 0; // called when the orignal state should be reseted (first time load) diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 8c972407e05d..6bd1a66f76b6 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -133,7 +133,7 @@ namespace dbaui void NotifyTitleClicked( OTableWindow* pTabWin, const Point rMousePos ); - virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False); + virtual void AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool bNewTable = sal_False); virtual void RemoveTabWin( OTableWindow* pTabWin ); // hide all TabWins (does NOT delete them; they are put in an UNDO action) @@ -261,9 +261,9 @@ namespace dbaui virtual void EnsureVisible(const OTableWindow* _pWin); virtual void EnsureVisible(const Point& _rPoint,const Size& _rSize); - TTableWindowData::value_type createTableWindowData(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName); + TTableWindowData::value_type createTableWindowData(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName); protected: virtual void MouseButtonUp( const MouseEvent& rEvt ); @@ -281,9 +281,9 @@ namespace dbaui /// resizing) is used, as no scrolling can take place while resizing virtual void Command(const CommandEvent& rEvt); - virtual OTableWindowData* CreateImpl(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName); + virtual OTableWindowData* CreateImpl(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName); /** factory method to create table windows diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index ff95e71a6a2b..4b8821295faa 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -68,7 +68,7 @@ namespace dbaui Splitter m_aSplitter; ::com::sun::star::lang::Locale m_aLocale; - ::rtl::OUString m_sDecimalSep; + OUString m_sDecimalSep; OSelectionBrowseBox* m_pSelectionBox; // presents the lower window ChildFocusState m_eChildFocus; @@ -91,9 +91,9 @@ namespace dbaui // check if the statement is correct when not returning false virtual sal_Bool checkStatement(); // set the statement for representation - virtual void setStatement(const ::rtl::OUString& _rsStatement); + virtual void setStatement(const OUString& _rsStatement); // returns the current sql statement - virtual ::rtl::OUString getStatement(); + virtual OUString getStatement(); /// late construction virtual void Construct(); virtual void initialize(); @@ -106,18 +106,18 @@ namespace dbaui void setNoneVisbleRow(sal_Int32 _nRows); ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} - ::rtl::OUString getDecimalSeparator() const { return m_sDecimalSep;} + OUString getDecimalSeparator() const { return m_sDecimalSep;} SqlParseError InsertField( const OTableFieldDescRef& rInfo, sal_Bool bVis=sal_True, sal_Bool bActivate = sal_True); - bool HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const; + bool HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const; // save the position of the table window and the pos of the splitters // called when fields are deleted - void DeleteFields( const ::rtl::OUString& rAliasName ); + void DeleteFields( const OUString& rAliasName ); // called when a table from tabeview was deleted - void TableDeleted(const ::rtl::OUString& rAliasName); + void TableDeleted(const OUString& rAliasName); sal_Int32 getColWidth( sal_uInt16 _nColPos) const; - void fillValidFields(const ::rtl::OUString& strTableName, ComboBox* pFieldList); + void fillValidFields(const OUString& strTableName, ComboBox* pFieldList); void SaveUIConfig(); void stopTimer(); @@ -142,11 +142,11 @@ namespace dbaui ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, const String& _sCriteria, - ::rtl::OUString& _rsErrorMessage, + OUString& _rsErrorMessage, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const; void fillFunctionInfo( const ::connectivity::OSQLParseNode* pNode - ,const ::rtl::OUString& sFunctionTerm + ,const OUString& sFunctionTerm ,OTableFieldDescRef& aInfo); protected: // return the Rectangle where I can paint myself diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index ee7403f176d7..f8d32438165d 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -62,11 +62,11 @@ namespace dbaui /// base class overwritten: create and delete windows /// (not really delete, as it becomes an UndoAction) - virtual void AddTabWin( const ::rtl::OUString& _rTableName, const ::rtl::OUString& _rAliasName, sal_Bool bNewTable = sal_False ); + virtual void AddTabWin( const OUString& _rTableName, const OUString& _rAliasName, sal_Bool bNewTable = sal_False ); virtual void RemoveTabWin(OTableWindow* pTabWin); /// AddTabWin, setting an alias - void AddTabWin(const ::rtl::OUString& strDatabase, const ::rtl::OUString& strTableName, const ::rtl::OUString& strAlias, sal_Bool bNewTable = sal_False); + void AddTabWin(const OUString& strDatabase, const OUString& strTableName, const OUString& strAlias, sal_Bool bNewTable = sal_False); /// search TabWin OQueryTableWindow* FindTable(const String& rAliasName); sal_Bool FindTableFromField(const String& rFieldName, OTableFieldDescRef& rInfo, sal_uInt16& rCnt); @@ -118,9 +118,9 @@ namespace dbaui sal_Bool ExistsAVisitedConn(const OQueryTableWindow* pFrom) const; - virtual OTableWindowData* CreateImpl(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName); + virtual OTableWindowData* CreateImpl(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName); /** opens the join dialog and allows to create a new join connection */ void createNewConnection(); diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index c16e9593d16a..973c011199e0 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -48,8 +48,8 @@ namespace dbaui // check if the statement is correct when not returning false virtual sal_Bool checkStatement(); // set the statement for representation - virtual void setStatement(const ::rtl::OUString& _rsStatement); - virtual ::rtl::OUString getStatement(); + virtual void setStatement(const OUString& _rsStatement); + virtual OUString getStatement(); // allow access to our edit OSqlEdit* getSqlEdit() const { return m_pEdit; } diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index c8fc0809389b..cc07843424c2 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -54,9 +54,9 @@ namespace dbaui // check if the statement is correct when not returning false virtual sal_Bool checkStatement(); // set the statement for representation - virtual void setStatement(const ::rtl::OUString& _rsStatement); + virtual void setStatement(const OUString& _rsStatement); // returns the current sql statement - virtual ::rtl::OUString getStatement(); + virtual OUString getStatement(); /// late construction virtual void Construct(); virtual void initialize(); diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 85d997287bb0..1f86862a5bb7 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -59,7 +59,7 @@ namespace dbaui ORelationTableConnectionData( const ORelationTableConnectionData& rConnData ); ORelationTableConnectionData( const TTableWindowData::value_type& _pReferencingTable, const TTableWindowData::value_type& _pReferencedTable, - const ::rtl::OUString& rConnName = ::rtl::OUString() ); + const OUString& rConnName = OUString() ); virtual ~ORelationTableConnectionData(); virtual void CopyFrom(const OTableConnectionData& rSource); diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index df04f1d03190..b62620f3f1b5 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -41,7 +41,7 @@ namespace dbaui ORelationDesignView* getRelationView() { return static_cast<ORelationDesignView*>( getView() ); } void loadData(); - TTableWindowData::value_type existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const; + TTableWindowData::value_type existsTable(const OUString& _rComposedTableName,sal_Bool _bCase) const; // load the window positions out of the datasource void loadLayoutInformation(); @@ -58,11 +58,11 @@ namespace dbaui virtual sal_Bool Construct(Window* pParent); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() 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 ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -75,7 +75,7 @@ namespace dbaui virtual short saveModified(); virtual void reset(); virtual void impl_initialize(); - virtual ::rtl::OUString getPrivateTitle( ) const; + virtual OUString getPrivateTitle( ) const; DECL_LINK( OnThreadFinished, void* ); }; } diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index 50511b09c0da..c783b46c78a1 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -38,7 +38,7 @@ namespace dbaui bool m_bInRemove; virtual void ConnDoubleClicked( OTableConnection* pConnection ); - virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False); + virtual void AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool bNewTable = sal_False); virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData); diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index cfe88d0ea838..9d638e7c18c4 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -26,11 +26,11 @@ namespace dbaui { class OSQLNameChecker { - ::rtl::OUString m_sAllowedChars; + OUString m_sAllowedChars; sal_Bool m_bOnlyUpperCase; sal_Bool m_bCheck; // true when we should check for invalid chars public: - OSQLNameChecker(const ::rtl::OUString& _rAllowedChars) + OSQLNameChecker(const OUString& _rAllowedChars) :m_sAllowedChars(_rAllowedChars) ,m_bOnlyUpperCase(sal_False) ,m_bCheck(sal_True) @@ -41,7 +41,7 @@ namespace dbaui { m_bOnlyUpperCase = _bUpper; } - void setAllowedChars(const ::rtl::OUString& _rAllowedChars) + void setAllowedChars(const OUString& _rAllowedChars) { m_sAllowedChars = _rAllowedChars; } @@ -50,19 +50,19 @@ namespace dbaui { m_bCheck = _bCheck; } - sal_Bool checkString(const ::rtl::OUString& _sToCheck,::rtl::OUString& _rsCorrected); + sal_Bool checkString(const OUString& _sToCheck,OUString& _rsCorrected); }; //================================================================== class OSQLNameEdit : public Edit ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) + OSQLNameEdit(Window* _pParent,const OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) : Edit(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameEdit(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) + OSQLNameEdit(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : Edit(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { @@ -78,12 +78,12 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameComboBox(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) + OSQLNameComboBox(Window* _pParent,const OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) : ComboBox(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) + OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : ComboBox(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 400a8a7298e6..dd65a4d5f55b 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -71,7 +71,7 @@ namespace dbaui virtual OTableConnectionData* NewInstance() const; sal_Bool SetConnLine( sal_uInt16 nIndex, const String& rSourceFieldName, const String& rDestFieldName ); - sal_Bool AppendConnLine( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ); + sal_Bool AppendConnLine( const OUString& rSourceFieldName, const OUString& rDestFieldName ); /** Deletes list of ConnLines */ void ResetConnLines(); diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index ed8a2dcf92f8..d6097fad863b 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -44,10 +44,10 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sCatalogName; // catalog for update data - ::rtl::OUString m_sSchemaName; // schema for update data - ::rtl::OUString m_sName; // table for update data - ::rtl::OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource + OUString m_sCatalogName; // catalog for update data + OUString m_sSchemaName; // schema for update data + OUString m_sName; // table for update data + OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource String m_sTypeNames; // these type names are the ones out of the resource file TOTypeInfoSP m_pTypeInfo; // fall back when type is unknown because database driver has a failure @@ -65,7 +65,7 @@ namespace dbaui void alterColumns(); void dropPrimaryKey(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getKeyColumns() const; - ::rtl::OUString createUniqueName(const ::rtl::OUString& _rName); + OUString createUniqueName(const OUString& _rName); void reload(); @@ -78,7 +78,7 @@ namespace dbaui virtual void losingConnection( ); - virtual ::rtl::OUString getPrivateTitle( ) const; + virtual OUString getPrivateTitle( ) const; void doEditIndexes(); sal_Bool doSaveDoc(sal_Bool _bSaveAs); @@ -95,7 +95,7 @@ namespace dbaui bool isAutoIncrementPrimaryKey() const; inline sal_Bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } - inline const ::rtl::OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } + inline const OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } virtual void impl_onModifyChanged(); @@ -122,11 +122,11 @@ namespace dbaui virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() 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 ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 65326d9a1b74..01835f762a30 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -65,7 +65,7 @@ namespace dbaui { private: OGenericUnoController* m_pController; - ::rtl::OUString m_sTableNameForAppend; + OUString m_sTableNameForAppend; public: // is needed to describe the drop target @@ -74,7 +74,7 @@ namespace dbaui ::svx::ODataAccessDescriptor aDroppedData; //for transfor the tablename - ::rtl::OUString sDefaultTableName; + OUString sDefaultTableName; String aUrl; SotStorageStreamRef aHtmlRtfStorage; @@ -96,7 +96,7 @@ namespace dbaui The name of the dest data source. */ void pasteTable( const TransferableDataHelper& _rTransData - ,const ::rtl::OUString& _sDestDataSourceName + ,const OUString& _sDestDataSourceName ,const SharedConnection& _xConnection); /** pastes a table into the data source @@ -109,7 +109,7 @@ namespace dbaui */ void pasteTable( SotFormatStringId _nFormatId ,const TransferableDataHelper& _rTransData - ,const ::rtl::OUString& _sDestDataSourceName + ,const OUString& _sDestDataSourceName ,const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF @@ -133,7 +133,7 @@ namespace dbaui The connection */ void asyncCopyTagTable( DropDescriptor& _rDesc - ,const ::rtl::OUString& _sDestDataSourceName + ,const OUString& _sDestDataSourceName ,const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF @@ -151,9 +151,9 @@ namespace dbaui /// returns <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>. sal_Bool isTableFormat(const TransferableDataHelper& _rClipboard) const; - inline void SetTableNameForAppend( const ::rtl::OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; } - inline void ResetTableNameForAppend() { SetTableNameForAppend( ::rtl::OUString() ); } - inline const ::rtl::OUString& GetTableNameForAppend() const { return m_sTableNameForAppend ;} + inline void SetTableNameForAppend( const OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; } + inline void ResetTableNameForAppend() { SetTableNameForAppend( OUString() ); } + inline const OUString& GetTableNameForAppend() const { return m_sTableNameForAppend ;} private: /** pastes a table into the data source @@ -164,21 +164,21 @@ namespace dbaui */ void pasteTable( const ::svx::ODataAccessDescriptor& _rPasteData, - const ::rtl::OUString& _sDestDataSourceName, + const OUString& _sDestDataSourceName, const SharedConnection& _xDestConnection ); /** insert a table into the data source. The source can eihter be a table or a query */ void insertTable( - const ::rtl::OUString& i_rSourceDataSource, + const OUString& i_rSourceDataSource, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_rSourceConnection, - const ::rtl::OUString& i_rCommand, + const OUString& i_rCommand, const sal_Int32 i_nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& i_rSourceRows, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& i_rSelection, const sal_Bool i_bBookmarkSelection, - const ::rtl::OUString& i_rDestDataSource, + const OUString& i_rDestDataSource, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_rDestConnection ); diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 0ab1a19be4d9..8b9e8e473a69 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -40,14 +40,14 @@ namespace dbaui class OTableFieldDesc : public ::salhelper::SimpleReferenceObject { private: - ::std::vector< ::rtl::OUString > + ::std::vector< OUString > m_aCriteria; - ::rtl::OUString m_aTableName; - ::rtl::OUString m_aAliasName; ///< table range - ::rtl::OUString m_aFieldName; ///< column - ::rtl::OUString m_aFieldAlias; ///< column alias - ::rtl::OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE) + OUString m_aTableName; + OUString m_aAliasName; ///< table range + OUString m_aFieldName; ///< column + OUString m_aFieldAlias; ///< column alias + OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE) Window* m_pTabWindow; @@ -65,7 +65,7 @@ namespace dbaui public: OTableFieldDesc(); - OTableFieldDesc(const ::rtl::OUString& rTable, const ::rtl::OUString& rField ); + OTableFieldDesc(const OUString& rTable, const OUString& rField ); OTableFieldDesc(const OTableFieldDesc& rRS); ~OTableFieldDesc(); @@ -80,29 +80,29 @@ namespace dbaui void SetVisible( sal_Bool bVis=sal_True ) { m_bVisible = bVis; } void SetGroupBy( sal_Bool bGb=sal_False ) { m_bGroupBy = bGb; } void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin; } - void SetField( const ::rtl::OUString& rF ) { m_aFieldName = rF; } - void SetFieldAlias( const ::rtl::OUString& rF ) { m_aFieldAlias = rF; } - void SetTable( const ::rtl::OUString& rT ) { m_aTableName = rT; } - void SetAlias( const ::rtl::OUString& rT ) { m_aAliasName = rT; } - void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT; } + void SetField( const OUString& rF ) { m_aFieldName = rF; } + void SetFieldAlias( const OUString& rF ) { m_aFieldAlias = rF; } + void SetTable( const OUString& rT ) { m_aTableName = rT; } + void SetAlias( const OUString& rT ) { m_aAliasName = rT; } + void SetFunction( const OUString& rT ) { m_aFunctionName = rT; } void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; } void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; } void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; } - void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit ); + void SetCriteria( sal_uInt16 nIdx, const OUString& rCrit ); void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; } void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; } void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; } void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; } - ::rtl::OUString GetField() const { return m_aFieldName;} - ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;} - ::rtl::OUString GetTable() const { return m_aTableName;} - ::rtl::OUString GetAlias() const { return m_aAliasName;} - ::rtl::OUString GetFunction() const { return m_aFunctionName;} + OUString GetField() const { return m_aFieldName;} + OUString GetFieldAlias() const { return m_aFieldAlias;} + OUString GetTable() const { return m_aTableName;} + OUString GetAlias() const { return m_aAliasName;} + OUString GetFunction() const { return m_aFunctionName;} sal_Int32 GetDataType() const { return m_eDataType; } ETableFieldType GetFieldType() const { return m_eFieldType; } EOrderDir GetOrderDir() const { return m_eOrderDir; } - ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const; + OUString GetCriteria( sal_uInt16 nIdx ) const; sal_Int32 GetColWidth() const { return m_nColWidth; } sal_Int32 GetFieldIndex() const { return m_nIndex; } Window* GetTabWindow() const { return m_pTabWindow;} @@ -118,15 +118,15 @@ namespace dbaui sal_Bool HasCriteria() const { - ::std::vector< ::rtl::OUString>::const_iterator aIter = m_aCriteria.begin(); - ::std::vector< ::rtl::OUString>::const_iterator aEnd = m_aCriteria.end(); + ::std::vector< OUString>::const_iterator aIter = m_aCriteria.begin(); + ::std::vector< OUString>::const_iterator aEnd = m_aCriteria.end(); for(;aIter != aEnd;++aIter) if(!aIter->isEmpty()) break; return aIter != aEnd; } - const ::std::vector< ::rtl::OUString>& GetCriteria() const { return m_aCriteria; } + const ::std::vector< OUString>& GetCriteria() const { return m_aCriteria; } void Load( const ::com::sun::star::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ); void Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria ); diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 8b054a0c07c5..6d916cfae8af 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -46,10 +46,10 @@ class OTableGrantControl : public ::svt::EditBrowseBox ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable> m_xGrantUser; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aTableNames; + ::com::sun::star::uno::Sequence< OUString> m_aTableNames; mutable TTablePrivilegeMap m_aPrivMap; - ::rtl::OUString m_sUserName; + OUString m_sUserName; ::svt::CheckBoxControl* m_pCheckCell; Edit* m_pEdit; long m_nDataPos; @@ -59,7 +59,7 @@ public: OTableGrantControl( Window* pParent,const ResId& _RsId); virtual ~OTableGrantControl(); void UpdateTables(); - void setUserName(const ::rtl::OUString _sUserName); + void setUserName(const OUString _sUserName); void setGrantUser(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable>& _xGrantUser); void setTablesSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >& _xTablesSup); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 81d2957eccf3..ae46b51dd00a 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -144,9 +144,9 @@ namespace dbaui void Remove(); sal_Bool IsActiveWindow(){ return m_bActive; } - ::rtl::OUString GetTableName() const { return m_pData->GetTableName(); } - ::rtl::OUString GetWinName() const { return m_pData->GetWinName(); } - ::rtl::OUString GetComposedName() const { return m_pData->GetComposedName(); } + OUString GetTableName() const { return m_pData->GetTableName(); } + OUString GetWinName() const { return m_pData->GetWinName(); } + OUString GetComposedName() const { return m_pData->GetComposedName(); } OTableWindowListBox* GetListBox() const { return m_pListBox; } TTableWindowData::value_type GetData() const { return m_pData; } OTableWindowTitle* GetTitleCtrl() { return &m_aTitle; } @@ -155,7 +155,7 @@ namespace dbaui @return The composed name or the window name. */ - virtual ::rtl::OUString GetName() const = 0; + virtual OUString GetName() const = 0; inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetTable() const { return m_pData->getTable(); } @@ -186,7 +186,7 @@ namespace dbaui // do I have connections to the outside? sal_Bool ExistsAConn() const; - void EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields); + void EnumValidFields(::std::vector< OUString>& arrstrFields); /** clears the listbox inside. Must be called be the dtor is called. */ diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index 30867659c6f1..b3ace55ca53a 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -67,12 +67,12 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); @@ -82,14 +82,14 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleExtendedComponent - virtual ::rtl::OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleRelationSet virtual sal_Int32 SAL_CALL getRelationCount( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 96cf8bbc2c6a..a971611387ad 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -41,9 +41,9 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xKeys; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - ::rtl::OUString m_aTableName; - ::rtl::OUString m_aWinName; - ::rtl::OUString m_sComposedName; + OUString m_aTableName; + OUString m_aWinName; + OUString m_sComposedName; Point m_aPosition; Size m_aSize; sal_Bool m_bShowAll; @@ -52,9 +52,9 @@ namespace dbaui public: explicit OTableWindowData( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable - ,const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& strTableName - ,const ::rtl::OUString& rWinName = ::rtl::OUString() ); + ,const OUString& _rComposedName + ,const OUString& strTableName + ,const OUString& rWinName = OUString() ); virtual ~OTableWindowData(); /** late constructor @@ -66,9 +66,9 @@ namespace dbaui bool init(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection ,bool _bAllowQueries); - inline ::rtl::OUString GetComposedName() const { return m_sComposedName; } - inline ::rtl::OUString GetTableName() const { return m_aTableName; } - inline ::rtl::OUString GetWinName() const { return m_aWinName; } + inline OUString GetComposedName() const { return m_sComposedName; } + inline OUString GetTableName() const { return m_aTableName; } + inline OUString GetWinName() const { return m_aWinName; } inline Point GetPosition() const { return m_aPosition; } inline Size GetSize() const { return m_aSize; } inline sal_Bool IsShowAll() const { return m_bShowAll; } @@ -77,7 +77,7 @@ namespace dbaui sal_Bool HasPosition() const; sal_Bool HasSize() const; - inline void SetWinName( const ::rtl::OUString& rWinName ) { m_aWinName = rWinName; } + inline void SetWinName( const OUString& rWinName ) { m_aWinName = rWinName; } inline void SetPosition( const Point& rPos ) { m_aPosition=rPos; } inline void SetSize( const Size& rSize ) { m_aSize = rSize; } inline void ShowAll( sal_Bool bAll ) { m_bShowAll = bAll; } diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 4c7480685ff6..f7bbb8205526 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -73,12 +73,12 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sName; + OUString m_sName; //for transfor the tablename - ::rtl::OUString m_sDefaultTableName; + OUString m_sDefaultTableName; - ::rtl::OUString m_sDataSourceName; + OUString m_sDataSourceName; sal_Int32 m_nCommandType; bool m_bNeedToReInitialize; @@ -112,7 +112,7 @@ namespace dbaui void setStream(SvStream* _pStream){ m_pStream = _pStream; } //for set the tablename - void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; } + void setSTableName(const OUString &_sTableName){ m_sDefaultTableName = _sTableName; } virtual sal_Bool Write(); // Export virtual sal_Bool Read(); // Import @@ -135,7 +135,7 @@ namespace dbaui class ORTFImportExport : public ODatabaseImportExport { - void appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk); + void appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk); public: // export data ORTFImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 2f4a40ad3948..5e8c0d6ebd3f 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -32,7 +32,7 @@ namespace dbaui { //======================================================================== -// Based on these ids the language dependent ::rtl::OUString are fetched from the resource +// Based on these ids the language dependent OUString are fetched from the resource const sal_uInt16 TYPE_UNKNOWN = 0; const sal_uInt16 TYPE_TEXT = 1; const sal_uInt16 TYPE_NUMERIC = 2; @@ -69,12 +69,12 @@ const sal_uInt16 TYPE_BIT = 31; class OTypeInfo { public: - ::rtl::OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName) - ::rtl::OUString aTypeName; // name of type in database - ::rtl::OUString aLiteralPrefix; // prefix for quoting - ::rtl::OUString aLiteralSuffix; // suffix for quoting - ::rtl::OUString aCreateParams; // parameter for creation - ::rtl::OUString aLocalTypeName; + OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName) + OUString aTypeName; // name of type in database + OUString aLiteralPrefix; // prefix for quoting + OUString aLiteralSuffix; // suffix for quoting + OUString aCreateParams; // parameter for creation + OUString aLocalTypeName; sal_Int32 nPrecision; // length of type sal_Int32 nType; // database type @@ -105,7 +105,7 @@ const sal_uInt16 TYPE_BIT = 31; {} sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } sal_Bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } - inline ::rtl::OUString getDBName() const { return aTypeName; } + inline OUString getDBName() const { return aTypeName; } }; @@ -123,8 +123,8 @@ const sal_uInt16 TYPE_BIT = 31; */ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 _nType, - const ::rtl::OUString& _sTypeName, - const ::rtl::OUString& _sCreateParams, + const OUString& _sTypeName, + const OUString& _sCreateParams, sal_Int32 _nPrecision, sal_Int32 _nScale, sal_Bool _bAutoIncrement, diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 35350ed1d65e..656997cd4211 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -85,7 +85,7 @@ namespace dbaui @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false */ ::dbtools::SQLExceptionInfo createConnection( - const ::rtl::OUString& _rsDataSourceName, + const OUString& _rsDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, @@ -131,13 +131,13 @@ namespace dbaui void setColumnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const OFieldDescription* _pFieldDesc); - ::rtl::OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, + OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTables, - const ::rtl::OUString& _sName); + const OUString& _sName); /** checks if the given name exists in the database context */ - sal_Bool checkDataSourceAvailable( const ::rtl::OUString& _sDataSourceName, + sal_Bool checkDataSourceAvailable( const OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); /** maps SvxCellHorJustify to com::sun::star::awt::TextAlign @@ -164,7 +164,7 @@ namespace dbaui */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSourceByName( - const ::rtl::OUString& _rDataSourceName, + const OUString& _rDataSourceName, Window* _pErrorMessageParent, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo @@ -214,7 +214,7 @@ namespace dbaui @return false when datsource is not available otherwise true */ sal_Bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sName, + const OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Window* _pParent); @@ -271,7 +271,7 @@ namespace dbaui */ void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDatasource ,sal_Bool& _rAutoIncrementValueEnabled - ,::rtl::OUString& _rsAutoIncrementValue); + ,OUString& _rsAutoIncrementValue); /** fills the bool and string value with information out of the datasource info property @param _xConnection @@ -283,7 +283,7 @@ namespace dbaui */ void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ,sal_Bool& _rAutoIncrementValueEnabled - ,::rtl::OUString& _rsAutoIncrementValue); + ,OUString& _rsAutoIncrementValue); /** creates the URL or the help agent @param _sModuleName @@ -291,7 +291,7 @@ namespace dbaui @return The URL for the help agent to dispatch. */ - ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const rtl::OString& _rHelpId); + ::com::sun::star::util::URL createHelpAgentURL(const OUString& _sModuleName,const OString& _rHelpId); /** set the evaluation flag at the number formatter @param _rxFormatter @@ -336,7 +336,7 @@ namespace dbaui @return RET_YES, RET_NO, RET_ALL */ - sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const ::rtl::OUString& _sName); + sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const OUString& _sName); /** creates a new view from a query or table @param _sName @@ -348,16 +348,16 @@ namespace dbaui @return The created view. */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createView( const ::rtl::OUString& _sName + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createView( const OUString& _sName ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSourceObject); /** creates a view with the given command */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createView( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::rtl::OUString& _rCommand + const OUString& _rCommand ); /** returns the stripped database name. @@ -368,8 +368,8 @@ namespace dbaui @return The stripped database name either the registered naem or if it is a file url the last segment. */ - ::rtl::OUString getStrippedDatabaseName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource - ,::rtl::OUString& _rsDatabaseName); + OUString getStrippedDatabaseName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource + ,OUString& _rsDatabaseName); /** returns the standard database filter @retrun @@ -418,7 +418,7 @@ namespace dbaui // this completes a help url with the system parameters "Language" and "System" // detect installed locale - void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ); + void AppendConfigToken( OUString& _rURL, sal_Bool _bQuestionMark ); // ......................................................................... } diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index e54d7e1e8f84..470fa6b95494 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -74,10 +74,10 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); }; //......................................................................... diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 5a0e78ffc767..bae5fef2ed87 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -89,7 +89,7 @@ namespace dbaui m_aCB_UseHeaderLine.Disable(); } - void setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ); + void setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ); }; } #endif // DBAUI_WIZARD_CPAGE_HXX diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index da275d02ce6d..f960ead3e383 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -53,21 +53,21 @@ namespace dbaui void clearListBox(MultiListBox& _rListBox); void fillColumns( ListBox* pRight, - ::std::vector< ::rtl::OUString> &_rRightColumns); + ::std::vector< OUString> &_rRightColumns); void createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, - ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + ::std::vector< OUString>& _rRightColumns, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase); void moveColumn( ListBox* _pRight, ListBox* _pLeft, - ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + ::std::vector< OUString>& _rRightColumns, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase); @@ -75,7 +75,7 @@ namespace dbaui sal_uInt16 adjustColumnPosition(ListBox* _pLeft, - const ::rtl::OUString& _sColumnName, + const OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase); diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 9a95655decdd..659f13c66a3b 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -43,11 +43,11 @@ namespace dbaui { - typedef ::std::unary_function< ::rtl::OUString,bool> TColumnFindFunctorType; + typedef ::std::unary_function< OUString,bool> TColumnFindFunctorType; class TColumnFindFunctor : public TColumnFindFunctorType { public: - virtual bool operator()(const ::rtl::OUString& _sColumnName) const = 0; + virtual bool operator()(const OUString& _sColumnName) const = 0; protected: ~TColumnFindFunctor() {} @@ -64,7 +64,7 @@ namespace dbaui virtual ~TExportColumnFindFunctor() {} - inline bool operator()(const ::rtl::OUString& _sColumnName) const + inline bool operator()(const OUString& _sColumnName) const { return m_pColumns->find(_sColumnName) != m_pColumns->end(); } @@ -73,9 +73,9 @@ namespace dbaui class TMultiListBoxEntryFindFunctor : public TColumnFindFunctor { ::comphelper::TStringMixEqualFunctor m_aCase; - ::std::vector< ::rtl::OUString>* m_pVector; + ::std::vector< OUString>* m_pVector; public: - TMultiListBoxEntryFindFunctor(::std::vector< ::rtl::OUString>* _pVector, + TMultiListBoxEntryFindFunctor(::std::vector< OUString>* _pVector, const ::comphelper::TStringMixEqualFunctor& _aCase) :m_aCase(_aCase) ,m_pVector(_pVector) @@ -84,7 +84,7 @@ namespace dbaui virtual ~TMultiListBoxEntryFindFunctor() {} - inline bool operator()(const ::rtl::OUString& _sColumnName) const + inline bool operator()(const OUString& _sColumnName) const { return ::std::find_if(m_pVector->begin(),m_pVector->end(), ::std::bind2nd(m_aCase, _sColumnName)) != m_pVector->end(); @@ -107,7 +107,7 @@ namespace dbaui { public: /// retrieves the fully qualified name of the object to copy - virtual ::rtl::OUString getQualifiedObjectName() const = 0; + virtual OUString getQualifiedObjectName() const = 0; /// determines whether the object is a view virtual bool isView() const = 0; /** copies the UI settings of the object to the given target object. Might be @@ -115,15 +115,15 @@ namespace dbaui */ virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const = 0; /// retrieves the column names of the to-be-copied object - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getColumnNames() const = 0; /// retrieves the names of the primary keys of the to-be-copied object - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getPrimaryKeyColumnNames() const = 0; /// creates a OFieldDescription for the given column of the to-be-copied object - virtual OFieldDescription* createFieldDescription( const ::rtl::OUString& _rColumnName ) const = 0; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const = 0; /// returns the SELECT statement which can be used to retrieve the data of the to-be-copied object - virtual ::rtl::OUString getSelectStatement() const = 0; + virtual OUString getSelectStatement() const = 0; /** copies the filter and sorting * @@ -161,16 +161,16 @@ namespace dbaui ); // ICopyTableSourceObject overridables - virtual ::rtl::OUString getQualifiedObjectName() const; + virtual OUString getQualifiedObjectName() const; virtual bool isView() const; virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getColumnNames() const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getPrimaryKeyColumnNames() const; - virtual OFieldDescription* createFieldDescription( const ::rtl::OUString& _rColumnName ) const; - virtual ::rtl::OUString getSelectStatement() const; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const; + virtual OUString getSelectStatement() const; virtual ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > getPreparedSelectStatement() const; }; @@ -183,30 +183,30 @@ namespace dbaui private: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - ::rtl::OUString m_sTableName; - ::rtl::OUString m_sTableCatalog; - ::rtl::OUString m_sTableSchema; - ::rtl::OUString m_sTableBareName; + OUString m_sTableName; + OUString m_sTableCatalog; + OUString m_sTableSchema; + OUString m_sTableBareName; ::std::vector< OFieldDescription > m_aColumnInfo; ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement; public: NamedTableCopySource( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rTableName + const OUString& _rTableName ); // ICopyTableSourceObject overridables - virtual ::rtl::OUString getQualifiedObjectName() const; + virtual OUString getQualifiedObjectName() const; virtual bool isView() const; virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getColumnNames() const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getPrimaryKeyColumnNames() const; - virtual OFieldDescription* createFieldDescription( const ::rtl::OUString& _rColumnName ) const; - virtual ::rtl::OUString getSelectStatement() const; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const; + virtual OUString getSelectStatement() const; virtual ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > getPreparedSelectStatement() const; @@ -228,7 +228,7 @@ namespace dbaui friend class OWizNameMatching; public: - DECLARE_STL_MAP(::rtl::OUString,::rtl::OUString,::comphelper::UStringMixLess,TNameMapping); + DECLARE_STL_MAP(OUString,OUString,::comphelper::UStringMixLess,TNameMapping); enum Wizard_Button_Style { @@ -274,9 +274,9 @@ namespace dbaui bool m_bInterConnectionCopy; // are we copying between different connections? ::com::sun::star::lang::Locale m_aLocale; - ::rtl::OUString m_sName; // for a table the name is composed - ::rtl::OUString m_sSourceName; - ::rtl::OUString m_aKeyName; + OUString m_sName; // for a table the name is composed + OUString m_sSourceName; + OUString m_aKeyName; TOTypeInfoSP m_pTypeInfo; // default type sal_Bool m_bAddPKFirstTime; sal_Int16 m_nOperation; @@ -306,7 +306,7 @@ namespace dbaui // used for copy tables or queries OCopyTableWizard( Window * pParent, - const ::rtl::OUString& _rDefaultName, + const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xSourceConnection, @@ -318,7 +318,7 @@ namespace dbaui // used for importing rtf/html sources OCopyTableWizard( Window* pParent, - const ::rtl::OUString& _rDefaultName, + const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rDestColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, @@ -356,12 +356,12 @@ namespace dbaui @param _sOldName The name of column to be replaced. */ - void replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const ::rtl::OUString& _sOldName); + void replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const OUString& _sOldName); /** returns whether a primary key should be created in the target database */ sal_Bool shouldCreatePrimaryKey() const; - void setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ); + void setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ); static bool supportsPrimaryKey( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); bool supportsPrimaryKey() const { return supportsPrimaryKey( m_xDestConnection ); } @@ -373,7 +373,7 @@ namespace dbaui @return The name of the primary key. */ - ::rtl::OUString getPrimaryKeyName() const { return m_aKeyName; } + OUString getPrimaryKeyName() const { return m_aKeyName; } TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } @@ -389,7 +389,7 @@ namespace dbaui const ODatabaseExport::TColumnVector* getSrcVector() const { return &m_vSourceVec; } ODatabaseExport::TColumns* getDestColumns() { return &m_vDestColumns; } const ODatabaseExport::TColumnVector* getDestVector() const { return &m_aDestVec; } - ::rtl::OUString getName() const { return m_sName; } + OUString getName() const { return m_sName; } /** clears the dest vectors */ @@ -402,19 +402,19 @@ namespace dbaui void setOperation( const sal_Int16 _nOperation ); sal_Int16 getOperation() const; - ::rtl::OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen); TOTypeInfoSP convertType(const TOTypeInfoSP&_pType,sal_Bool& _bNotConvert); - ::rtl::OUString createUniqueName(const ::rtl::OUString& _sName); + OUString createUniqueName(const OUString& _sName); // displays a error message that a column type is not supported - void showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName); + void showColumnTypeNotSupported(const OUString& _rColumnName); - void removeColumnNameFromNameMap(const ::rtl::OUString& _sName); - void showError(const ::rtl::OUString& _sErrorMesage); + void removeColumnNameFromNameMap(const OUString& _sName); + void showError(const OUString& _sErrorMesage); void showError(const ::com::sun::star::uno::Any& _aError); }; } diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index ba9acfa2635e..8289bdef28f2 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -49,7 +49,7 @@ namespace dbaui virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); virtual const OTypeInfoMap* getTypeInfo() const; virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual OUString getAutoIncrementValue() const; public: OWizTypeSelectControl(Window* pParent, const ResId& rResId,OTableDesignHelpBar* pHelpBar=NULL); @@ -102,7 +102,7 @@ namespace dbaui Image m_imgPKey; SvStream* m_pParserStream; // stream to read the tokens from or NULL - ::rtl::OUString m_sAutoIncrementValue; + OUString m_sAutoIncrementValue; sal_Int32 m_nDisplayRow; sal_Bool m_bAutoIncrementEnabled; sal_Bool m_bDuplicateName; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 608d18a55674..84b715da92df 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -57,7 +57,7 @@ namespace dbaui virtual ~AdvancedSettingsDialog(); /// determines whether or not the given data source type has any advanced setting - static bool doesHaveAnyAdvancedSettings( const ::rtl::OUString& _sURL ); + static bool doesHaveAnyAdvancedSettings( const OUString& _sURL ); virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); @@ -68,10 +68,10 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); }; diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 9300c7b332ca..0828feac0f82 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -38,7 +38,7 @@ namespace dbaui ,protected SvxTextEncodingTable { protected: - ::rtl::OUString m_aSystemDisplayName; + OUString m_aSystemDisplayName; public: class ExtendedCharsetIterator; @@ -51,8 +51,8 @@ namespace dbaui // various find operations const_iterator findEncoding(const rtl_TextEncoding _eEncoding) const; - const_iterator findIanaName(const ::rtl::OUString& _rIanaName) const; - const_iterator findDisplayName(const ::rtl::OUString& _rDisplayName) const; + const_iterator findIanaName(const OUString& _rIanaName) const; + const_iterator findDisplayName(const OUString& _rDisplayName) const; /// get access to the first element of the charset collection const_iterator begin() const; @@ -76,17 +76,17 @@ namespace dbaui { friend class OCharsetDisplay::ExtendedCharsetIterator; - ::rtl::OUString m_sDisplayName; + OUString m_sDisplayName; public: CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper& _rSource); rtl_TextEncoding getEncoding() const { return CharsetDisplayDerefHelper_Base::getEncoding(); } - ::rtl::OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } - ::rtl::OUString getDisplayName() const { return m_sDisplayName; } + OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } + OUString getDisplayName() const { return m_sDisplayName; } protected: - CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const ::rtl::OUString& _rDisplayName); + CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const OUString& _rDisplayName); }; //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index b9e557f893af..6a907217662a 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -34,9 +34,9 @@ namespace dbaui { //......................................................................... - DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringBag ); + DECLARE_STL_STDKEY_SET( OUString, StringBag ); DECLARE_STL_VECTOR( sal_Int8, ByteVector ); - DECLARE_STL_VECTOR( ::rtl::OUString, StringArray ); + DECLARE_STL_VECTOR( OUString, StringArray ); typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection; diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index fcbf4b8fe59f..95211ca67375 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -58,7 +58,7 @@ namespace dbaui m_xFrameLoader; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > m_xApplication; - ::rtl::OUString m_sComponentURL; + OUString m_sComponentURL; private: @@ -83,14 +83,14 @@ namespace dbaui */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > doCreateView( const ::com::sun::star::uno::Any& _rDataSource, - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ); virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _rDataSource, - const ::rtl::OUString& _rObjectName + const OUString& _rObjectName ); const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& @@ -103,7 +103,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxParentFrame, - const ::rtl::OUString& _rComponentURL + const OUString& _rComponentURL ); virtual ~DatabaseObjectView(){} @@ -144,7 +144,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > openExisting( const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rName, + const OUString& _rName, const ::comphelper::NamedValueCollection& i_rDispatchArgs ); }; @@ -161,7 +161,7 @@ namespace dbaui virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rObjectName + const OUString& _rObjectName ); public: @@ -182,12 +182,12 @@ namespace dbaui virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rObjectName + const OUString& _rObjectName ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > doCreateView( const ::com::sun::star::uno::Any& _rDataSource, - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ); @@ -208,7 +208,7 @@ namespace dbaui @see com::sun::star::sdb::application::XTableUIProvider */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - impl_getConnectionProvidedDesigner_nothrow( const ::rtl::OUString& _rTableName ); + impl_getConnectionProvidedDesigner_nothrow( const OUString& _rTableName ); }; //====================================================================== @@ -223,7 +223,7 @@ namespace dbaui virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rQualifiedName + const OUString& _rQualifiedName ); public: diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index 3a468cd42b0f..76b3f27f6d60 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -45,7 +45,7 @@ namespace dbaui Window* m_pErrorMessageParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sContextInformation; + OUString m_sContextInformation; public: ODatasourceConnector( @@ -55,7 +55,7 @@ namespace dbaui ODatasourceConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Window* _pMessageParent, - const ::rtl::OUString& _rContextInformation + const OUString& _rContextInformation ); /// returns <TRUE/> if the object is able to create data source connections @@ -65,7 +65,7 @@ namespace dbaui */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connect( - const ::rtl::OUString& _rDataSourceName, + const OUString& _rDataSourceName, ::dbtools::SQLExceptionInfo* _pErrorInfo ) const; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index c15bb8319d73..fb5758db17a0 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -93,10 +93,10 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); protected: diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 0e0d687332cb..92a2beb957c2 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -45,18 +45,18 @@ namespace dbaui public: ODataClipboard( - const ::rtl::OUString& _rDatasource, + const OUString& _rDatasource, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, 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::uno::XComponentContext >& _rxORB ); ODataClipboard( - const ::rtl::OUString& _rDatasource, + const OUString& _rDatasource, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 27a7dadd4fb0..d15c7b404969 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -119,7 +119,7 @@ namespace dbaui // enable editing for tables/views and queries virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Bool DoubleClickHdl(); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 487f47018e43..63748ff23fac 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -64,7 +64,7 @@ private: SfxItemSet* m_pOutSet; ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - ::rtl::OUString m_eType; + OUString m_eType; sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing @@ -88,10 +88,10 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); protected: @@ -108,7 +108,7 @@ protected: inline void disabledUI() { m_bUIEnabled = sal_False; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. - void implSelectDatasource(const ::rtl::OUString& _rRegisteredName); + void implSelectDatasource(const OUString& _rRegisteredName); void resetPages(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatasource); enum ApplyResult diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 4437c923600c..f9360c817664 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -67,8 +67,8 @@ private: OModuleClient m_aModuleClient; ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; - ::rtl::OUString m_sURL; - ::rtl::OUString m_sOldURL; + OUString m_sURL; + OUString m_sOldURL; sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> @@ -116,9 +116,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); virtual sal_Bool saveDatasource(); virtual String getStateDisplayName( WizardState _nState ) const; @@ -144,7 +144,7 @@ protected: inline void disabledUI() { m_bUIEnabled = sal_False; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. - void implSelectDatasource(const ::rtl::OUString& _rRegisteredName); + void implSelectDatasource(const OUString& _rRegisteredName); void resetPages(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatasource); enum ApplyResult @@ -167,9 +167,9 @@ private: the first state in this path, following by an arbitrary number of others, as in RoadmapWizard::declarePath. */ - void declareAuthDepPath( const ::rtl::OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths); + void declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths); - void RegisterDataSourceByLocation(const ::rtl::OUString& sPath); + void RegisterDataSourceByLocation(const OUString& sPath); sal_Bool SaveDatabaseDocument(); void activateDatabasePath(); String createUniqueFileName(const INetURLObject& rURL); @@ -177,7 +177,7 @@ private: void createUniqueFolderName(INetURLObject* pURL); ::dbaccess::DATASOURCE_TYPE VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE _DatabaseType) const; - ::rtl::OUString getDefaultDatabaseType() const; + OUString getDefaultDatabaseType() const; void updateTypeDependentStates(); sal_Bool callSaveAsDialog(); diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index bc10aba889c9..8e09bb6ad9f8 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -59,14 +59,14 @@ namespace dbaui */ HierarchicalNameCheck( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& _rxNames, - const ::rtl::OUString& _rRelativeRoot + const OUString& _rRelativeRoot ); ~HierarchicalNameCheck(); // IObjectNameCheck overridables virtual bool isNameValid( - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const; @@ -118,7 +118,7 @@ namespace dbaui // IObjectNameCheck overridables virtual bool isNameValid( - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const; diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 5bf05f602eb7..e6c40abf7d80 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -57,14 +57,14 @@ namespace dbaui class DataSourceMetaData { public: - DataSourceMetaData( const ::rtl::OUString& _sURL ); + DataSourceMetaData( const OUString& _sURL ); ~DataSourceMetaData(); /// returns a struct describing this data source type's support for our known advanced settings const FeatureSet& getFeatureSet() const; /// determines whether or not the data source requires authentication - static AuthenticationMode getAuthentication( const ::rtl::OUString& _sURL ); + static AuthenticationMode getAuthentication( const OUString& _sURL ); private: ::boost::shared_ptr< DataSourceMetaData_Impl > m_pImpl; diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index fd2d7f6222d2..0c98ce481316 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -46,8 +46,8 @@ namespace dbaui public: SbaExternalSourceBrowser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -62,7 +62,7 @@ namespace dbaui virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::util::XModifyListener virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException ); @@ -81,7 +81,7 @@ namespace dbaui virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); protected: diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index 5d2d117436a1..3101068a1e4c 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -144,10 +144,10 @@ namespace dbaui // hierarchy administration ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > > m_aChildren; - ::std::vector< ::rtl::OUString > m_aChildNames; + ::std::vector< OUString > m_aChildNames; // properties - ::rtl::OUString m_sName; + OUString m_sName; sal_Int32 m_nNamePropHandle; public: @@ -177,14 +177,14 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::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::sdbcx::XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -221,7 +221,7 @@ namespace dbaui virtual void SAL_CALL updateLong(sal_Int32 columnIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat(sal_Int32 columnIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble(sal_Int32 columnIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString(sal_Int32 columnIndex, const ::rtl::OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString(sal_Int32 columnIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes(sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -292,7 +292,7 @@ namespace dbaui // ::com::sun::star::sdbc::XParameters virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -300,7 +300,7 @@ namespace dbaui virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -333,10 +333,10 @@ namespace dbaui virtual void SAL_CALL setGroupControl(sal_Bool GroupControl) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setControlModels(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const ::rtl::OUString& GroupName) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const OUString& GroupName) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getGroupCount() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, ::rtl::OUString& Name) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, OUString& Name) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL getGroupByName(const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); @@ -348,38 +348,38 @@ namespace dbaui virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::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); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XCancellable virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::form::XReset virtual void SAL_CALL reset() throw(::com::sun::star::uno::RuntimeException); @@ -387,16 +387,16 @@ namespace dbaui virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName(const ::rtl::OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName(const OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::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); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException) ; @@ -428,8 +428,8 @@ namespace dbaui protected: // container handling - void implInsert(const ::com::sun::star::uno::Any& aElement, sal_Int32 nIndex, const ::rtl::OUString* pNewElName = NULL) throw(::com::sun::star::lang::IllegalArgumentException); - sal_Int32 implGetPos(const ::rtl::OUString& rName); + void implInsert(const ::com::sun::star::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = NULL) throw(::com::sun::star::lang::IllegalArgumentException); + sal_Int32 implGetPos(const OUString& rName); void StopListening(); void StartListening(); diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 7b0247f9a336..7d69c6221df8 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -72,7 +72,7 @@ namespace dbaui } protected: - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); private: using SvTreeListBox::Select; @@ -110,7 +110,7 @@ namespace dbaui public: DbaIndexDialog( Window* _pParent, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rFieldNames, + const ::com::sun::star::uno::Sequence< OUString >& _rFieldNames, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index ce4da4f11ee5..d215cfaceabd 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -54,30 +54,30 @@ namespace dbaui struct OIndex { protected: - ::rtl::OUString sOriginalName; + OUString sOriginalName; sal_Bool bModified; public: - ::rtl::OUString sName; - ::rtl::OUString sDescription; + OUString sName; + OUString sDescription; sal_Bool bPrimaryKey; sal_Bool bUnique; IndexFields aFields; public: - OIndex(const ::rtl::OUString& _rOriginalName) + OIndex(const OUString& _rOriginalName) : sOriginalName(_rOriginalName), bModified(sal_False), sName(_rOriginalName), bPrimaryKey(sal_False), bUnique(sal_False) { } - const ::rtl::OUString& getOriginalName() const { return sOriginalName; } + const OUString& getOriginalName() const { return sOriginalName; } sal_Bool isModified() const { return bModified; } void setModified(sal_Bool _bModified) { bModified = _bModified; } void clearModified() { setModified(sal_False); } sal_Bool isNew() const { return getOriginalName().isEmpty(); } - void flagAsNew(const GrantIndexAccess&) { sOriginalName = ::rtl::OUString(); } + void flagAsNew(const GrantIndexAccess&) { sOriginalName = OUString(); } void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; } diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 512a016f64f1..f71d9f673f81 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -57,7 +57,7 @@ namespace dbaui IndexFieldsControl( Window* _pParent, const ResId& _rId ,sal_Int32 _nMaxColumnsInIndex,sal_Bool _bAddIndexAppendix); ~IndexFieldsControl(); - void Init(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rAvailableFields); + void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields); void initializeFrom(const IndexFields& _rFields); void commitTo(IndexFields& _rFields); diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index fc2e6087c0d8..7f1c5dfc72d0 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -56,7 +56,7 @@ namespace dbaui m_xDocumentUI; Window* m_pDialogParent; String m_sCurrentlyEditing; - ::rtl::OUString + OUString m_sDataSourceName; public: @@ -66,7 +66,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sDataSourceName + const OUString& _sDataSourceName ); ~OLinkedDocumentsAccess(); @@ -74,7 +74,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> open( - const ::rtl::OUString& _rLinkName, + const OUString& _rLinkName, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs @@ -89,11 +89,11 @@ namespace dbaui void newFormWithPilot( const sal_Int32 _nCommandType = -1, - const ::rtl::OUString& _rObjectName = ::rtl::OUString() + const OUString& _rObjectName = OUString() ); void newReportWithPilot( const sal_Int32 _nCommandType = -1, - const ::rtl::OUString& _rObjectName = ::rtl::OUString() + const OUString& _rObjectName = OUString() ); void newQueryWithPilot(); void newTableWithPilot(); @@ -107,7 +107,7 @@ namespace dbaui private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > impl_open( - const ::rtl::OUString& _rLinkName, + const OUString& _rLinkName, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs @@ -117,7 +117,7 @@ namespace dbaui impl_newWithPilot( const char* _pWizardService, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rObjectName + const OUString& _rObjectName ); }; diff --git a/dbaccess/source/ui/inc/objectnamecheck.hxx b/dbaccess/source/ui/inc/objectnamecheck.hxx index 50a7b163d6aa..8f834ebef82b 100644 --- a/dbaccess/source/ui/inc/objectnamecheck.hxx +++ b/dbaccess/source/ui/inc/objectnamecheck.hxx @@ -20,7 +20,8 @@ #ifndef DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX #define DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX -namespace rtl { class OUString; } +#include <rtl/ustring.hxx> + namespace dbtools { class SQLExceptionInfo; } //........................................................................ @@ -48,7 +49,7 @@ namespace dbaui <TRUE/> if and only if the given name is valid. */ virtual bool isNameValid( - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const = 0; diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 5e2edda403cf..14406c8b7be9 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -41,7 +41,7 @@ namespace dbaui class OpenDocumentButton : public PushButton { private: - ::rtl::OUString m_sModule; + OUString m_sModule; public: OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName ); @@ -59,7 +59,7 @@ namespace dbaui typedef ::std::pair< String, String > StringPair; typedef ::std::map< sal_uInt16, StringPair > MapIndexToStringPair; - ::rtl::OUString m_sModule; + OUString m_sModule; MapIndexToStringPair m_aURLs; public: diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 7301f094364e..749493ea74c7 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -86,8 +86,8 @@ namespace dbaui void setReadOnly( sal_Bool _bReadOnly ) { m_pViewSwitch->setReadOnly( _bReadOnly ); } sal_Bool checkStatement() { return m_pViewSwitch->checkStatement( ); } - ::rtl::OUString getStatement() { return m_pViewSwitch->getStatement( ); } - void setStatement( const ::rtl::OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } + OUString getStatement() { return m_pViewSwitch->getStatement( ); } + void setStatement( const OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } void initialize() { m_pViewSwitch->initialize(); } void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); } diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index bfd3eb2350a7..df22cc2b84e8 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -70,11 +70,11 @@ namespace dbaui /// if we're editing an existing view, this is non-NULL ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAlterView > m_xAlterView; - ::rtl::OUString m_sStatement; // contains the current sql statement - ::rtl::OUString m_sUpdateCatalogName; // catalog for update data - ::rtl::OUString m_sUpdateSchemaName; // schema for update data - ::rtl::OUString m_sUpdateTableName; // table for update data - mutable ::rtl::OUString + OUString m_sStatement; // contains the current sql statement + OUString m_sUpdateCatalogName; // catalog for update data + OUString m_sUpdateSchemaName; // schema for update data + OUString m_sUpdateTableName; // table for update data + mutable OUString m_sName; // name of the query sal_Int64 m_nLimit; // the limit of the query result (All==-1) @@ -112,9 +112,9 @@ namespace dbaui void saveViewSettings( ::comphelper::NamedValueCollection& o_rViewSettings, const bool i_includingCriteria ) const; void loadViewSettings( const ::comphelper::NamedValueCollection& o_rViewSettings ); - ::rtl::OUString translateStatement( bool _bFireStatementChange = true ); + OUString translateStatement( bool _bFireStatementChange = true ); - ::rtl::OUString getDefaultName() const; + OUString getDefaultName() const; void execute_QueryPropDlg(); @@ -127,7 +127,7 @@ namespace dbaui virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual void reconnect( sal_Bool _bUI ); - virtual ::rtl::OUString getPrivateTitle( ) const; + virtual OUString getPrivateTitle( ) const; OQueryContainerWindow* getContainer() const { return static_cast< OQueryContainerWindow* >( getView() ); } @@ -148,7 +148,7 @@ namespace dbaui sal_Bool isDistinct() const { return m_bDistinct; } sal_Int64 getLimit() const { return m_nLimit; } - ::rtl::OUString getStatement() const { return m_sStatement; } + OUString getStatement() const { return m_sStatement; } sal_Int32 getSplitPos() const { return m_nSplitPos;} sal_Int32 getVisibleRows() const { return m_nVisibleRows; } @@ -179,11 +179,11 @@ namespace dbaui // ::com::sun::star::lang::XComponent virtual void SAL_CALL disposing(); - virtual ::rtl::OUString SAL_CALL getImplementationName() 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 ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -227,7 +227,7 @@ namespace dbaui bool impl_setViewMode( ::dbtools::SQLExceptionInfo* _pErrorInfo ); /// sets m_sStatement, and notifies our respective property change listeners - void setStatement_fireEvent( const ::rtl::OUString& _rNewStatement, bool _bFireStatementChange = true ); + void setStatement_fireEvent( const OUString& _rNewStatement, bool _bFireStatementChange = true ); /// sets the m_bEscapeProcessing member, and notifies our respective property change listeners void setEscapeProcessing_fireEvent( const sal_Bool _bEscapeProcessing ); diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 04856f0a7ac3..40978e785450 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -114,8 +114,8 @@ namespace dbaui void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getMatchingColumn( const Edit& _rValueInput ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getColumn( const ::rtl::OUString& _rFieldName ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const ::rtl::OUString& _rFieldName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getColumn( const OUString& _rFieldName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const OUString& _rFieldName ) const; public: DlgFilterCrit( Window * pParent, diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 1ba58b08b97f..8fb6a5416c3b 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -81,7 +81,7 @@ namespace dbaui HelpButton aBT_HELP; FixedLine aFL_ORDER; String aSTR_NOENTRY; - ::rtl::OUString m_sOrgOrder; + OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; @@ -103,8 +103,8 @@ namespace dbaui ~DlgOrderCrit(); void BuildOrderPart(); - ::rtl::OUString GetOrderList( ) const; - ::rtl::OUString GetOrignalOrder() const { return m_sOrgOrder; } + OUString GetOrderList( ) const; + OUString GetOrignalOrder() const { return m_sOrgOrder; } private: void impl_initializeOrderList_nothrow(); diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 62a27a937c3e..0cdaf25b04f2 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -41,9 +41,9 @@ namespace dbaui // set the view readonly or not virtual void setReadOnly(sal_Bool _bReadOnly) = 0; // set the statement for representation - virtual void setStatement(const ::rtl::OUString& _rsStatement) = 0; + virtual void setStatement(const OUString& _rsStatement) = 0; // returns the current sql statement - virtual ::rtl::OUString getStatement() = 0; + virtual OUString getStatement() = 0; }; } #endif // DBAUI_QUERYVIEW_HXX diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 55491b12c2f7..57ad9e71fe34 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -78,11 +78,11 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw(); + OUString SAL_CALL getImplementationName() throw(); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -131,7 +131,7 @@ namespace dbaui virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -270,7 +270,7 @@ namespace dbaui @return The description of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; virtual void DeleteSelectedRows(); /** copies the currently selected rows to the clipboard diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 4838944b9d2b..9deadd748ec1 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -202,7 +202,7 @@ namespace dbaui ,public listenerclass \ { \ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< \ - ::rtl::OUString, ::rtl::OUStringHash, ::comphelper::UStringEqual > ListenerContainerMap; \ + OUString, OUStringHash, ::comphelper::UStringEqual > ListenerContainerMap; \ ListenerContainerMap m_aListeners; \ \ public: \ @@ -217,14 +217,14 @@ namespace dbaui virtual void SAL_CALL methodname(const eventtype& e) throw exceptions; \ \ public: \ - void addInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ - void removeInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + void addInterface(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + void removeInterface(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ \ void disposeAndClear(); \ \ sal_Int32 getOverallLen() const; \ \ - ::cppu::OInterfaceContainerHelper* getContainer(const ::rtl::OUString& rName) \ + ::cppu::OInterfaceContainerHelper* getContainer(const OUString& rName) \ { return m_aListeners.getContainer(rName); } \ \ protected: \ @@ -267,18 +267,18 @@ namespace dbaui Notify(*pListeners, e); \ \ /* do the notification for the unspecialized listeners, too */ \ - pListeners = m_aListeners.getContainer(::rtl::OUString()); \ + pListeners = m_aListeners.getContainer(OUString()); \ if (pListeners) \ Notify(*pListeners, e); \ } \ \ - void classname::addInterface(const ::rtl::OUString& rName, \ + void classname::addInterface(const OUString& rName, \ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ { \ m_aListeners.addInterface(rName, rListener); \ } \ \ - void classname::removeInterface(const ::rtl::OUString& rName, \ + void classname::removeInterface(const OUString& rName, \ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ { \ m_aListeners.removeInterface(rName, rListener); \ @@ -293,8 +293,8 @@ namespace dbaui sal_Int32 classname::getOverallLen() const \ { \ sal_Int32 nLen = 0; \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aContained = m_aListeners.getContainedTypes(); \ - const ::rtl::OUString* pContained = aContained.getConstArray(); \ + ::com::sun::star::uno::Sequence< OUString > aContained = m_aListeners.getContainedTypes(); \ + const OUString* pContained = aContained.getConstArray(); \ for ( sal_Int32 i=0; i<aContained.getLength(); ++i, ++pContained) \ nLen += m_aListeners.getContainer(*pContained)->getLength(); \ return nLen; \ @@ -313,24 +313,24 @@ namespace dbaui // helper for classes which do property event multiplexing #define IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(classname, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ /*................................................................*/ \ - void SAL_CALL classname::add##listenerdesc(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ + void SAL_CALL classname::add##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ { \ multiplexer.addInterface(rName, l); \ if (multiplexer.getOverallLen() == 1) \ { \ ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ + xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \ } \ } \ /*................................................................*/ \ - void SAL_CALL classname::remove##listenerdesc(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ + void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ { \ if (multiplexer.getOverallLen() == 1) \ { \ ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ + xBroadcaster->remove##listenerdesc(OUString(), &multiplexer); \ } \ multiplexer.removeInterface(rName, l); \ } \ @@ -340,7 +340,7 @@ namespace dbaui { \ ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ + xBroadcaster->remove##listenerdesc(OUString(), &multiplexer); \ } \ #define START_PROPERTY_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ @@ -348,7 +348,7 @@ namespace dbaui { \ ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ + xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \ } \ diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 76d896f4e84f..42c96a6f4452 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -52,7 +52,7 @@ class OSQLMessageBox : public ButtonDialog FixedImage m_aInfoImage; FixedText m_aTitle; FixedText m_aMessage; - ::rtl::OUString m_sHelpURL; + OUString m_sHelpURL; ::std::auto_ptr< SQLMessageBox_Impl > m_pImpl; @@ -77,7 +77,7 @@ public: Window* _pParent, const dbtools::SQLExceptionInfo& _rException, WinBits _nStyle = WB_OK | WB_DEF_OK, - const ::rtl::OUString& _rHelpURL = ::rtl::OUString() + const OUString& _rHelpURL = OUString() ); /** display a database related error message diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 1eab0a4e6a6a..e3c235fd317d 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -37,17 +37,17 @@ namespace dbaui */ class OStringListItem : public SfxPoolItem { - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aList; + ::com::sun::star::uno::Sequence< OUString > m_aList; public: TYPEINFO(); - OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rList); + OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< OUString >& _rList); OStringListItem(const OStringListItem& _rSource); virtual int operator==(const SfxPoolItem& _rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getList() const { return m_aList; } + ::com::sun::star::uno::Sequence< OUString > getList() const { return m_aList; } }; //......................................................................... diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 0eebfca65b32..0632169a6386 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -64,7 +64,7 @@ public: ~OTableTreeListBox(); - typedef ::std::pair< ::rtl::OUString,sal_Bool> TTableViewName; + typedef ::std::pair< OUString,sal_Bool> TTableViewName; typedef ::std::vector< TTableViewName > TNames; void suppressEmptyFolders() { m_bNoEmptyFolders = true; } @@ -103,8 +103,8 @@ public: */ void UpdateTableList( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _rTables, - const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _rViews + const ::com::sun::star::uno::Sequence< OUString>& _rTables, + const ::com::sun::star::uno::Sequence< OUString>& _rViews ); /** returns a NamedDatabaseObject record which describes the given entry @@ -114,11 +114,11 @@ public: /** to be used if a foreign instance added a table */ - SvTreeListEntry* addedTable( const ::rtl::OUString& _rName ); + SvTreeListEntry* addedTable( const OUString& _rName ); /** to be used if a foreign instance removed a table */ - void removedTable( const ::rtl::OUString& _rName ); + void removedTable( const OUString& _rName ); /** returns the fully qualified name of a table entry @param _pEntry @@ -126,7 +126,7 @@ public: */ String getQualifiedTableName( SvTreeListEntry* _pEntry ) const; - SvTreeListEntry* getEntryByQualifiedName( const ::rtl::OUString& _rName ); + SvTreeListEntry* getEntryByQualifiedName( const OUString& _rName ); SvTreeListEntry* getAllObjectsEntry() const; @@ -156,7 +156,7 @@ protected: */ SvTreeListEntry* implAddEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMeta, - const ::rtl::OUString& _rTableName, + const OUString& _rTableName, sal_Bool _bCheckName = sal_True ); diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index dedbf4da9830..4b32fa437a93 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -36,7 +36,7 @@ class OSQLMessageDialog protected: // <properties> ::com::sun::star::uno::Any m_aException; - ::rtl::OUString m_sHelpURL; + OUString m_sHelpURL; // </properties> protected: @@ -47,12 +47,12 @@ public: virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL Create(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index fb40398f4757..5c8ea9edc3af 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -217,7 +217,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, sal_Int32 nPos = 1; OSL_ENSURE((nPos) < static_cast<sal_Int32>(aTypes.size()),"aTypes: Illegal index for vector"); aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - ::rtl::OUString sTypeName = aValue; + OUString sTypeName = aValue; ++nPos; OSL_ENSURE((nPos) < static_cast<sal_Int32>(aTypes.size()),"aTypes: Illegal index for vector"); aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); @@ -636,20 +636,20 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo } } // ----------------------------------------------------------------------------- -void ODatabaseExport::CreateDefaultColumn(const ::rtl::OUString& _rColumnName) +void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::CreateDefaultColumn" ); DBG_CHKTHIS(ODatabaseExport,NULL); Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData()); sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength()); - ::rtl::OUString aAlias = _rColumnName; + OUString aAlias = _rColumnName; if ( isSQL92CheckEnabled(m_xConnection) ) aAlias = ::dbtools::convertName2SQLName(_rColumnName,xDestMetaData->getExtraNameCharacters()); if(nMaxNameLen && aAlias.getLength() > nMaxNameLen) aAlias = aAlias.copy(0, ::std::min<sal_Int32>( nMaxNameLen-1, aAlias.getLength() ) ); - ::rtl::OUString sName(aAlias); + OUString sName(aAlias); if(m_aDestColumns.find(sName) != m_aDestColumns.end()) { sal_Int32 nPos = 0; @@ -657,12 +657,12 @@ void ODatabaseExport::CreateDefaultColumn(const ::rtl::OUString& _rColumnName) while(m_aDestColumns.find(sName) != m_aDestColumns.end()) { sName = aAlias; - sName += ::rtl::OUString::valueOf(++nPos); + sName += OUString::valueOf(++nPos); if(nMaxNameLen && sName.getLength() > nMaxNameLen) { aAlias = aAlias.copy(0,::std::min<sal_Int32>( nMaxNameLen-nCount, aAlias.getLength() )); sName = aAlias; - sName += ::rtl::OUString::valueOf(nPos); + sName += OUString::valueOf(nPos); ++nCount; } } @@ -698,13 +698,13 @@ sal_Bool ODatabaseExport::createRowSet() return m_pUpdateHelper.get() != NULL; } // ----------------------------------------------------------------------------- -sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _rTableName,const Any& _aTextColor,const FontDescriptor& _rFont) +sal_Bool ODatabaseExport::executeWizard(const OUString& _rTableName,const Any& _aTextColor,const FontDescriptor& _rFont) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::executeWizard" ); DBG_CHKTHIS(ODatabaseExport,NULL); bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty(); - ::rtl::OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName ); + OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName ); OCopyTableWizard aWizard( NULL, sTableName, @@ -823,7 +823,7 @@ void ODatabaseExport::ensureFormatter() SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId())); m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; Reference<XPropertySet> xNumberFormatSettings = xSupplier->getNumberFormatSettings(); - xNumberFormatSettings->getPropertyValue(::rtl::OUString("NullDate")) >>= m_aNullDate; + xNumberFormatSettings->getPropertyValue(OUString("NullDate")) >>= m_aNullDate; } } // ----------------------------------------------------------------------------- @@ -832,30 +832,30 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R ,const TPositions& _rvColumns) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createPreparedStatment" ); - ::rtl::OUString aSql(::rtl::OUString("INSERT INTO ")); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); + OUString aSql(OUString("INSERT INTO ")); + OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); aSql += sComposedTableName; - aSql += ::rtl::OUString(" ( "); + aSql += OUString(" ( "); // set values and column names - ::rtl::OUString aValues(" VALUES ( "); - static ::rtl::OUString aPara("?,"); - static ::rtl::OUString aComma(","); + OUString aValues(" VALUES ( "); + static OUString aPara("?,"); + static OUString aComma(","); - ::rtl::OUString aQuote; + OUString aQuote; if ( _xMetaData.is() ) aQuote = _xMetaData->getIdentifierQuoteString(); Reference<XColumnsSupplier> xDestColsSup(_xDestTable,UNO_QUERY_THROW); // create sql string and set column types - Sequence< ::rtl::OUString> aDestColumnNames = xDestColsSup->getColumns()->getElementNames(); + Sequence< OUString> aDestColumnNames = xDestColsSup->getColumns()->getElementNames(); if ( aDestColumnNames.getLength() == 0 ) { return Reference< XPreparedStatement > (); } - const ::rtl::OUString* pIter = aDestColumnNames.getConstArray(); - ::std::vector< ::rtl::OUString> aInsertList; + const OUString* pIter = aDestColumnNames.getConstArray(); + ::std::vector< OUString> aInsertList; aInsertList.resize(aDestColumnNames.getLength()+1); sal_Int32 i = 0; for(sal_uInt32 j=0; j < aInsertList.size() ;++i,++j) @@ -871,8 +871,8 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R i = 1; // create the sql string - ::std::vector< ::rtl::OUString>::iterator aInsertEnd = aInsertList.end(); - for (::std::vector< ::rtl::OUString>::iterator aInsertIter = aInsertList.begin(); aInsertIter != aInsertEnd; ++aInsertIter) + ::std::vector< OUString>::iterator aInsertEnd = aInsertList.end(); + for (::std::vector< OUString>::iterator aInsertIter = aInsertList.begin(); aInsertIter != aInsertEnd; ++aInsertIter) { if ( !aInsertIter->isEmpty() ) { @@ -882,8 +882,8 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R } } - aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); - aValues = aValues.replaceAt(aValues.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aValues = aValues.replaceAt(aValues.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); aSql += aValues; // now create,fill and execute the prepared statement diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index c2854e884ea1..cc8676d9652e 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -384,7 +384,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) aFontName += aFName; } if ( aFontName.Len() ) - _rFont.Name = ::rtl::OUString(aFontName); + _rFont.Name = OUString(aFontName); } break; case HTML_O_SIZE : @@ -430,7 +430,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken) DBG_CHKTHIS(OHTMLReader,NULL); String aTempName(ModuleRes(STR_TBL_TITLE)); aTempName = aTempName.GetToken(0,' '); - aTempName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTempName ))); + aTempName = String(::dbtools::createUniqueName(m_xTables,OUString(aTempName ))); int nTmpToken2 = nToken; sal_Bool bCaption = sal_False; @@ -490,7 +490,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken) case HTML_CAPTION_OFF: aTableName = comphelper::string::strip(aTableName, ' '); if(!aTableName.Len()) - aTableName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTableName))); + aTableName = String(::dbtools::createUniqueName(m_xTables,OUString(aTableName))); else aTableName = aTempName; bCaption = sal_False; diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 5bdd129a6f3a..e5ba2b86d499 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -66,7 +66,7 @@ void ORowSetImportExport::initialize() m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) - throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString("S1000") ,0,Any()); + throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,OUString("S1000") ,0,Any()); sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); @@ -78,7 +78,7 @@ void ORowSetImportExport::initialize() { try { - ::rtl::OUString sColumnName = m_xTargetResultSetMetaData->getColumnName(i); + OUString sColumnName = m_xTargetResultSetMetaData->getColumnName(i); nPos = xColumnLocate->findColumn(sColumnName); } catch(const SQLException&) diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 39ef50f2811a..ba19f265220d 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -265,7 +265,7 @@ sal_Bool ORTFReader::CreateTable(int nToken) DBG_CHKTHIS(ORTFReader,NULL); String aTableName(ModuleRes(STR_TBL_TITLE)); aTableName = aTableName.GetToken(0,' '); - aTableName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTableName))); + aTableName = String(::dbtools::createUniqueName(m_xTables,OUString(aTableName))); int nTmpToken2 = nToken; String aColumnName; diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index d77b76251e92..983e6631bdfa 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -81,10 +81,10 @@ OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler) } // ----------------------------------------------------------------------------- -void OTableCopyHelper::insertTable( const ::rtl::OUString& i_rSourceDataSource, const Reference<XConnection>& i_rSourceConnection, - const ::rtl::OUString& i_rCommand, const sal_Int32 i_nCommandType, +void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const Reference<XConnection>& i_rSourceConnection, + const OUString& i_rCommand, const sal_Int32 i_nCommandType, const Reference< XResultSet >& i_rSourceRows, const Sequence< Any >& i_rSelection, const sal_Bool i_bBookmarkSelection, - const ::rtl::OUString& i_rDestDataSource, const Reference<XConnection>& i_rDestConnection) + const OUString& i_rDestDataSource, const Reference<XConnection>& i_rDestConnection) { if ( CommandType::QUERY != i_nCommandType && CommandType::TABLE != i_nCommandType ) { @@ -121,7 +121,7 @@ void OTableCopyHelper::insertTable( const ::rtl::OUString& i_rSourceDataSource, Reference< XCopyTableWizard > xWizard( CopyTableWizard::create( aContext, xSource, xDest ), UNO_SET_THROW ); - ::rtl::OUString sTableNameForAppend( GetTableNameForAppend() ); + OUString sTableNameForAppend( GetTableNameForAppend() ); xWizard->setDestinationTableName( GetTableNameForAppend() ); bool bAppendToExisting = !sTableNameForAppend.isEmpty(); @@ -140,12 +140,12 @@ void OTableCopyHelper::insertTable( const ::rtl::OUString& i_rSourceDataSource, } // ----------------------------------------------------------------------------- -void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteData, const ::rtl::OUString& i_rDestDataSourceName, +void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteData, const OUString& i_rDestDataSourceName, const SharedConnection& i_rDestConnection ) { - ::rtl::OUString sSrcDataSourceName = _rPasteData.getDataSource(); + OUString sSrcDataSourceName = _rPasteData.getDataSource(); - ::rtl::OUString sCommand; + OUString sCommand; _rPasteData[ daCommand ] >>= sCommand; Reference<XConnection> xSrcConnection; @@ -187,7 +187,7 @@ void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteDa // ----------------------------------------------------------------------------- void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId ,const TransferableDataHelper& _rTransData - ,const ::rtl::OUString& i_rDestDataSource + ,const OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { if ( _nFormatId == SOT_FORMATSTR_ID_DBACCESS_TABLE || _nFormatId == SOT_FORMATSTR_ID_DBACCESS_QUERY ) @@ -212,7 +212,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !copyTagTable(aTrans,sal_False,_xConnection) ) - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,OUString("S1000"),0,Any())); } catch(const SQLException&) { @@ -224,12 +224,12 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId } } else - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,OUString("S1000"),0,Any())); } // ----------------------------------------------------------------------------- void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData - ,const ::rtl::OUString& i_rDestDataSource + ,const OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { if ( _rTransData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) || _rTransData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) ) @@ -308,7 +308,7 @@ sal_Bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedD } // ----------------------------------------------------------------------------- void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc - ,const ::rtl::OUString& i_rDestDataSource + ,const OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { if ( _rDesc.aHtmlRtfStorage.Is() ) @@ -323,7 +323,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc else if ( !_rDesc.bError ) pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection); else - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,OUString("S1000"),0,Any())); } // ----------------------------------------------------------------------------- //........................................................................ diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 92aa6bd5fe15..9fedc707b703 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -405,11 +405,11 @@ sal_Bool ORTFImportExport::Write() m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; ::Color aColor(nColor); - rtl::OString aFonts(rtl::OUStringToOString(m_aFont.Name, eDestEnc)); + OString aFonts(OUStringToOString(m_aFont.Name, eDestEnc)); if (aFonts.isEmpty()) { - rtl::OUString aName = Application::GetSettings().GetStyleSettings().GetAppFont().GetName(); - aFonts = rtl::OUStringToOString(aName, eDestEnc); + OUString aName = Application::GetSettings().GetStyleSettings().GetAppFont().GetName(); + aFonts = OUStringToOString(aName, eDestEnc); } (*m_pStream) << "{\\fonttbl"; @@ -447,8 +447,8 @@ sal_Bool ORTFImportExport::Write() { Reference<XColumnsSupplier> xColSup(m_xObject,UNO_QUERY); Reference<XNameAccess> xColumns = xColSup->getColumns(); - Sequence< ::rtl::OUString> aNames(xColumns->getElementNames()); - const ::rtl::OUString* pIter = aNames.getConstArray(); + Sequence< OUString> aNames(xColumns->getElementNames()); + const OUString* pIter = aNames.getConstArray(); sal_Int32 nCount = aNames.getLength(); sal_Bool bUseResultMetaData = sal_False; @@ -470,12 +470,12 @@ sal_Bool ORTFImportExport::Write() (*m_pStream) << aTRRH; - ::rtl::OString* pHorzChar = new ::rtl::OString[nCount]; + OString* pHorzChar = new OString[nCount]; for ( sal_Int32 i=1; i <= nCount; ++i ) { sal_Int32 nAlign = 0; - ::rtl::OUString sColumnName; + OUString sColumnName; if ( bUseResultMetaData ) sColumnName = m_xResultSetMetaData->getColumnName(i); else @@ -563,7 +563,7 @@ sal_Bool ORTFImportExport::Write() return ((*m_pStream).GetError() == SVSTREAM_OK); } // ----------------------------------------------------------------------------- -void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk) +void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk) { if(!m_pRowMarker || m_pRowMarker[kk] == k) { @@ -607,7 +607,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou { Reference<XPropertySet> xColumn(m_xRowSetColumns->getByIndex(i-1),UNO_QUERY_THROW); dbtools::FormattedColumnValue aFormatedValue(m_xContext,xRowSet,xColumn); - ::rtl::OUString sValue = aFormatedValue.getFormattedValue(); + OUString sValue = aFormatedValue.getFormattedValue(); if ( !sValue.isEmpty() ) RTFOutFuncs::Out_String(*m_pStream,sValue,m_eDestEnc); } @@ -749,7 +749,7 @@ void OHTMLImportExport::WriteBody() IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_style ); (*m_pStream) << sMyBegComment; OUT_LF(); - (*m_pStream) << OOO_STRING_SVTOOLS_HTML_body " { " << sFontFamily << '"' << ::rtl::OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() << '\"'; + (*m_pStream) << OOO_STRING_SVTOOLS_HTML_body " { " << sFontFamily << '"' << OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() << '\"'; // TODO : think about the encoding of the font name (*m_pStream) << "; " << sFontSize; m_pStream->WriteNumber(static_cast<sal_Int32>(m_aFont.Height)); @@ -781,13 +781,13 @@ void OHTMLImportExport::WriteBody() void OHTMLImportExport::WriteTables() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteTables" ); - ::rtl::OString aStrOut = OOO_STRING_SVTOOLS_HTML_table; + OString aStrOut = OOO_STRING_SVTOOLS_HTML_table; aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_frame; aStrOut = aStrOut + "="; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_TF_void; - Sequence< ::rtl::OUString> aNames; + Sequence< OUString> aNames; Reference<XNameAccess> xColumns; sal_Bool bUseResultMetaData = sal_False; if(m_xObject.is()) @@ -812,11 +812,11 @@ void OHTMLImportExport::WriteTables() aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing; aStrOut = aStrOut + "="; - aStrOut = aStrOut + ::rtl::OString::valueOf((sal_Int32)nCellSpacing); + aStrOut = aStrOut + OString::valueOf((sal_Int32)nCellSpacing); aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols; aStrOut = aStrOut + "="; - aStrOut = aStrOut + ::rtl::OString::valueOf(aNames.getLength()); + aStrOut = aStrOut + OString::valueOf(aNames.getLength()); aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border; aStrOut = aStrOut + "=1"; @@ -829,7 +829,7 @@ void OHTMLImportExport::WriteTables() TAG_ON( OOO_STRING_SVTOOLS_HTML_caption ); TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); - (*m_pStream) << ::rtl::OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr(); + (*m_pStream) << OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr(); // TODO : think about the encoding of the name TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption ); @@ -856,8 +856,8 @@ void OHTMLImportExport::WriteTables() m_xObject->getPropertyValue(PROPERTY_ROW_HEIGHT) >>= nHeight; // 1. writing the column description - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for( sal_Int32 i=0;pIter != pEnd; ++pIter,++i ) { @@ -916,7 +916,7 @@ void OHTMLImportExport::WriteTables() { Reference<XPropertySet> xColumn(m_xRowSetColumns->getByIndex(i-1),UNO_QUERY_THROW); dbtools::FormattedColumnValue aFormatedValue(m_xContext,xRowSet,xColumn); - ::rtl::OUString sValue = aFormatedValue.getFormattedValue(); + OUString sValue = aFormatedValue.getFormattedValue(); if (!sValue.isEmpty()) { aValue = sValue; @@ -955,7 +955,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I const String& rValue,const char* pHtmlTag) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteCell" ); - ::rtl::OString aStrTD = pHtmlTag; + OString aStrTD = pHtmlTag; nWidthPixel = nWidthPixel ? nWidthPixel : 86; nHeightPixel = nHeightPixel ? nHeightPixel : 17; @@ -966,12 +966,12 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I aStrTD = aStrTD + " "; aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_width; aStrTD = aStrTD + "="; - aStrTD = aStrTD + ::rtl::OString::valueOf((sal_Int32)nWidthPixel); + aStrTD = aStrTD + OString::valueOf((sal_Int32)nWidthPixel); // line height aStrTD = aStrTD + " "; aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_height; aStrTD = aStrTD + "="; - aStrTD = aStrTD + ::rtl::OString::valueOf((sal_Int32)nHeightPixel); + aStrTD = aStrTD + OString::valueOf((sal_Int32)nHeightPixel); aStrTD = aStrTD + " "; aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_align; @@ -1034,13 +1034,13 @@ void OHTMLImportExport::FontOn() #endif // <FONT FACE="xxx"> - ::rtl::OString aStrOut = "<"; + OString aStrOut = "<"; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_font; aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_face; aStrOut = aStrOut + "="; aStrOut = aStrOut + "\""; - aStrOut = aStrOut + ::rtl::OUStringToOString(m_aFont.Name,osl_getThreadTextEncoding()); + aStrOut = aStrOut + OUStringToOString(m_aFont.Name,osl_getThreadTextEncoding()); // TODO : think about the encoding of the font name aStrOut = aStrOut + "\""; aStrOut = aStrOut + " "; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index fac61dc3c026..c6564d5cb12b 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -135,7 +135,7 @@ using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING; using ::com::sun::star::frame::XModel; // ----------------------------------------------------------------------------- -SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, +SQLExceptionInfo createConnection( const OUString& _rsDataSourceName, const Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, @@ -166,7 +166,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP return aInfo; } - ::rtl::OUString sPwd, sUser; + OUString sPwd, sUser; sal_Bool bPwdReq = sal_False; try { @@ -213,7 +213,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP return aInfo; } // ----------------------------------------------------------------------------- -Reference< XDataSource > getDataSourceByName( const ::rtl::OUString& _rDataSourceName, +Reference< XDataSource > getDataSourceByName( const OUString& _rDataSourceName, Window* _pErrorMessageParent, Reference< XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ) { Reference< XDatabaseContext > xDatabaseContext = DatabaseContext::create(_rxContext); @@ -296,8 +296,8 @@ void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference< TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 _nType, - const ::rtl::OUString& _sTypeName, - const ::rtl::OUString& _sCreateParams, + const OUString& _sTypeName, + const OUString& _sCreateParams, sal_Int32 _nPrecision, sal_Int32 _nScale, sal_Bool _bAutoIncrement, @@ -314,7 +314,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, { // search the best matching type #ifdef DBG_UTIL - ::rtl::OUString sDBTypeName = aIter->second->aTypeName; (void)sDBTypeName; + OUString sDBTypeName = aIter->second->aTypeName; (void)sDBTypeName; sal_Int32 nDBTypePrecision = aIter->second->nPrecision; (void)nDBTypePrecision; sal_Int32 nDBTypeScale = aIter->second->nMaximumScale; (void)nDBTypeScale; sal_Bool bDBAutoIncrement = aIter->second->bAutoIncrement; (void)bDBAutoIncrement; @@ -445,8 +445,8 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo // Information for a single SQL type if(xRs.is()) { - static const ::rtl::OUString aB1(" [ "); - static const ::rtl::OUString aB2(" ]"); + static const OUString aB1(" [ "); + static const OUString aB2(" ]"); Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData(); ::connectivity::ORowSetValue aValue; ::std::vector<sal_Int32> aTypes; @@ -664,13 +664,13 @@ void setColumnProperties(const Reference<XPropertySet>& _rxColumn,const OFieldDe _rxColumn->setPropertyValue(PROPERTY_AUTOINCREMENTCREATION,makeAny(_pFieldDesc->GetAutoIncrementValue())); } // ----------------------------------------------------------------------------- -::rtl::OUString createDefaultName(const Reference< XDatabaseMetaData>& _xMetaData,const Reference<XNameAccess>& _xTables,const ::rtl::OUString& _sName) +OUString createDefaultName(const Reference< XDatabaseMetaData>& _xMetaData,const Reference<XNameAccess>& _xTables,const OUString& _sName) { OSL_ENSURE(_xMetaData.is(),"No MetaData!"); - ::rtl::OUString sDefaultName = _sName; + OUString sDefaultName = _sName; try { - ::rtl::OUString sCatalog,sSchema,sCompsedName; + OUString sCatalog,sSchema,sCompsedName; if(_xMetaData->supportsCatalogsInTableDefinitions()) { try @@ -707,7 +707,7 @@ void setColumnProperties(const Reference<XPropertySet>& _rxColumn,const OFieldDe return sDefaultName; } // ----------------------------------------------------------------------------- -sal_Bool checkDataSourceAvailable(const ::rtl::OUString& _sDataSourceName,const Reference< ::com::sun::star::uno::XComponentContext >& _xContext) +sal_Bool checkDataSourceAvailable(const OUString& _sDataSourceName,const Reference< ::com::sun::star::uno::XComponentContext >& _xContext) { Reference< XDatabaseContext > xDataBaseContext = DatabaseContext::create(_xContext); sal_Bool bRet = xDataBaseContext->hasByName(_sDataSourceName); @@ -910,7 +910,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO) }; - SfxItemPool* pPool = new SfxItemPool(rtl::OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); + SfxItemPool* pPool = new SfxItemPool(OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same @@ -991,7 +991,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, //------------------------------------------------------------------------------ const SfxFilter* getStandardDatabaseFilter() { - const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); return pFilter; } @@ -999,7 +999,7 @@ const SfxFilter* getStandardDatabaseFilter() // ----------------------------------------------------------------------------- sal_Bool appendToFilter(const Reference<XConnection>& _xConnection, - const ::rtl::OUString& _sName, + const OUString& _sName, const Reference< XComponentContext >& _rxContext, Window* _pParent) { @@ -1010,12 +1010,12 @@ sal_Bool appendToFilter(const Reference<XConnection>& _xConnection, Reference< XPropertySet> xProp(xChild->getParent(),UNO_QUERY); if(xProp.is()) { - Sequence< ::rtl::OUString > aFilter; + Sequence< OUString > aFilter; xProp->getPropertyValue(PROPERTY_TABLEFILTER) >>= aFilter; // first check if we have something like SCHEMA.% sal_Bool bHasToInsert = sal_True; - const ::rtl::OUString* pBegin = aFilter.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aFilter.getLength(); + const OUString* pBegin = aFilter.getConstArray(); + const OUString* pEnd = pBegin + aFilter.getLength(); for (;pBegin != pEnd; ++pBegin) { if(pBegin->indexOf('%') != -1) @@ -1127,7 +1127,7 @@ sal_Bool generateAsBeforeTableAlias(const Reference<XConnection>& _xConnection) // ----------------------------------------------------------------------------- void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource, sal_Bool& _rAutoIncrementValueEnabled, - ::rtl::OUString& _rsAutoIncrementValue) + OUString& _rsAutoIncrementValue) { if ( _xDatasource.is() ) { @@ -1143,7 +1143,7 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource, pValue->Value >>= _rsAutoIncrementValue; pValue =::std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), - ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString("IsAutoRetrievingEnabled") )); + ::std::bind2nd(TPropertyValueEqualFunctor(),OUString("IsAutoRetrievingEnabled") )); if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) ) pValue->Value >>= _rAutoIncrementValueEnabled; } @@ -1151,7 +1151,7 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource, // ----------------------------------------------------------------------------- void fillAutoIncrementValue(const Reference<XConnection>& _xConnection, sal_Bool& _rAutoIncrementValueEnabled, - ::rtl::OUString& _rsAutoIncrementValue) + OUString& _rsAutoIncrementValue) { Reference< XChild> xChild(_xConnection,UNO_QUERY); if(xChild.is()) @@ -1161,7 +1161,7 @@ void fillAutoIncrementValue(const Reference<XConnection>& _xConnection, } } // ----------------------------------------------------------------------------- -::rtl::OUString getStrippedDatabaseName(const Reference<XPropertySet>& _xDataSource,::rtl::OUString& _rsDatabaseName) +OUString getStrippedDatabaseName(const Reference<XPropertySet>& _xDataSource,OUString& _rsDatabaseName) { if ( _rsDatabaseName.isEmpty() && _xDataSource.is() ) { @@ -1174,27 +1174,27 @@ void fillAutoIncrementValue(const Reference<XConnection>& _xConnection, DBG_UNHANDLED_EXCEPTION(); } } - ::rtl::OUString sName = _rsDatabaseName; + OUString sName = _rsDatabaseName; INetURLObject aURL(sName); if ( aURL.GetProtocol() != INET_PROT_NOT_VALID ) sName = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_UNAMBIGUOUS); return sName; } // ----------------------------------------------------------------------------- -void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ) +void AppendConfigToken( OUString& _rURL, sal_Bool _bQuestionMark ) { // query part exists? if ( _bQuestionMark ) // no, so start with '?' - _rURL += ::rtl::OUString("?"); + _rURL += OUString("?"); else // yes, so only append with '&' - _rURL += ::rtl::OUString("&"); + _rURL += OUString("&"); // set parameters - _rURL += ::rtl::OUString("Language="); + _rURL += OUString("Language="); _rURL += utl::ConfigManager::getLocale(); - _rURL += ::rtl::OUString("&System="); + _rURL += OUString("&System="); _rURL += SvtHelpOptions().GetSystem(); } @@ -1202,17 +1202,17 @@ namespace { // ----------------------------------------------------------------------- - sal_Bool GetHelpAnchor_Impl( const ::rtl::OUString& _rURL, ::rtl::OUString& _rAnchor ) + sal_Bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) { sal_Bool bRet = sal_False; - ::rtl::OUString sAnchor; + OUString sAnchor; try { ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - if ( ( aCnt.getPropertyValue( ::rtl::OUString("AnchorName") ) >>= sAnchor ) ) + if ( ( aCnt.getPropertyValue( OUString("AnchorName") ) >>= sAnchor ) ) { if ( !sAnchor.isEmpty() ) @@ -1236,22 +1236,22 @@ namespace } // annonymous // ......................................................................... // ----------------------------------------------------------------------------- -::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId) +::com::sun::star::util::URL createHelpAgentURL(const OUString& _sModuleName, const OString& sHelpId) { ::com::sun::star::util::URL aURL; - aURL.Complete = ::rtl::OUString( "vnd.sun.star.help://" ); + aURL.Complete = OUString( "vnd.sun.star.help://" ); aURL.Complete += _sModuleName; - aURL.Complete += ::rtl::OUString( "/" ); - aURL.Complete += ::rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); + aURL.Complete += OUString( "/" ); + aURL.Complete += OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); - ::rtl::OUString sAnchor; - ::rtl::OUString sTempURL = aURL.Complete; + OUString sAnchor; + OUString sTempURL = aURL.Complete; AppendConfigToken( sTempURL, sal_True ); sal_Bool bHasAnchor = GetHelpAnchor_Impl( sTempURL, sAnchor ); AppendConfigToken(aURL.Complete,sal_True); if ( bHasAnchor ) { - aURL.Complete += ::rtl::OUString("#"); + aURL.Complete += OUString("#"); aURL.Complete += sAnchor; } return aURL; @@ -1373,7 +1373,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType } if ( !pTypeInfo ) { - ::rtl::OUString sCreate("x"),sTypeName; + OUString sCreate("x"),sTypeName; sal_Bool bForce = sal_True; pTypeInfo = ::dbaui::getTypeInfoFromType(_rTypeInfo,DataType::VARCHAR,sTypeName,sCreate,50,0,sal_False,bForce); } @@ -1381,11 +1381,11 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType return pTypeInfo; } // ----------------------------------------------------------------------------- -sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const ::rtl::OUString& _sName) +sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const OUString& _sName) { SolarMutexGuard aGuard; String aMsg = String(ModuleRes(_nText)); - aMsg.SearchAndReplace(rtl::OUString("%1"),String(_sName)); + aMsg.SearchAndReplace(OUString("%1"),String(_sName)); OSQLMessageBox aAsk(_pParent,String(ModuleRes(_nTitle )),aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); if ( _bAll ) { @@ -1398,9 +1398,9 @@ sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText // ----------------------------------------------------------------------------- namespace { - static ::rtl::OUString lcl_createSDBCLevelStatement( const ::rtl::OUString& _rStatement, const Reference< XConnection >& _rxConnection ) + static OUString lcl_createSDBCLevelStatement( const OUString& _rStatement, const Reference< XConnection >& _rxConnection ) { - ::rtl::OUString sSDBCLevelStatement( _rStatement ); + OUString sSDBCLevelStatement( _rStatement ); try { Reference< XMultiServiceFactory > xAnalyzerFactory( _rxConnection, UNO_QUERY_THROW ); @@ -1417,8 +1417,8 @@ namespace } // ----------------------------------------------------------------------------- -Reference< XPropertySet > createView( const ::rtl::OUString& _rName, const Reference< XConnection >& _rxConnection, - const ::rtl::OUString& _rCommand ) +Reference< XPropertySet > createView( const OUString& _rName, const Reference< XConnection >& _rxConnection, + const OUString& _rCommand ) { Reference<XViewsSupplier> xSup(_rxConnection,UNO_QUERY); Reference< XNameAccess > xViews; @@ -1433,7 +1433,7 @@ Reference< XPropertySet > createView( const ::rtl::OUString& _rName, const Refer if ( !xView.is() ) return NULL; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(_rxConnection->getMetaData(), _rName, sCatalog, @@ -1467,10 +1467,10 @@ Reference< XPropertySet > createView( const ::rtl::OUString& _rName, const Refer } // ----------------------------------------------------------------------------- -Reference<XPropertySet> createView( const ::rtl::OUString& _rName, const Reference< XConnection >& _rxConnection +Reference<XPropertySet> createView( const OUString& _rName, const Reference< XConnection >& _rxConnection ,const Reference<XPropertySet>& _rxSourceObject) { - ::rtl::OUString sCommand; + OUString sCommand; Reference< XPropertySetInfo > xPSI( _rxSourceObject->getPropertySetInfo(), UNO_SET_THROW ); if ( xPSI->hasPropertyByName( PROPERTY_COMMAND ) ) { @@ -1483,7 +1483,7 @@ Reference<XPropertySet> createView( const ::rtl::OUString& _rName, const Referen } else { - sCommand = ::rtl::OUString( "SELECT * FROM " ); + sCommand = OUString( "SELECT * FROM " ); sCommand += composeTableNameForSelect( _rxConnection, _rxSourceObject ); } return createView( _rName, _rxConnection, sCommand ); @@ -1503,7 +1503,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon return sal_False; Reference<XNameAccess> xNameAccess( _xNames, UNO_QUERY ); - ::rtl::OUString sName = _sParentFolder; + OUString sName = _sParentFolder; if ( _xNames->hasByHierarchicalName(sName) ) { Reference<XChild> xChild(_xNames->getByHierarchicalName(sName),UNO_QUERY); @@ -1516,7 +1516,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon if ( !xNameAccess.is() ) return sal_False; - ::rtl::OUString sNewName; + OUString sNewName; Reference<XPropertySet> xProp(_xContent,UNO_QUERY); if ( xProp.is() ) xProp->getPropertyValue(PROPERTY_NAME) >>= sNewName; @@ -1554,7 +1554,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon { String sError(ModuleRes(STR_NAME_ALREADY_EXISTS)); sError.SearchAndReplaceAscii("#",sNewName); - throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); + throw SQLException(sError,NULL,OUString("S1000") ,0,Any()); } try @@ -1563,11 +1563,11 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon Sequence< Any > aArguments(3); PropertyValue aValue; // set as folder - aValue.Name = ::rtl::OUString("Name"); + aValue.Name = OUString("Name"); aValue.Value <<= sNewName; aArguments[0] <<= aValue; //parent - aValue.Name = ::rtl::OUString("Parent"); + aValue.Name = OUString("Parent"); aValue.Value <<= xNameAccess; aArguments[1] <<= aValue; @@ -1575,7 +1575,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon aValue.Value <<= _xContent; aArguments[2] <<= aValue; - ::rtl::OUString sServiceName(_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); + OUString sServiceName(_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); Reference<XContent > xNew( xORB->createInstanceWithArguments( sServiceName, aArguments ), UNO_QUERY_THROW ); Reference< XNameContainer > xNameContainer( xNameAccess, UNO_QUERY_THROW ); diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index a810c03f04d5..0d81d253e06f 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -41,7 +41,7 @@ namespace dbaui { } virtual ~ORowUpdateHelper() {} - virtual void updateString(sal_Int32 _nPos, const ::rtl::OUString& _sValue) + virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) { m_xRowUpdate->updateString(_nPos, _sValue); } @@ -91,7 +91,7 @@ namespace dbaui { } virtual ~OParameterUpdateHelper() {} - virtual void updateString(sal_Int32 _nPos, const ::rtl::OUString& _sValue) + virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OParameterUpdateHelper::updateString" ); m_xParameters->setString(_nPos, _sValue); diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index db68666cb5a0..c0a5dc69228f 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -97,7 +97,7 @@ OCopyTable::OCopyTable( Window * pParent ) m_aFT_KeyName.Enable(sal_False); m_edKeyName.Enable(sal_False); - ::rtl::OUString sKeyName("ID"); + OUString sKeyName("ID"); sKeyName = m_pParent->createUniqueName(sKeyName); m_edKeyName.SetText(sKeyName); @@ -186,9 +186,9 @@ sal_Bool OCopyTable::LeavePage() // have to check the length of the table name Reference< XDatabaseMetaData > xMeta = m_pParent->m_xDestConnection->getMetaData(); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + OUString sCatalog; + OUString sSchema; + OUString sTable; ::dbtools::qualifiedNameComponents( xMeta, m_edTableName.GetText(), sCatalog, @@ -208,7 +208,7 @@ sal_Bool OCopyTable::LeavePage() && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) { String aInfoString( ModuleRes(STR_WIZ_PKEY_ALREADY_DEFINED) ); - aInfoString += rtl::OUString(' '); + aInfoString += OUString(' '); aInfoString += m_pParent->m_aKeyName; m_pParent->showError(aInfoString); return sal_False; @@ -327,7 +327,7 @@ sal_Bool OCopyTable::checkAppendData() return sal_True; } // ----------------------------------------------------------------------------- -void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ) +void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ) { bool bCreatePK = m_bPKeyAllowed && _bDoCreate; m_aCB_PrimaryColumn.Check( bCreatePK ); diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index b703d4a00c4a..196761826fca 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -200,11 +200,11 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) // else ???? Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); - ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); + OUString sExtraChars = xMetaData->getExtraNameCharacters(); sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::TStringMixEqualFunctor aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< ::rtl::OUString> aRightColumns; + ::std::vector< OUString> aRightColumns; fillColumns(pRight,aRightColumns); if(!bAll) @@ -249,11 +249,11 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, MultiListBox *, pListBox ) ////////////////////////////////////////////////////////////////////// // If database is able to process PrimaryKeys, set PrimaryKey Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); - ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); + OUString sExtraChars = xMetaData->getExtraNameCharacters(); sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::TStringMixEqualFunctor aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< ::rtl::OUString> aRightColumns; + ::std::vector< OUString> aRightColumns; fillColumns(pRight,aRightColumns); for(sal_uInt16 i=0; i < pLeft->GetSelectEntryCount(); ++i) @@ -272,7 +272,7 @@ void OWizColumnSelect::clearListBox(MultiListBox& _rListBox) _rListBox.Clear(); } // ----------------------------------------------------------------------------- -void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< ::rtl::OUString> &_rRightColumns) +void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< OUString> &_rRightColumns) { sal_uInt16 nCount = pRight->GetEntryCount(); _rRightColumns.reserve(nCount); @@ -282,13 +282,13 @@ void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< ::rtl::OUStrin // ----------------------------------------------------------------------------- void OWizColumnSelect::createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, - ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + ::std::vector< OUString>& _rRightColumns, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase) { - ::rtl::OUString sConvertedName = m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase), + OUString sConvertedName = m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase), _sColumnName, _sExtraChars, _nMaxNameLen); @@ -308,9 +308,9 @@ void OWizColumnSelect::createNewColumn( ListBox* _pListbox, // ----------------------------------------------------------------------------- void OWizColumnSelect::moveColumn( ListBox* _pRight, ListBox* _pLeft, - ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + ::std::vector< OUString>& _rRightColumns, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase) { @@ -354,7 +354,7 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, // been removed earlier and adjust accordingly. Based on the // algorithm employed in moveColumn(). sal_uInt16 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, - const ::rtl::OUString& _sColumnName, + const OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase) { @@ -366,7 +366,7 @@ sal_uInt16 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, return nAdjustedPos; sal_uInt16 nCount = _pLeft->GetEntryCount(); - ::rtl::OUString sColumnString; + OUString sColumnString; for(sal_uInt16 i=0; i < nCount; ++i) { sColumnString = _pLeft->GetEntry(i); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index fa220bf19b43..01d8ba6b0bb1 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -121,9 +121,9 @@ ObjectCopySource::ObjectCopySource( const Reference< XConnection >& _rxConnectio } //------------------------------------------------------------------------ -::rtl::OUString ObjectCopySource::getQualifiedObjectName() const +OUString ObjectCopySource::getQualifiedObjectName() const { - ::rtl::OUString sName; + OUString sName; if ( !m_xObjectPSI->hasPropertyByName( PROPERTY_COMMAND ) ) sName = ::dbtools::composeTableName( m_xMetaData, m_xObject, ::dbtools::eInDataManipulation, false, false, false ); @@ -140,7 +140,7 @@ bool ObjectCopySource::isView() const { if ( m_xObjectPSI->hasPropertyByName( PROPERTY_TYPE ) ) { - ::rtl::OUString sObjectType; + OUString sObjectType; OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_TYPE ) >>= sObjectType ); bIsView = sObjectType == "VIEW"; } @@ -155,7 +155,7 @@ bool ObjectCopySource::isView() const //------------------------------------------------------------------------ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObject ) const { - const ::rtl::OUString aCopyProperties[] = { + const OUString aCopyProperties[] = { PROPERTY_FONT, PROPERTY_ROW_HEIGHT, PROPERTY_TEXTCOLOR,PROPERTY_TEXTLINECOLOR,PROPERTY_TEXTEMPHASIS,PROPERTY_TEXTRELIEF }; for ( size_t i=0; i < sizeof( aCopyProperties ) / sizeof( aCopyProperties[0] ); ++i ) @@ -167,29 +167,29 @@ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObj //------------------------------------------------------------------------ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _xConnection,const Reference< XPropertySet >& _rxObject ) const { - ::std::pair< ::rtl::OUString, ::rtl::OUString > aProperties[] = { - ::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_FILTER,::rtl::OUString(" AND ")) - ,::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_ORDER,::rtl::OUString(" ORDER BY ")) + ::std::pair< OUString, OUString > aProperties[] = { + ::std::pair< OUString, OUString >(PROPERTY_FILTER,OUString(" AND ")) + ,::std::pair< OUString, OUString >(PROPERTY_ORDER,OUString(" ORDER BY ")) }; size_t i = 0; try { - const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ::rtl::OUString(".")); - const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject); - const String sTargetNameTemp = (sTargetName + ::rtl::OUString(".")); + const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + OUString(".")); + const OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject); + const String sTargetNameTemp = (sTargetName + OUString(".")); - ::rtl::OUString sStatement("SELECT * FROM "); + OUString sStatement("SELECT * FROM "); sStatement += sTargetName; - sStatement += ::rtl::OUString(" WHERE 0=1"); + sStatement += OUString(" WHERE 0=1"); for ( i=0; i < sizeof( aProperties ) / sizeof( aProperties[0] ); ++i ) { if ( m_xObjectPSI->hasPropertyByName( aProperties[i].first ) ) { - ::rtl::OUString sFilter; + OUString sFilter; m_xObject->getPropertyValue( aProperties[i].first ) >>= sFilter; if ( !sFilter.isEmpty() ) { @@ -213,47 +213,47 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ } } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ObjectCopySource::getColumnNames() const +Sequence< OUString > ObjectCopySource::getColumnNames() const { return m_xObjectColumns->getElementNames(); } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ObjectCopySource::getPrimaryKeyColumnNames() const +Sequence< OUString > ObjectCopySource::getPrimaryKeyColumnNames() const { const Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(m_xObject); - Sequence< ::rtl::OUString > aKeyColNames; + Sequence< OUString > aKeyColNames; if ( xPrimaryKeyColumns.is() ) aKeyColNames = xPrimaryKeyColumns->getElementNames(); return aKeyColNames; } //------------------------------------------------------------------------ -OFieldDescription* ObjectCopySource::createFieldDescription( const ::rtl::OUString& _rColumnName ) const +OFieldDescription* ObjectCopySource::createFieldDescription( const OUString& _rColumnName ) const { Reference< XPropertySet > xColumn( m_xObjectColumns->getByName( _rColumnName ), UNO_QUERY_THROW ); return new OFieldDescription( xColumn ); } //------------------------------------------------------------------------ -::rtl::OUString ObjectCopySource::getSelectStatement() const +OUString ObjectCopySource::getSelectStatement() const { - ::rtl::OUString sSelectStatement; + OUString sSelectStatement; if ( m_xObjectPSI->hasPropertyByName( PROPERTY_COMMAND ) ) { // query OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_COMMAND ) >>= sSelectStatement ); } else { // table - ::rtl::OUStringBuffer aSQL; + OUStringBuffer aSQL; aSQL.appendAscii( "SELECT " ); // we need to create the sql stmt with column names // otherwise it is possible that names don't match - const ::rtl::OUString sQuote = m_xMetaData->getIdentifierQuoteString(); + const OUString sQuote = m_xMetaData->getIdentifierQuoteString(); - Sequence< ::rtl::OUString > aColumnNames = getColumnNames(); - const ::rtl::OUString* pColumnName = aColumnNames.getConstArray(); - const ::rtl::OUString* pEnd = pColumnName + aColumnNames.getLength(); + Sequence< OUString > aColumnNames = getColumnNames(); + const OUString* pColumnName = aColumnNames.getConstArray(); + const OUString* pEnd = pColumnName + aColumnNames.getLength(); for ( ; pColumnName != pEnd; ) { aSQL.append( ::dbtools::quoteName( sQuote, *pColumnName++ ) ); @@ -287,7 +287,7 @@ OFieldDescription* ObjectCopySource::createFieldDescription( const ::rtl::OUStri //= NamedTableCopySource //======================================================================== //------------------------------------------------------------------------ -NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxConnection, const ::rtl::OUString& _rTableName ) +NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxConnection, const OUString& _rTableName ) :m_xConnection( _rxConnection, UNO_SET_THROW ) ,m_xMetaData( _rxConnection->getMetaData(), UNO_SET_THROW ) ,m_sTableName( _rTableName ) @@ -298,7 +298,7 @@ NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxC } //------------------------------------------------------------------------ -::rtl::OUString NamedTableCopySource::getQualifiedObjectName() const +OUString NamedTableCopySource::getQualifiedObjectName() const { return m_sTableName; } @@ -306,11 +306,11 @@ NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxC //------------------------------------------------------------------------ bool NamedTableCopySource::isView() const { - ::rtl::OUString sTableType; + OUString sTableType; try { Reference< XResultSet > xTableDesc( m_xMetaData->getTables( makeAny( m_sTableCatalog ), m_sTableSchema, m_sTableBareName, - Sequence< ::rtl::OUString >() ) ); + Sequence< OUString >() ) ); Reference< XRow > xTableDescRow( xTableDesc, UNO_QUERY_THROW ); OSL_VERIFY( xTableDesc->next() ); sTableType = xTableDescRow->getString( 4 ); @@ -369,9 +369,9 @@ void NamedTableCopySource::impl_ensureColumnInfo_throw() } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > NamedTableCopySource::getColumnNames() const +Sequence< OUString > NamedTableCopySource::getColumnNames() const { - Sequence< ::rtl::OUString > aNames( m_aColumnInfo.size() ); + Sequence< OUString > aNames( m_aColumnInfo.size() ); for ( ::std::vector< OFieldDescription >::const_iterator col = m_aColumnInfo.begin(); col != m_aColumnInfo.end(); ++col @@ -382,9 +382,9 @@ Sequence< ::rtl::OUString > NamedTableCopySource::getColumnNames() const } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > NamedTableCopySource::getPrimaryKeyColumnNames() const +Sequence< OUString > NamedTableCopySource::getPrimaryKeyColumnNames() const { - Sequence< ::rtl::OUString > aPKColNames; + Sequence< OUString > aPKColNames; try { @@ -406,7 +406,7 @@ Sequence< ::rtl::OUString > NamedTableCopySource::getPrimaryKeyColumnNames() con } //------------------------------------------------------------------------ -OFieldDescription* NamedTableCopySource::createFieldDescription( const ::rtl::OUString& _rColumnName ) const +OFieldDescription* NamedTableCopySource::createFieldDescription( const OUString& _rColumnName ) const { for ( ::std::vector< OFieldDescription >::const_iterator col = m_aColumnInfo.begin(); col != m_aColumnInfo.end(); @@ -418,9 +418,9 @@ OFieldDescription* NamedTableCopySource::createFieldDescription( const ::rtl::OU return NULL; } //------------------------------------------------------------------------ -::rtl::OUString NamedTableCopySource::getSelectStatement() const +OUString NamedTableCopySource::getSelectStatement() const { - ::rtl::OUStringBuffer aSQL; + OUStringBuffer aSQL; aSQL.appendAscii( "SELECT * FROM " ); aSQL.append( ::dbtools::composeTableNameForSelect( m_xConnection, m_sTableCatalog, m_sTableSchema, m_sTableBareName ) ); @@ -445,16 +445,16 @@ public: static const DummyCopySource& Instance(); // ICopyTableSourceObject overridables - virtual ::rtl::OUString getQualifiedObjectName() const; + virtual OUString getQualifiedObjectName() const; virtual bool isView() const; virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getColumnNames() const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getPrimaryKeyColumnNames() const; - virtual OFieldDescription* createFieldDescription( const ::rtl::OUString& _rColumnName ) const; - virtual ::rtl::OUString getSelectStatement() const; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const; + virtual OUString getSelectStatement() const; virtual ::utl::SharedUNOComponent< XPreparedStatement > getPreparedSelectStatement() const; }; @@ -467,10 +467,10 @@ const DummyCopySource& DummyCopySource::Instance() } //------------------------------------------------------------------------ -::rtl::OUString DummyCopySource::getQualifiedObjectName() const +OUString DummyCopySource::getQualifiedObjectName() const { OSL_FAIL( "DummyCopySource::getQualifiedObjectName: not to be called!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------ @@ -490,29 +490,29 @@ void DummyCopySource::copyFilterAndSortingTo( const Reference< XConnection >& ,c { } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > DummyCopySource::getColumnNames() const +Sequence< OUString > DummyCopySource::getColumnNames() const { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > DummyCopySource::getPrimaryKeyColumnNames() const +Sequence< OUString > DummyCopySource::getPrimaryKeyColumnNames() const { OSL_FAIL( "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" ); - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //------------------------------------------------------------------------ -OFieldDescription* DummyCopySource::createFieldDescription( const ::rtl::OUString& /*_rColumnName*/ ) const +OFieldDescription* DummyCopySource::createFieldDescription( const OUString& /*_rColumnName*/ ) const { OSL_FAIL( "DummyCopySource::createFieldDescription: not to be called!" ); return NULL; } //------------------------------------------------------------------------ -::rtl::OUString DummyCopySource::getSelectStatement() const +OUString DummyCopySource::getSelectStatement() const { OSL_FAIL( "DummyCopySource::getSelectStatement: not to be called!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------ @@ -546,7 +546,7 @@ namespace //= OCopyTableWizard //======================================================================== //------------------------------------------------------------------------ -OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation, +OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, const Reference< XConnection >& _xSourceConnection, const Reference< XConnection >& _xConnection, const Reference< XComponentContext >& _rxContext, const Reference< XInteractionHandler>& _xInteractionHandler) @@ -576,7 +576,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD construct(); // extract table name - ::rtl::OUString sInitialTableName( _rDefaultName ); + OUString sInitialTableName( _rDefaultName ); try { m_sSourceName = m_rSourceObject.getQualifiedObjectName(); @@ -619,9 +619,9 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD if ( m_bInterConnectionCopy ) { Reference< XDatabaseMetaData > xSrcMeta = _xSourceConnection->getMetaData(); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + OUString sCatalog; + OUString sSchema; + OUString sTable; ::dbtools::qualifiedNameComponents( xSrcMeta, m_sName, sCatalog, @@ -646,7 +646,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD } // ----------------------------------------------------------------------------- -OCopyTableWizard::OCopyTableWizard( Window* pParent, const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation, +OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const Reference< XComponentContext >& _rxContext ) @@ -856,7 +856,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) else { Reference< XDatabaseMetaData > xMetaData( m_xDestConnection->getMetaData() ); - ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); + OUString sExtraChars = xMetaData->getExtraNameCharacters(); sal_Int32 nMaxNameLen = getMaxColumnNameLength(); ODatabaseExport::TColumnVector::const_iterator aSrcIter = m_vSourceVec.begin(); @@ -942,7 +942,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) m_bCreatePrimaryKeyColumn = sal_True; m_aKeyName = pPage->GetKeyName(); if ( m_aKeyName.isEmpty() ) - m_aKeyName = ::rtl::OUString( "ID" ); + m_aKeyName = OUString( "ID" ); m_aKeyName = createUniqueName( m_aKeyName ); sal_Int32 nBreakPos2 = 0; CheckColumns(nBreakPos2); @@ -978,7 +978,7 @@ sal_Bool OCopyTableWizard::shouldCreatePrimaryKey() const } // ----------------------------------------------------------------------- -void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ) +void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::setCreatePrimaryKey" ); m_bCreatePrimaryKeyColumn = _bDoCreate; @@ -1081,7 +1081,7 @@ void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField) } } // ----------------------------------------------------------------------------- -void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const ::rtl::OUString& _sOldName) +void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const OUString& _sOldName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::replaceColumn" ); OSL_ENSURE(_pField,"FieldDescrioption is null!"); @@ -1113,15 +1113,15 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, _rColumns.clear(); OFieldDescription* pActFieldDescr = NULL; - ::rtl::OUString sCreateParam("x"); + OUString sCreateParam("x"); ////////////////////////////////////////////////////////////////////// // ReadOnly-Flag // On drop no line must be editable. // On add only empty lines must be editable. // On Add and Drop all lines can be edited. - Sequence< ::rtl::OUString > aColumns( _rSourceObject.getColumnNames() ); - const ::rtl::OUString* pColumn = aColumns.getConstArray(); - const ::rtl::OUString* pColumnEnd = pColumn + aColumns.getLength(); + Sequence< OUString > aColumns( _rSourceObject.getColumnNames() ); + const OUString* pColumn = aColumns.getConstArray(); + const OUString* pColumnEnd = pColumn + aColumns.getLength(); for ( ; pColumn != pColumnEnd; ++pColumn ) { @@ -1135,7 +1135,7 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, sal_Int32 nScale = pActFieldDescr->GetScale(); sal_Int32 nPrecision = pActFieldDescr->GetPrecision(); sal_Bool bAutoIncrement = pActFieldDescr->IsAutoIncrement(); - ::rtl::OUString sTypeName = pActFieldDescr->GetTypeName(); + OUString sTypeName = pActFieldDescr->GetTypeName(); // search for type sal_Bool bForce; @@ -1148,9 +1148,9 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, } // determine which coumns belong to the primary key - Sequence< ::rtl::OUString > aPrimaryKeyColumns( _rSourceObject.getPrimaryKeyColumnNames() ); - const ::rtl::OUString* pKeyColName = aPrimaryKeyColumns.getConstArray(); - const ::rtl::OUString* pKeyColEnd = pKeyColName + aPrimaryKeyColumns.getLength(); + Sequence< OUString > aPrimaryKeyColumns( _rSourceObject.getPrimaryKeyColumnNames() ); + const OUString* pKeyColName = aPrimaryKeyColumns.getConstArray(); + const OUString* pKeyColEnd = pKeyColName + aPrimaryKeyColumns.getLength(); for( ; pKeyColName != pKeyColEnd; ++pKeyColName ) { @@ -1254,7 +1254,7 @@ void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatab Reference< XPropertySet > OCopyTableWizard::createView() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createView" ); - ::rtl::OUString sCommand( m_rSourceObject.getSelectStatement() ); + OUString sCommand( m_rSourceObject.getSelectStatement() ); OSL_ENSURE( !sCommand.isEmpty(), "OCopyTableWizard::createView: no statement in the source object!" ); // there are legitimate cases in which getSelectStatement does not provide a statement, // but in all those cases, this method here should never be called. @@ -1282,7 +1282,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() if(!xTable.is()) return NULL; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; Reference< XDatabaseMetaData> xMetaData = m_xDestConnection->getMetaData(); ::dbtools::qualifiedNameComponents(xMetaData, m_sName, @@ -1323,7 +1323,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() xTables->getByName(m_sName) >>= xTable; else { - ::rtl::OUString sComposedName( + OUString sComposedName( ::dbtools::composeTableName( m_xDestConnection->getMetaData(), xTable, ::dbtools::eInDataManipulation, false, false, false ) ); if(xTables->hasByName(sComposedName)) { @@ -1345,9 +1345,9 @@ Reference< XPropertySet > OCopyTableWizard::createTable() m_rSourceObject.copyFilterAndSortingTo(m_xDestConnection,xTable); // set column mappings Reference<XNameAccess> xNameAccess = xSuppDestinationColumns->getColumns(); - Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = xNameAccess->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(sal_Int32 nNewPos=1;pIter != pEnd;++pIter,++nNewPos) { @@ -1416,7 +1416,7 @@ bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnect Reference< XRow > xRow( xRs, UNO_QUERY_THROW ); while ( xRs->next() ) { - ::rtl::OUString sValue = xRow->getString( 1 ); + OUString sValue = xRow->getString( 1 ); if ( !xRow->wasNull() && sValue.equalsIgnoreAsciiCase("View") ) { bSupportsViews = true; @@ -1469,13 +1469,13 @@ sal_Int16 OCopyTableWizard::getOperation() const return m_nOperation; } // ----------------------------------------------------------------------------- -::rtl::OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, +OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::convertColumnName" ); - ::rtl::OUString sAlias = _sColumnName; + OUString sAlias = _sColumnName; if ( isSQL92CheckEnabled( m_xDestConnection ) ) sAlias = ::dbtools::convertName2SQLName(_sColumnName,_sExtraChars); if((_nMaxNameLen && sAlias.getLength() > _nMaxNameLen) || _rCmpFunctor(sAlias)) @@ -1487,14 +1487,14 @@ sal_Int16 OCopyTableWizard::getOperation() const if(_nMaxNameLen && sAlias.getLength() >= _nMaxNameLen) sAlias = sAlias.copy(0,sAlias.getLength() - (sAlias.getLength()-_nMaxNameLen+nDiff)); - ::rtl::OUString sName(sAlias); + OUString sName(sAlias); sal_Int32 nPos = 1; - sName += ::rtl::OUString::valueOf(nPos); + sName += OUString::valueOf(nPos); while(_rCmpFunctor(sName)) { sName = sAlias; - sName += ::rtl::OUString::valueOf(++nPos); + sName += OUString::valueOf(++nPos); } sAlias = sName; // we have to check again, it could happen that the name is already to long @@ -1507,7 +1507,7 @@ sal_Int16 OCopyTableWizard::getOperation() const } // ----------------------------------------------------------------------------- -void OCopyTableWizard::removeColumnNameFromNameMap(const ::rtl::OUString& _sName) +void OCopyTableWizard::removeColumnNameFromNameMap(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::removeColumnNameFromNameMap" ); m_mNameMapping.erase(_sName); @@ -1612,7 +1612,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& if ( !pType.get() ) { _bNotConvert = sal_False; - ::rtl::OUString sCreate("x"); + OUString sCreate("x"); pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,sCreate,50,0,sal_False,bForce); if ( !pType.get() ) pType = m_pTypeInfo; @@ -1623,11 +1623,11 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& return pType; } // ----------------------------------------------------------------------------- -::rtl::OUString OCopyTableWizard::createUniqueName(const ::rtl::OUString& _sName) +OUString OCopyTableWizard::createUniqueName(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createUniqueName" ); - ::rtl::OUString sName = _sName; - Sequence< ::rtl::OUString > aColumnNames( m_rSourceObject.getColumnNames() ); + OUString sName = _sName; + Sequence< OUString > aColumnNames( m_rSourceObject.getColumnNames() ); if ( aColumnNames.getLength() ) sName = ::dbtools::createUniqueName( aColumnNames, sName, sal_False ); else @@ -1638,14 +1638,14 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& while(m_vSourceColumns.find(sName) != m_vSourceColumns.end()) { sName = _sName; - sName += ::rtl::OUString::valueOf(++nPos); + sName += OUString::valueOf(++nPos); } } } return sName; } // ----------------------------------------------------------------------------- -void OCopyTableWizard::showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName) +void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::showColumnTypeNotSupported" ); String sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) ); @@ -1653,7 +1653,7 @@ void OCopyTableWizard::showColumnTypeNotSupported(const ::rtl::OUString& _rColum showError(sMessage); } //------------------------------------------------------------------------------- -void OCopyTableWizard::showError(const ::rtl::OUString& _sErrorMesage) +void OCopyTableWizard::showError(const OUString& _sErrorMesage) { SQLExceptionInfo aInfo(_sErrorMesage); showError(aInfo.get()); diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 8f5f5508d650..6d4dc5d036aa 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -102,8 +102,8 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) return; setCurrentFieldDescData( pCurFieldDescr ); - ::rtl::OUString sName = pCurFieldDescr->GetName(); - ::rtl::OUString sNewName; + OUString sName = pCurFieldDescr->GetName(); + OUString sNewName; const OPropColumnEditCtrl* pColumnName = getColumnCtrl(); if ( pColumnName ) sNewName = pColumnName->GetText(); @@ -122,7 +122,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) sal_uInt16 nCount = aListBox.GetEntryCount(); for (sal_uInt16 i=0 ; !bDoubleName && i < nCount ; ++i) { - ::rtl::OUString sEntry(aListBox.GetEntry(i)); + OUString sEntry(aListBox.GetEntry(i)); bDoubleName = sNewName.equalsIgnoreAsciiCase(sEntry); } if ( !bDoubleName && pWiz->shouldCreatePrimaryKey() ) @@ -145,7 +145,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) return; } - ::rtl::OUString sOldName = pCurFieldDescr->GetName(); + OUString sOldName = pCurFieldDescr->GetName(); pCurFieldDescr->SetName(sNewName); static_cast<OWizTypeSelect*>(GetParent())->setDuplicateName(sal_False); @@ -209,7 +209,7 @@ sal_Bool OWizTypeSelectControl::isAutoIncrementValueEnabled() const return ((OWizTypeSelect*)GetParent())->m_bAutoIncrementEnabled; } // ----------------------------------------------------------------------------- -::rtl::OUString OWizTypeSelectControl::getAutoIncrementValue() const +OUString OWizTypeSelectControl::getAutoIncrementValue() const { return ((OWizTypeSelect*)GetParent())->m_sAutoIncrementValue; } @@ -242,7 +242,7 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream ) m_aTypeControl.Show(); m_aTypeControl.Init(); - m_etAuto.SetText(rtl::OUString("10")); + m_etAuto.SetText(OUString("10")); m_etAuto.SetDecimalDigits(0); m_pbAuto.SetClickHdl(LINK(this,OWizTypeSelect,ButtonClickHdl)); m_lbColumnNames.EnableMultiSelection(sal_True); diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 1105aba95fc2..b20859fa6759 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -77,14 +77,14 @@ namespace dbaui } //------------------------------------------------------------------------- - OCharsetDisplay::const_iterator OCharsetDisplay::findIanaName(const ::rtl::OUString& _rIanaName) const + OCharsetDisplay::const_iterator OCharsetDisplay::findIanaName(const OUString& _rIanaName) const { OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_rIanaName, OCharsetMap::IANA()); return const_iterator( this, aBaseIter ); } //------------------------------------------------------------------------- - OCharsetDisplay::const_iterator OCharsetDisplay::findDisplayName(const ::rtl::OUString& _rDisplayName) const + OCharsetDisplay::const_iterator OCharsetDisplay::findDisplayName(const OUString& _rDisplayName) const { rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; if ( _rDisplayName != m_aSystemDisplayName ) @@ -107,7 +107,7 @@ namespace dbaui } //------------------------------------------------------------------------- - CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper_Base& _rBase, const ::rtl::OUString& _rDisplayName) + CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper_Base& _rBase, const OUString& _rDisplayName) :CharsetDisplayDerefHelper_Base(_rBase) ,m_sDisplayName(_rDisplayName) { @@ -140,7 +140,7 @@ namespace dbaui rtl_TextEncoding eEncoding = (*m_aPosition).getEncoding(); return CharsetDisplayDerefHelper( *m_aPosition, - RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : (::rtl::OUString)m_pContainer->GetTextString( eEncoding ) + RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : (OUString)m_pContainer->GetTextString( eEncoding ) ); } diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 09eab6b4a648..ed788166d924 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -223,7 +223,7 @@ namespace dbaui { if ( _rData.m_xDocEventBroadcaster.is() ) { - ::rtl::OUString sEventName = _bActive ? rtl::OUString("OnFocus") : rtl::OUString("OnUnfocus"); + OUString sEventName = _bActive ? OUString("OnFocus") : OUString("OnUnfocus"); Reference< XController2 > xController( _rData.m_rController.getXController(), UNO_QUERY_THROW ); _rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any() ); } @@ -299,7 +299,7 @@ namespace dbaui void FrameWindowActivationListener::impl_checkDisposed_throw() const { if ( !m_pData ) - throw DisposedException( ::rtl::OUString(), *const_cast< FrameWindowActivationListener* >( this ) ); + throw DisposedException( OUString(), *const_cast< FrameWindowActivationListener* >( this ) ); } //-------------------------------------------------------------------- diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 33013cb3887f..6f2419d5466a 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -62,7 +62,7 @@ namespace dbaui DatabaseObjectView::DatabaseObjectView( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame, - const ::rtl::OUString& _rComponentURL ) + const OUString& _rComponentURL ) :m_xORB ( _rxORB ) ,m_xParentFrame ( _rxParentFrame ) ,m_xFrameLoader ( ) @@ -85,18 +85,18 @@ namespace dbaui //---------------------------------------------------------------------- Reference< XComponent > DatabaseObjectView::createNew( const Reference< XDataSource >& _xDataSource, const ::comphelper::NamedValueCollection& i_rDispatchArgs ) { - return doCreateView( makeAny( _xDataSource ), ::rtl::OUString(), i_rDispatchArgs ); + return doCreateView( makeAny( _xDataSource ), OUString(), i_rDispatchArgs ); } //---------------------------------------------------------------------- - Reference< XComponent > DatabaseObjectView::openExisting( const Any& _rDataSource, const ::rtl::OUString& _rName, + Reference< XComponent > DatabaseObjectView::openExisting( const Any& _rDataSource, const OUString& _rName, const ::comphelper::NamedValueCollection& i_rDispatchArgs ) { return doCreateView( _rDataSource, _rName, i_rDispatchArgs ); } //---------------------------------------------------------------------- - Reference< XComponent > DatabaseObjectView::doCreateView( const Any& _rDataSource, const ::rtl::OUString& _rObjectName, + Reference< XComponent > DatabaseObjectView::doCreateView( const Any& _rDataSource, const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ) { ::comphelper::NamedValueCollection aDispatchArgs; @@ -124,11 +124,11 @@ namespace dbaui NamedValue aProp; sal_Int32 nArg = 0; - aProp.Name = ::rtl::OUString("ParentFrame"); + aProp.Name = OUString("ParentFrame"); aProp.Value <<= m_xParentFrame; lArgs[nArg++] <<= aProp; - aProp.Name = ::rtl::OUString("TopWindow"); + aProp.Name = OUString("TopWindow"); aProp.Value <<= sal_True; lArgs[nArg++] <<= aProp; @@ -147,7 +147,7 @@ namespace dbaui Reference< XComponentLoader > xFrameLoader( m_xFrameLoader, UNO_QUERY_THROW ); xReturn = xFrameLoader->loadComponentFromURL( m_sComponentURL, - ::rtl::OUString("_self"), + OUString("_self"), 0, i_rDispatchArgs.getPropertyValues() ); @@ -164,21 +164,21 @@ namespace dbaui void DatabaseObjectView::fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const Any& _aDataSource, - const ::rtl::OUString& /* _rName */ + const OUString& /* _rName */ ) { - ::rtl::OUString sDataSource; + OUString sDataSource; Reference<XDataSource> xDataSource; if ( _aDataSource >>= sDataSource ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_DATASOURCENAME, sDataSource ); + i_rDispatchArgs.put( (OUString)PROPERTY_DATASOURCENAME, sDataSource ); } else if ( _aDataSource >>= xDataSource ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_DATASOURCE, xDataSource ); + i_rDispatchArgs.put( (OUString)PROPERTY_DATASOURCE, xDataSource ); } - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, getConnection() ); + i_rDispatchArgs.put( (OUString)PROPERTY_ACTIVE_CONNECTION, getConnection() ); } //====================================================================== @@ -194,24 +194,24 @@ namespace dbaui //---------------------------------------------------------------------- void QueryDesigner::fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const Any& _aDataSource, - const ::rtl::OUString& _rObjectName ) + const OUString& _rObjectName ) { DatabaseObjectView::fillDispatchArgs( i_rDispatchArgs, _aDataSource, _rObjectName ); const bool bIncludeQueryName = !_rObjectName.isEmpty(); - const bool bGraphicalDesign = i_rDispatchArgs.getOrDefault( (::rtl::OUString)PROPERTY_GRAPHICAL_DESIGN, sal_True ); + const bool bGraphicalDesign = i_rDispatchArgs.getOrDefault( (OUString)PROPERTY_GRAPHICAL_DESIGN, sal_True ); const bool bEditViewAsSQLCommand = ( m_nCommandType == CommandType::TABLE ) && !bGraphicalDesign; - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_COMMAND_TYPE, m_nCommandType ); + i_rDispatchArgs.put( (OUString)PROPERTY_COMMAND_TYPE, m_nCommandType ); if ( bIncludeQueryName ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_COMMAND, _rObjectName ); + i_rDispatchArgs.put( (OUString)PROPERTY_COMMAND, _rObjectName ); } if ( bEditViewAsSQLCommand ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_ESCAPE_PROCESSING, sal_False ); + i_rDispatchArgs.put( (OUString)PROPERTY_ESCAPE_PROCESSING, sal_False ); } } @@ -220,24 +220,24 @@ namespace dbaui //====================================================================== //---------------------------------------------------------------------- TableDesigner::TableDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame ) - :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< ::rtl::OUString >( URL_COMPONENT_TABLEDESIGN ) ) + :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< OUString >( URL_COMPONENT_TABLEDESIGN ) ) { } //---------------------------------------------------------------------- void TableDesigner::fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const Any& _aDataSource, - const ::rtl::OUString& _rObjectName ) + const OUString& _rObjectName ) { DatabaseObjectView::fillDispatchArgs( i_rDispatchArgs, _aDataSource, _rObjectName ); if ( !_rObjectName.isEmpty() ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_CURRENTTABLE, _rObjectName ); + i_rDispatchArgs.put( (OUString)PROPERTY_CURRENTTABLE, _rObjectName ); } } //---------------------------------------------------------------------- - Reference< XComponent > TableDesigner::doCreateView( const Any& _rDataSource, const ::rtl::OUString& _rObjectName, + Reference< XComponent > TableDesigner::doCreateView( const Any& _rDataSource, const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ) { bool bIsNewDesign = _rObjectName.isEmpty(); @@ -265,7 +265,7 @@ namespace dbaui } //---------------------------------------------------------------------- - Reference< XInterface > TableDesigner::impl_getConnectionProvidedDesigner_nothrow( const ::rtl::OUString& _rTableName ) + Reference< XInterface > TableDesigner::impl_getConnectionProvidedDesigner_nothrow( const OUString& _rTableName ) { Reference< XInterface > xDesigner; try @@ -287,32 +287,32 @@ namespace dbaui //---------------------------------------------------------------------- ResultSetBrowser::ResultSetBrowser( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame, sal_Bool _bTable ) - :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast < ::rtl::OUString >( URL_COMPONENT_DATASOURCEBROWSER ) ) + :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast < OUString >( URL_COMPONENT_DATASOURCEBROWSER ) ) ,m_bTable(_bTable) { } //---------------------------------------------------------------------- void ResultSetBrowser::fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const Any& _aDataSource, - const ::rtl::OUString& _rQualifiedName) + const OUString& _rQualifiedName) { DatabaseObjectView::fillDispatchArgs( i_rDispatchArgs, _aDataSource, _rQualifiedName ); OSL_ENSURE( !_rQualifiedName.isEmpty(),"A Table name must be set"); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + OUString sCatalog; + OUString sSchema; + OUString sTable; if ( m_bTable ) ::dbtools::qualifiedNameComponents( getConnection()->getMetaData(), _rQualifiedName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_COMMAND_TYPE, (m_bTable ? CommandType::TABLE : CommandType::QUERY) ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_COMMAND, _rQualifiedName ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_ENABLE_BROWSER, sal_False ); + i_rDispatchArgs.put( (OUString)PROPERTY_COMMAND_TYPE, (m_bTable ? CommandType::TABLE : CommandType::QUERY) ); + i_rDispatchArgs.put( (OUString)PROPERTY_COMMAND, _rQualifiedName ); + i_rDispatchArgs.put( (OUString)PROPERTY_ENABLE_BROWSER, sal_False ); if ( m_bTable ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_UPDATE_CATALOGNAME, sCatalog ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_UPDATE_SCHEMANAME, sSchema ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_UPDATE_TABLENAME, sTable ); + i_rDispatchArgs.put( (OUString)PROPERTY_UPDATE_CATALOGNAME, sCatalog ); + i_rDispatchArgs.put( (OUString)PROPERTY_UPDATE_SCHEMANAME, sSchema ); + i_rDispatchArgs.put( (OUString)PROPERTY_UPDATE_TABLENAME, sTable ); } } @@ -321,7 +321,7 @@ namespace dbaui //====================================================================== //---------------------------------------------------------------------- RelationDesigner::RelationDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame ) - :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< ::rtl::OUString >( URL_COMPONENT_RELATIONDESIGN ) ) + :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< OUString >( URL_COMPONENT_RELATIONDESIGN ) ) { } // ......................................................................... diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index ee1905f727c4..1f4ec63bcbdc 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -71,7 +71,7 @@ namespace dbaui //--------------------------------------------------------------------- ODatasourceConnector::ODatasourceConnector( const Reference< XComponentContext >& _rxContext, Window* _pMessageParent, - const ::rtl::OUString& _rContextInformation ) + const OUString& _rContextInformation ) :m_pErrorMessageParent(_pMessageParent) ,m_xContext(_rxContext) ,m_sContextInformation( _rContextInformation ) @@ -79,7 +79,7 @@ namespace dbaui } //--------------------------------------------------------------------- - Reference< XConnection > ODatasourceConnector::connect( const ::rtl::OUString& _rDataSourceName, + Reference< XConnection > ODatasourceConnector::connect( const OUString& _rDataSourceName, ::dbtools::SQLExceptionInfo* _pErrorInfo ) const { Reference< XConnection > xConnection; @@ -110,7 +110,7 @@ namespace dbaui return xConnection; // get user/password - ::rtl::OUString sPassword, sUser; + OUString sPassword, sUser; sal_Bool bPwdRequired = sal_False; Reference<XPropertySet> xProp(_xDataSource,UNO_QUERY); try diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx index 83d2c30a7252..5bf932b55e98 100644 --- a/dbaccess/source/ui/misc/dbaundomanager.cxx +++ b/dbaccess/source/ui/misc/dbaundomanager.cxx @@ -143,7 +143,7 @@ namespace dbaui { // throw if the instance is already disposed if ( i_impl.bDisposed ) - throw DisposedException( ::rtl::OUString(), i_impl.getThis() ); + throw DisposedException( OUString(), i_impl.getThis() ); } virtual ~UndoManagerMethodGuard() { @@ -222,7 +222,7 @@ namespace dbaui } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL UndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.enterUndoContext( i_title, aGuard ); @@ -282,28 +282,28 @@ namespace dbaui } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getCurrentUndoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getCurrentRedoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getAllUndoActionTitles(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getAllRedoActionTitles(); @@ -376,7 +376,7 @@ namespace dbaui void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) { (void)i_parent; - throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() ); + throw NoSupportException( OUString(), m_pImpl->getThis() ); } //...................................................................................................................... diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 7fc12d00b3be..79266604fbb8 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -136,7 +136,7 @@ namespace dbaui SharedConnection m_xConnection; ::dbtools::DatabaseMetaData m_aSdbMetaData; // </properties> - ::rtl::OUString m_sDataSourceName; // the data source we're working for + OUString m_sDataSourceName; // the data source we're working for DataSourceHolder m_aDataSource; Reference< XModel > m_xDocument; Reference< XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier @@ -195,7 +195,7 @@ namespace dbaui const ::comphelper::NamedValueCollection& rArguments( getInitParams() ); Reference< XConnection > xConnection; - xConnection = rArguments.getOrDefault( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, xConnection ); + xConnection = rArguments.getOrDefault( (OUString)PROPERTY_ACTIVE_CONNECTION, xConnection ); if ( !xConnection.is() ) ::dbtools::isEmbeddedInDatabase( getModel(), xConnection ); @@ -390,7 +390,7 @@ namespace dbaui } //-------------------------------------------------------------------- - void DBSubComponentController::appendError( const ::rtl::OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState, + void DBSubComponentController::appendError( const OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState, const sal_Int32 _nErrorCode ) { m_pImpl->m_aCurrentError.append( ::dbtools::SQLExceptionInfo::SQL_EXCEPTION, _rErrorMessage, getStandardSQLStateAscii( _eSQLState ), @@ -465,9 +465,9 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ::rtl::OUString DBSubComponentController::getDataSourceName() const + OUString DBSubComponentController::getDataSourceName() const { - ::rtl::OUString sName; + OUString sName; Reference< XPropertySet > xDataSourceProps( m_pImpl->m_aDataSource.getDataSourceProps() ); if ( xDataSourceProps.is() ) xDataSourceProps->getPropertyValue(PROPERTY_NAME) >>= sName; @@ -569,14 +569,14 @@ namespace dbaui } // ----------------------------------------------------------------------------- // XTitle - ::rtl::OUString SAL_CALL DBSubComponentController::getTitle() + OUString SAL_CALL DBSubComponentController::getTitle() throw (RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); if ( m_bExternalTitle ) return impl_getTitleHelper_throw()->getTitle (); - ::rtl::OUStringBuffer sTitle; + OUStringBuffer sTitle; Reference< XTitle > xTitle(getPrivateModel(),UNO_QUERY); if ( xTitle.is() ) { diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index 019f112d2d12..f0d03d973776 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -72,7 +72,7 @@ namespace dbaui //==================================================================== namespace { - void lcl_fillNameExistsError( const ::rtl::OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) + void lcl_fillNameExistsError( const OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) { String sErrorMessage = String( ModuleRes( STR_NAMED_OBJECT_ALREADY_EXISTS ) ); sErrorMessage.SearchAndReplaceAllAscii( "$#$", _rObjectName ); @@ -89,14 +89,14 @@ namespace dbaui struct HierarchicalNameCheck_Impl { Reference< XHierarchicalNameAccess > xHierarchicalNames; - ::rtl::OUString sRelativeRoot; + OUString sRelativeRoot; }; //==================================================================== //= HierarchicalNameCheck //==================================================================== //-------------------------------------------------------------------- - HierarchicalNameCheck::HierarchicalNameCheck( const Reference< XHierarchicalNameAccess >& _rxNames, const ::rtl::OUString& _rRelativeRoot ) + HierarchicalNameCheck::HierarchicalNameCheck( const Reference< XHierarchicalNameAccess >& _rxNames, const OUString& _rRelativeRoot ) :m_pImpl( new HierarchicalNameCheck_Impl ) { m_pImpl->xHierarchicalNames = _rxNames; @@ -112,11 +112,11 @@ namespace dbaui } //-------------------------------------------------------------------- - bool HierarchicalNameCheck::isNameValid( const ::rtl::OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) const + bool HierarchicalNameCheck::isNameValid( const OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) const { try { - ::rtl::OUStringBuffer aCompleteName; + OUStringBuffer aCompleteName; if ( !m_pImpl->sRelativeRoot.isEmpty() ) { aCompleteName.append( m_pImpl->sRelativeRoot ); @@ -124,7 +124,7 @@ namespace dbaui } aCompleteName.append( _rObjectName ); - ::rtl::OUString sCompleteName( aCompleteName.makeStringAndClear() ); + OUString sCompleteName( aCompleteName.makeStringAndClear() ); if ( !m_pImpl->xHierarchicalNames->hasByHierarchicalName( sCompleteName ) ) return true; } @@ -170,7 +170,7 @@ namespace dbaui } //-------------------------------------------------------------------- - bool DynamicTableOrQueryNameCheck::isNameValid( const ::rtl::OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const + bool DynamicTableOrQueryNameCheck::isNameValid( const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const { try { diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index d03a803c0f04..aae855ab0d41 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -90,15 +90,15 @@ namespace dbaui } //-------------------------------------------------------------------- - static const FeatureSet& lcl_getFeatureSet( const ::rtl::OUString _rURL ) + static const FeatureSet& lcl_getFeatureSet( const OUString _rURL ) { - typedef ::std::map< ::rtl::OUString, FeatureSet, ::comphelper::UStringLess > FeatureSets; + typedef ::std::map< OUString, FeatureSet, ::comphelper::UStringLess > FeatureSets; static FeatureSets s_aFeatureSets; if ( s_aFeatureSets.empty() ) { ::connectivity::DriversConfig aDriverConfig( ::comphelper::getProcessComponentContext() ); - const uno::Sequence< ::rtl::OUString > aPatterns = aDriverConfig.getURLs(); - for ( const ::rtl::OUString* pattern = aPatterns.getConstArray(); + const uno::Sequence< OUString > aPatterns = aDriverConfig.getURLs(); + for ( const OUString* pattern = aPatterns.getConstArray(); pattern != aPatterns.getConstArray() + aPatterns.getLength(); ++pattern ) @@ -123,22 +123,22 @@ namespace dbaui } //-------------------------------------------------------------------- - static AuthenticationMode getAuthenticationMode( const ::rtl::OUString& _sURL ) + static AuthenticationMode getAuthenticationMode( const OUString& _sURL ) { static std::map< OUString, FeatureSupport > s_aSupport; if ( s_aSupport.empty() ) { ::connectivity::DriversConfig aDriverConfig(::comphelper::getProcessComponentContext()); - const uno::Sequence< ::rtl::OUString > aURLs = aDriverConfig.getURLs(); - const ::rtl::OUString* pIter = aURLs.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aURLs.getLength(); + const uno::Sequence< OUString > aURLs = aDriverConfig.getURLs(); + const OUString* pIter = aURLs.getConstArray(); + const OUString* pEnd = pIter + aURLs.getLength(); for(;pIter != pEnd;++pIter) { FeatureSupport aInit( AuthNone ); const ::comphelper::NamedValueCollection& aMetaData = aDriverConfig.getMetaData(*pIter); if ( aMetaData.has("Authentication") ) { - ::rtl::OUString sAuth; + OUString sAuth; aMetaData.get("Authentication") >>= sAuth; if ( sAuth == "UserPassword" ) aInit = AuthUserPwd; @@ -158,16 +158,16 @@ namespace dbaui class DataSourceMetaData_Impl { public: - DataSourceMetaData_Impl( const ::rtl::OUString& _sURL ); + DataSourceMetaData_Impl( const OUString& _sURL ); - inline ::rtl::OUString getType() const { return m_sURL; } + inline OUString getType() const { return m_sURL; } private: - const ::rtl::OUString m_sURL; + const OUString m_sURL; }; //-------------------------------------------------------------------- - DataSourceMetaData_Impl::DataSourceMetaData_Impl( const ::rtl::OUString& _sURL ) + DataSourceMetaData_Impl::DataSourceMetaData_Impl( const OUString& _sURL ) :m_sURL( _sURL ) { } @@ -176,7 +176,7 @@ namespace dbaui //= DataSourceMetaData //==================================================================== //-------------------------------------------------------------------- - DataSourceMetaData::DataSourceMetaData( const ::rtl::OUString& _sURL ) + DataSourceMetaData::DataSourceMetaData( const OUString& _sURL ) :m_pImpl( new DataSourceMetaData_Impl( _sURL ) ) { } @@ -193,7 +193,7 @@ namespace dbaui } //-------------------------------------------------------------------- - AuthenticationMode DataSourceMetaData::getAuthentication( const ::rtl::OUString& _sURL ) + AuthenticationMode DataSourceMetaData::getAuthentication( const OUString& _sURL ) { return getAuthenticationMode( _sURL ); } diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 293775ca7cd8..f23f9c32680b 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -68,7 +68,7 @@ namespace dbaui { //................................................................ static void lcl_getConnectionProvidedTableIcon_nothrow( const ImageProvider_Data& _rData, - const ::rtl::OUString& _rName, Reference< XGraphic >& _out_rxGraphic ) + const OUString& _rName, Reference< XGraphic >& _out_rxGraphic ) { try { @@ -82,7 +82,7 @@ namespace dbaui } //................................................................ - static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const ::rtl::OUString& _rName, + static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const OUString& _rName, sal_uInt16& _out_rResourceID) { _out_rResourceID = 0; diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index 82deb2502ae2..b8e3db0c1fc2 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -78,7 +78,7 @@ namespace dbaui //------------------------------------------------------------------ Indexes::const_iterator OIndexCollection::find(const String& _rName) const { - ::rtl::OUString sNameCompare(_rName); + OUString sNameCompare(_rName); // loop'n'compare Indexes::const_iterator aSearch = m_aIndexes.begin(); @@ -93,7 +93,7 @@ namespace dbaui //------------------------------------------------------------------ Indexes::iterator OIndexCollection::find(const String& _rName) { - ::rtl::OUString sNameCompare(_rName); + OUString sNameCompare(_rName); // loop'n'compare Indexes::iterator aSearch = m_aIndexes.begin(); @@ -108,7 +108,7 @@ namespace dbaui //------------------------------------------------------------------ Indexes::const_iterator OIndexCollection::findOriginal(const String& _rName) const { - ::rtl::OUString sNameCompare(_rName); + OUString sNameCompare(_rName); // loop'n'compare Indexes::const_iterator aSearch = m_aIndexes.begin(); @@ -123,7 +123,7 @@ namespace dbaui //------------------------------------------------------------------ Indexes::iterator OIndexCollection::findOriginal(const String& _rName) { - ::rtl::OUString sNameCompare(_rName); + OUString sNameCompare(_rName); // loop'n'compare Indexes::iterator aSearch = m_aIndexes.begin(); @@ -165,9 +165,9 @@ namespace dbaui } // set the properties - static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique"); - static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending"); - static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString("Name"); + static const OUString s_sUniquePropertyName = OUString("IsUnique"); + static const OUString s_sSortPropertyName = OUString("IsAscending"); + static const OUString s_sNamePropertyName = OUString("Name"); // the index' own props xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique)); xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName)); @@ -185,7 +185,7 @@ namespace dbaui if (xColDescriptor.is()) { xColDescriptor->setPropertyValue(s_sSortPropertyName, ::cppu::bool2any(aFieldLoop->bSortAscending)); - xColDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(::rtl::OUString(aFieldLoop->sFieldName))); + xColDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(OUString(aFieldLoop->sFieldName))); xAppendCols->appendByDescriptor(xColDescriptor); } } @@ -271,10 +271,10 @@ namespace dbaui //------------------------------------------------------------------ void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor) SAL_THROW((Exception)) { - static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString("IsPrimaryKeyIndex"); - static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique"); - static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending"); - static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString("Catalog"); + static const OUString s_sPrimaryIndexPropertyName = OUString("IsPrimaryKeyIndex"); + static const OUString s_sUniquePropertyName = OUString("IsUnique"); + static const OUString s_sSortPropertyName = OUString("IsAscending"); + static const OUString s_sCatalogPropertyName = OUString("Catalog"); _rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName)); _rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName)); @@ -288,11 +288,11 @@ namespace dbaui OSL_ENSURE(xCols.is(), "OIndexCollection::implFillIndexInfo: the index does not have columns!"); if (xCols.is()) { - Sequence< ::rtl::OUString > aFieldNames = xCols->getElementNames(); + Sequence< OUString > aFieldNames = xCols->getElementNames(); _rIndex.aFields.resize(aFieldNames.getLength()); - const ::rtl::OUString* pFieldNames = aFieldNames.getConstArray(); - const ::rtl::OUString* pFieldNamesEnd = pFieldNames + aFieldNames.getLength(); + const OUString* pFieldNames = aFieldNames.getConstArray(); + const OUString* pFieldNamesEnd = pFieldNames + aFieldNames.getLength(); IndexFields::iterator aCopyTo = _rIndex.aFields.begin(); Reference< XPropertySet > xIndexColumn; @@ -362,9 +362,9 @@ namespace dbaui if (m_xIndexes.is()) { // loop through all the indexes - Sequence< ::rtl::OUString > aNames = m_xIndexes->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames = m_xIndexes->getElementNames(); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for (; pNames < pEnd; ++pNames) { // extract the index object diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 0f6a854ac524..476633299004 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -114,7 +114,7 @@ namespace dbaui //------------------------------------------------------------------ OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, const Reference< XComponentContext >& _rxContext, const Reference< XNameAccess >& _rxContainer, - const Reference< XConnection>& _xConnection, const ::rtl::OUString& _sDataSourceName ) + const Reference< XConnection>& _xConnection, const OUString& _sDataSourceName ) :m_xContext(_rxContext) ,m_xDocumentContainer(_rxContainer) ,m_xConnection(_xConnection) @@ -132,7 +132,7 @@ namespace dbaui DBG_DTOR(OLinkedDocumentsAccess,NULL); } //------------------------------------------------------------------ - Reference< XComponent> OLinkedDocumentsAccess::impl_open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, + Reference< XComponent> OLinkedDocumentsAccess::impl_open( const OUString& _rLinkName, Reference< XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ) { Reference< XComponent> xRet; @@ -144,11 +144,11 @@ namespace dbaui WaitObject aWaitCursor( m_pDialogParent ); ::comphelper::NamedValueCollection aArguments; - ::rtl::OUString sOpenMode; + OUString sOpenMode; switch ( _eOpenMode ) { case E_OPEN_NORMAL: - sOpenMode = ::rtl::OUString( "open" ); + sOpenMode = OUString( "open" ); break; case E_OPEN_FOR_MAIL: @@ -156,7 +156,7 @@ namespace dbaui // fall through case E_OPEN_DESIGN: - sOpenMode = ::rtl::OUString( "openDesign" ); + sOpenMode = OUString( "openDesign" ); break; default: @@ -165,7 +165,7 @@ namespace dbaui } aArguments.put( "OpenMode", sOpenMode ); - aArguments.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); + aArguments.put( (OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); try { Reference<XHierarchicalNameContainer> xHier(m_xDocumentContainer,UNO_QUERY); @@ -176,7 +176,7 @@ namespace dbaui aArguments.merge( _rAdditionalArgs, true ); - xRet = xComponentLoader->loadComponentFromURL( _rLinkName, ::rtl::OUString(), 0, aArguments.getPropertyValues() ); + xRet = xComponentLoader->loadComponentFromURL( _rLinkName, OUString(), 0, aArguments.getPropertyValues() ); } catch(const Exception&) { @@ -187,7 +187,7 @@ namespace dbaui } //------------------------------------------------------------------ void OLinkedDocumentsAccess::impl_newWithPilot( const char* _pWizardService, - const sal_Int32 _nCommandType, const ::rtl::OUString& _rObjectName ) + const sal_Int32 _nCommandType, const OUString& _rObjectName ) { try { @@ -209,13 +209,13 @@ namespace dbaui { WaitObject aWaitCursor( m_pDialogParent ); xWizard.set( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString::createFromAscii( _pWizardService ), + OUString::createFromAscii( _pWizardService ), aArgs.getWrappedPropertyValues(), m_xContext ), UNO_QUERY_THROW ); } - xWizard->trigger( ::rtl::OUString( "start" ) ); + xWizard->trigger( OUString( "start" ) ); ::comphelper::disposeComponent( xWizard ); } catch(const Exception&) @@ -224,25 +224,25 @@ namespace dbaui } } //------------------------------------------------------------------ - void OLinkedDocumentsAccess::newFormWithPilot( const sal_Int32 _nCommandType,const ::rtl::OUString& _rObjectName ) + void OLinkedDocumentsAccess::newFormWithPilot( const sal_Int32 _nCommandType,const OUString& _rObjectName ) { impl_newWithPilot( "com.sun.star.wizards.form.CallFormWizard", _nCommandType, _rObjectName ); } //------------------------------------------------------------------ - void OLinkedDocumentsAccess::newReportWithPilot( const sal_Int32 _nCommandType, const ::rtl::OUString& _rObjectName ) + void OLinkedDocumentsAccess::newReportWithPilot( const sal_Int32 _nCommandType, const OUString& _rObjectName ) { impl_newWithPilot( "com.sun.star.wizards.report.CallReportWizard", _nCommandType, _rObjectName ); } //------------------------------------------------------------------ void OLinkedDocumentsAccess::newTableWithPilot() { - impl_newWithPilot( "com.sun.star.wizards.table.CallTableWizard", -1, ::rtl::OUString() ); + impl_newWithPilot( "com.sun.star.wizards.table.CallTableWizard", -1, OUString() ); } //------------------------------------------------------------------ void OLinkedDocumentsAccess::newQueryWithPilot() { - impl_newWithPilot( "com.sun.star.wizards.query.CallQueryWizard", -1, ::rtl::OUString() ); + impl_newWithPilot( "com.sun.star.wizards.query.CallQueryWizard", -1, OUString() ); } //------------------------------------------------------------------ Reference< XComponent > OLinkedDocumentsAccess::newDocument( sal_Int32 i_nActionID, @@ -293,7 +293,7 @@ namespace dbaui ::comphelper::NamedValueCollection aCreationArgs( i_rCreationArgs ); if ( aClassId.getLength() ) aCreationArgs.put( "ClassID", aClassId ); - aCreationArgs.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); + aCreationArgs.put( (OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); // separate values which are real creation args from args relevant for opening the doc ::comphelper::NamedValueCollection aCommandArgs; @@ -317,7 +317,7 @@ namespace dbaui aCommandArgs.put( "OpenMode", aOpenModeArg ); Command aCommand; - aCommand.Name = ::rtl::OUString( "openDesign" ); + aCommand.Name = OUString( "openDesign" ); aCommand.Argument <<= aCommandArgs.getPropertyValues(); WaitObject aWaitCursor( m_pDialogParent ); xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), NULL ), UNO_QUERY ); @@ -332,7 +332,7 @@ namespace dbaui } //------------------------------------------------------------------ - Reference< XComponent > OLinkedDocumentsAccess::open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, + Reference< XComponent > OLinkedDocumentsAccess::open( const OUString& _rLinkName, Reference< XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ) { dbtools::SQLExceptionInfo aInfo; @@ -379,7 +379,7 @@ namespace dbaui aInfo = dbtools::SQLExceptionInfo(aSQLException); // more like a hack, insert an empty message - aInfo.prepend(::rtl::OUString(" \n")); + aInfo.prepend(OUString(" \n")); String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index c48e3893eadb..de79c6cc95d6 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -97,7 +97,7 @@ namespace dbaui // try some known item types if ( ItemAdapter< SfxBoolItem, sal_Bool >::tryGet( rItem, _out_rValue ) - || ItemAdapter< SfxStringItem, ::rtl::OUString >::tryGet( rItem, _out_rValue ) + || ItemAdapter< SfxStringItem, OUString >::tryGet( rItem, _out_rValue ) ) return; @@ -109,7 +109,7 @@ namespace dbaui { // try some known item types if ( ItemAdapter< SfxBoolItem, sal_Bool >::trySet( m_rItemSet, m_nItemID, _rValue ) - || ItemAdapter< SfxStringItem, ::rtl::OUString >::trySet( m_rItemSet, m_nItemID, _rValue ) + || ItemAdapter< SfxStringItem, OUString >::trySet( m_rItemSet, m_nItemID, _rValue ) ) return; diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 8dc0672c0288..ce334f466ca1 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno; //========================================================================= TYPEINIT1(OStringListItem, SfxPoolItem); //------------------------------------------------------------------------- -OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence< ::rtl::OUString >& _rList) +OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence< OUString >& _rList) :SfxPoolItem(_nWhich) ,m_aList(_rList) { @@ -53,8 +53,8 @@ int OStringListItem::operator==(const SfxPoolItem& _rItem) const return 0; // compare all strings individually - const ::rtl::OUString* pMyStrings = m_aList.getConstArray(); - const ::rtl::OUString* pCompareStrings = pCompare->m_aList.getConstArray(); + const OUString* pMyStrings = m_aList.getConstArray(); + const OUString* pCompareStrings = pCompare->m_aList.getConstArray(); for (sal_Int32 i=0; i<m_aList.getLength(); ++i, ++pMyStrings, ++pCompareStrings) if (!pMyStrings->equals(*pCompareStrings)) diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 81fe7ba766b4..e647c18c2a06 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -108,7 +108,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbu_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dbaui::OModuleRegistration::getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), + OUString::createFromAscii(pImplementationName), static_cast< XMultiServiceFactory* >(pServiceManager)); } diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 765a240dcb7c..9394263a19c2 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -60,16 +60,16 @@ namespace dbaui return ::comphelper::concatSequences(VCLXAccessibleComponent::getTypes(),OConnectionLineAccess_BASE::getTypes()); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OConnectionLineAccess::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OConnectionLineAccess::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- // XServiceInfo - static methods // ----------------------------------------------------------------------------- - ::rtl::OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility"); + return OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility"); } // ----------------------------------------------------------------------------- // XAccessibleContext @@ -106,9 +106,9 @@ namespace dbaui return AccessibleRole::UNKNOWN; // ? or may be an AccessibleRole::WINDOW } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription( ) throw (RuntimeException) { - static ::rtl::OUString sDescription("Relation"); + static OUString sDescription("Relation"); return sDescription; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx index dc19797e207b..cf093e6c5f8d 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx @@ -33,7 +33,7 @@ OConnectionLineData::OConnectionLineData() } //------------------------------------------------------------------------ -OConnectionLineData::OConnectionLineData( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ) +OConnectionLineData::OConnectionLineData( const OUString& rSourceFieldName, const OUString& rDestFieldName ) :m_aSourceFieldName( rSourceFieldName ) ,m_aDestFieldName( rDestFieldName ) { @@ -76,7 +76,7 @@ OConnectionLineData& OConnectionLineData::operator=( const OConnectionLineData& //------------------------------------------------------------------------ bool OConnectionLineData::Reset() { - m_aDestFieldName = m_aSourceFieldName = ::rtl::OUString(); + m_aDestFieldName = m_aSourceFieldName = OUString(); return true; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 37e1e260a384..24352c73db97 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -38,14 +38,14 @@ namespace dbaui { } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OJoinDesignViewAccess::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OJoinDesignViewAccess::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.JoinViewAccessibility"); + return OUString("org.openoffice.comp.dbu.JoinViewAccessibility"); } // ----------------------------------------------------------------------------- void OJoinDesignViewAccess::clearTableView() diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 4bc0556f2be3..89b192ac158b 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -394,7 +394,7 @@ void OJoinController::loadTableWindow( const ::comphelper::NamedValueCollection& { sal_Int32 nX = -1, nY = -1, nHeight = -1, nWidth = -1; - ::rtl::OUString sComposedName,sTableName,sWindowName; + OUString sComposedName,sTableName,sWindowName; sal_Bool bShowAll = false; sComposedName = i_rTableWindowSettings.getOrDefault( "ComposedName", sComposedName ); @@ -440,7 +440,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV aWindowData.put( "WindowHeight", static_cast<sal_Int32>((*aIter)->GetSize().Height()) ); aWindowData.put( "ShowAll", (*aIter)->IsShowAll() ); - const ::rtl::OUString sTableName( ::rtl::OUString( "Table" ) + ::rtl::OUString::valueOf( i ) ); + const OUString sTableName( OUString( "Table" ) + OUString::valueOf( i ) ); aAllTablesData.put( sTableName, aWindowData.getPropertyValues() ); } @@ -448,7 +448,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV } } // ----------------------------------------------------------------------------- -TTableWindowData::value_type OJoinController::createTableWindowData(const ::rtl::OUString& _sComposedName,const ::rtl::OUString& _sTableName,const ::rtl::OUString& _sWindowName) +TTableWindowData::value_type OJoinController::createTableWindowData(const OUString& _sComposedName,const OUString& _sTableName,const OUString& _sWindowName) { OJoinDesignView* pView = getJoinView(); if( pView ) diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 4802ed8055c5..ebe877782c34 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -284,9 +284,9 @@ OTableWindow* OJoinTableView::GetTabWindow( const String& rName ) return aIter == m_aTableMap.end() ? NULL : aIter->second; } // ----------------------------------------------------------------------------- -TTableWindowData::value_type OJoinTableView::createTableWindowData(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName) +TTableWindowData::value_type OJoinTableView::createTableWindowData(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName) { TTableWindowData::value_type pData( CreateImpl(_rComposedName, _sTableName,_rWinName) ); OJoinDesignView* pParent = getDesignView(); @@ -318,14 +318,14 @@ TTableWindowData::value_type OJoinTableView::createTableWindowData(const ::rtl:: return pData; } // ----------------------------------------------------------------------------- -OTableWindowData* OJoinTableView::CreateImpl(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName) +OTableWindowData* OJoinTableView::CreateImpl(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName) { return new OTableWindowData( NULL,_rComposedName,_sTableName, _rWinName ); } //------------------------------------------------------------------------------ -void OJoinTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool /*bNewTable*/) +void OJoinTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool /*bNewTable*/) { DBG_CHKTHIS(OJoinTableView,NULL); OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!"); diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx index 4167d1afaa67..728bd4dc0a79 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx @@ -38,7 +38,7 @@ namespace dbaui OQueryTableConnection& operator=(const OQueryTableConnection& rConn); sal_Bool operator==(const OQueryTableConnection& rCompare); - inline ::rtl::OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); } + inline OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); } inline sal_Bool IsVisited() const { return m_bVisited; } inline void SetVisited(sal_Bool bVisited) { m_bVisited = bVisited; } diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx index f482d406d81c..314fda96ba0a 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx @@ -53,7 +53,7 @@ OQueryTableConnectionData::OQueryTableConnectionData( const OQueryTableConnectio //------------------------------------------------------------------------ OQueryTableConnectionData::OQueryTableConnectionData(const TTableWindowData::value_type& _pReferencingTable ,const TTableWindowData::value_type& _pReferencedTable - ,const ::rtl::OUString& rConnName) + ,const OUString& rConnName) :OTableConnectionData( _pReferencingTable,_pReferencedTable, rConnName ) ,m_nFromEntryIndex(0) ,m_nDestEntryIndex(0) @@ -115,7 +115,7 @@ OQueryTableConnectionData& OQueryTableConnectionData::operator=(const OQueryTabl } //------------------------------------------------------------------------------ -::rtl::OUString OQueryTableConnectionData::GetAliasName(EConnectionSide nWhich) const +OUString OQueryTableConnectionData::GetAliasName(EConnectionSide nWhich) const { DBG_CHKTHIS(OQueryTableConnectionData,NULL); return nWhich == JTCS_FROM ? m_pReferencingTable->GetWinName() : m_pReferencedTable->GetWinName(); @@ -140,7 +140,7 @@ void OQueryTableConnectionData::InitFromDrag(const OTableFieldDescRef& rDragLeft SetFieldType(JTCS_FROM, rDragLeft->GetFieldType()); SetFieldType(JTCS_TO, rDragRight->GetFieldType()); - AppendConnLine((::rtl::OUString)rDragLeft->GetField(),(::rtl::OUString)rDragRight->GetField()); + AppendConnLine((OUString)rDragLeft->GetField(),(OUString)rDragRight->GetField()); } // ----------------------------------------------------------------------------- OTableConnectionData* OQueryTableConnectionData::NewInstance() const diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index 8f8721587ac1..94be02c2c50c 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -46,7 +46,7 @@ namespace dbaui OQueryTableConnectionData(); OQueryTableConnectionData( const OQueryTableConnectionData& rConnData ); OQueryTableConnectionData( const TTableWindowData::value_type& _pReferencingTable,const TTableWindowData::value_type& _pReferencedTable, - const ::rtl::OUString& rConnName=::rtl::OUString()); + const OUString& rConnName=OUString()); virtual ~OQueryTableConnectionData(); virtual void CopyFrom(const OTableConnectionData& rSource); @@ -59,7 +59,7 @@ namespace dbaui */ virtual sal_Bool Update(); - ::rtl::OUString GetAliasName(EConnectionSide nWhich) const; + OUString GetAliasName(EConnectionSide nWhich) const; sal_Int32 GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; } void SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; } diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 953cdfaa0da4..3e890c8550cf 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -59,14 +59,14 @@ OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::v { DBG_CTOR(OQueryTableWindow,NULL); if (pszInitialAlias != NULL) - m_strInitialAlias = ::rtl::OUString(pszInitialAlias); + m_strInitialAlias = OUString(pszInitialAlias); else m_strInitialAlias = GetAliasName(); // if table name matches alias, do not pass to InitialAlias, // as the appending of a possible token could not succeed... if (m_strInitialAlias == pTabWinData->GetTableName()) - m_strInitialAlias = ::rtl::OUString(); + m_strInitialAlias = OUString(); SetHelpId(HID_CTL_QRYDGNTAB); } @@ -87,7 +87,7 @@ sal_Bool OQueryTableWindow::Init() OQueryTableView* pContainer = static_cast<OQueryTableView*>(getTableView()); // first determine Alias - ::rtl::OUString sAliasName; + OUString sAliasName; TTableWindowData::value_type pWinData = GetData(); @@ -102,8 +102,8 @@ sal_Bool OQueryTableWindow::Init() // Alias with successive number if (pContainer->CountTableAlias(sAliasName, m_nAliasNum)) { - sAliasName += ::rtl::OUString('_'); - sAliasName += ::rtl::OUString::valueOf(m_nAliasNum); + sAliasName += OUString('_'); + sAliasName += OUString::valueOf(m_nAliasNum); } @@ -174,7 +174,7 @@ void OQueryTableWindow::OnEntryDoubleClicked(SvTreeListEntry* pEntry) } //------------------------------------------------------------------------------ -sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo) +sal_Bool OQueryTableWindow::ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo) { OSL_ENSURE(m_pListBox != NULL, "OQueryTableWindow::ExistsField : doesn't have ::com::sun::star::form::ListBox !"); OSL_ENSURE(rInfo.is(),"OQueryTableWindow::ExistsField: invalid argument for OTableFieldDescRef!"); @@ -190,7 +190,7 @@ sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTa while (pEntry) { - if (bCase(strFieldName,::rtl::OUString(m_pListBox->GetEntryText(pEntry)))) + if (bCase(strFieldName,OUString(m_pListBox->GetEntryText(pEntry)))) { OTableFieldInfo* pInf = static_cast<OTableFieldInfo*>(pEntry->GetUserData()); OSL_ENSURE(pInf != NULL, "OQueryTableWindow::ExistsField : field doesn't have FieldInfo !"); diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index da65912a1cb7..7718355195eb 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -30,16 +30,16 @@ namespace dbaui class OQueryTableWindow : public OTableWindow { sal_Int32 m_nAliasNum; - ::rtl::OUString m_strInitialAlias; + OUString m_strInitialAlias; public: OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); virtual ~OQueryTableWindow(); - ::rtl::OUString GetAliasName() const + OUString GetAliasName() const { return static_cast<OQueryTableWindowData*>(GetData().get())->GetAliasName(); } - void SetAliasName(const ::rtl::OUString& strNewAlias) + void SetAliasName(const OUString& strNewAlias) { static_cast<OQueryTableWindowData*>(GetData().get())->SetAliasName(strNewAlias); } @@ -49,10 +49,10 @@ namespace dbaui inline sal_Int32 GetAliasNum() const { return m_nAliasNum; } - sal_Bool ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo); + sal_Bool ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo); sal_Bool ExistsAVisitedConn() const; - virtual ::rtl::OUString GetName() const { return GetWinName(); } + virtual OUString GetName() const { return GetWinName(); } protected: virtual void KeyInput( const KeyEvent& rEvt ); diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 30f15e801526..582e8ae916f4 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -30,7 +30,7 @@ DBG_NAME(OQueryTableWindowData) // class OQueryTableWindowData //================================================================== //------------------------------------------------------------------------------ -OQueryTableWindowData::OQueryTableWindowData(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rTableName, const ::rtl::OUString& rTableAlias ) +OQueryTableWindowData::OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias ) :OTableWindowData(NULL,_rComposedName, rTableName, rTableAlias) { DBG_CTOR(OQueryTableWindowData,NULL); diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index 9f25d257c598..2386be48b500 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -30,11 +30,11 @@ namespace dbaui class OQueryTableWindowData : public OTableWindowData { public: - explicit OQueryTableWindowData(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rTableName, const ::rtl::OUString& rTableAlias); + explicit OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias); virtual ~OQueryTableWindowData(); - ::rtl::OUString GetAliasName() { return GetWinName(); } - void SetAliasName(const ::rtl::OUString& rNewAlias) { SetWinName(rNewAlias); } + OUString GetAliasName() { return GetWinName(); } + void SetAliasName(const OUString& rNewAlias) { SetWinName(rNewAlias); } }; } #endif // DBAUI_QUERY_TABLEWINDOWDATA_HXX diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 7b5660ad777b..636d005a080e 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -978,9 +978,9 @@ namespace aWorkStr += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote); aWorkStr += ::dbtools::quoteName(aQuote, aColumnName); } - aWorkStr += rtl::OUString(' '); - aWorkStr += rtl::OUString( ";ASC;DESC" ).getToken( (sal_uInt16)eOrder, ';' ); - aWorkStr += rtl::OUString(','); + aWorkStr += OUString(' '); + aWorkStr += OUString( ";ASC;DESC" ).getToken( (sal_uInt16)eOrder, ';' ); + aWorkStr += OUString(','); } } @@ -1170,7 +1170,7 @@ namespace if(!xConnection.is()) return OUString(); - ::std::map< rtl::OUString,bool> aGroupByNames; + ::std::map< OUString,bool> aGroupByNames; OUString aGroupByStr; try @@ -1216,7 +1216,7 @@ namespace } if ( aGroupByNames.find(sGroupByPart) == aGroupByNames.end() ) { - aGroupByNames.insert(::std::map< rtl::OUString,bool>::value_type(sGroupByPart,true)); + aGroupByNames.insert(::std::map< OUString,bool>::value_type(sGroupByPart,true)); aGroupByStr += sGroupByPart; aGroupByStr += OUString(','); } @@ -3502,7 +3502,7 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p OUString sFunctionName = pFunctionName->getTokenValue(); if ( sFunctionName.isEmpty() ) - sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8); + sFunctionName = OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8); nDataType = OSQLParser::getFunctionReturnType( sFunctionName diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 94a1b0e21425..cc793029c744 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::accessibility; namespace { // ----------------------------------------------------------------------------- - sal_Bool isColumnInKeyType(const Reference<XIndexAccess>& _rxKeys,const ::rtl::OUString& _rColumnName,sal_Int32 _nKeyType) + sal_Bool isColumnInKeyType(const Reference<XIndexAccess>& _rxKeys,const OUString& _rColumnName,sal_Int32 _nKeyType) { sal_Bool bReturn = sal_False; if(_rxKeys.is()) @@ -176,12 +176,12 @@ namespace TTableConnectionData::value_type aNewConnData(pNewConnData); Reference<XIndexAccess> xReferencedKeys( _rDest.GetData()->getKeys()); - ::rtl::OUString sRelatedColumn; + OUString sRelatedColumn; // iterate through all foreignkey columns to create the connections - Sequence< ::rtl::OUString> aElements(_rxSourceForeignKeyColumns->getElementNames()); - const ::rtl::OUString* pIter = aElements.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aElements.getLength(); + Sequence< OUString> aElements(_rxSourceForeignKeyColumns->getElementNames()); + const OUString* pIter = aElements.getConstArray(); + const OUString* pEnd = pIter + aElements.getLength(); for(sal_Int32 i=0;pIter != pEnd;++pIter,++i) { Reference<XPropertySet> xColumn; @@ -389,14 +389,14 @@ void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, } } // ----------------------------------------------------------------------------- -OTableWindowData* OQueryTableView::CreateImpl(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName) +OTableWindowData* OQueryTableView::CreateImpl(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName) { return new OQueryTableWindowData( _rComposedName, _sTableName,_rWinName ); } //------------------------------------------------------------------------------ -void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl::OUString& _rAliasName, sal_Bool bNewTable) +void OQueryTableView::AddTabWin(const OUString& _rTableName, const OUString& _rAliasName, sal_Bool bNewTable) { DBG_CHKTHIS(OQueryTableView,NULL); // this method has been inherited from the base class, linking back to the parent and which constructs @@ -410,16 +410,16 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl: try { Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents(xMetaData, _rTableName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation); - ::rtl::OUString sRealName(sSchema); + OUString sRealName(sSchema); if (!sRealName.isEmpty()) - sRealName+= ::rtl::OUString('.'); + sRealName+= OUString('.'); sRealName += sTable; AddTabWin(_rTableName, sRealName, _rAliasName, bNewTable); @@ -431,7 +431,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl: } // ----------------------------------------------------------------------------- // find the table which has a foreign key with this referencedTable name -Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKeys,const ::rtl::OUString& _rReferencedTable) +Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKeys,const OUString& _rReferencedTable) { if(!_rxKeys.is()) return Reference<XPropertySet>(); @@ -449,7 +449,7 @@ Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKey xKey->getPropertyValue(PROPERTY_TYPE) >>= nKeyType; if(KeyType::FOREIGN == nKeyType) { - ::rtl::OUString sReferencedTable; + OUString sReferencedTable; xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; // TODO check case if(sReferencedTable == _rReferencedTable) @@ -460,7 +460,7 @@ Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKey return Reference<XPropertySet>(); } //------------------------------------------------------------------------------ -void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& _rTableName, const ::rtl::OUString& strAlias, sal_Bool bNewTable) +void OQueryTableView::AddTabWin(const OUString& _rComposedName, const OUString& _rTableName, const OUString& strAlias, sal_Bool bNewTable) { DBG_CHKTHIS(OQueryTableView,NULL); OSL_ENSURE(!_rTableName.isEmpty() || !strAlias.isEmpty(), "OQueryTableView::AddTabWin : no tables or aliases !"); @@ -528,7 +528,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r break; Reference<XNameAccess> xFKeyColumns; - ::rtl::OUString aReferencedTable; + OUString aReferencedTable; Reference<XColumnsSupplier> xColumnsSupplier; const sal_Int32 nKeyCount = xKeyIndex->getCount(); @@ -926,7 +926,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn SetDefaultTabWinPosSize(pTabWin); // Show the window and add to the list - ::rtl::OUString sName = static_cast< OQueryTableWindowData*>(pData.get())->GetAliasName(); + OUString sName = static_cast< OQueryTableWindowData*>(pData.get())->GetAliasName(); OSL_ENSURE(GetTabWinMap()->find(sName) == GetTabWinMap()->end(),"Alias name already in list!"); GetTabWinMap()->insert(OTableWindowMap::value_type(sName,pTabWin)); diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index be9833dd16b3..5adef14b0df0 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -78,7 +78,7 @@ sal_Bool OQueryTextView::checkStatement() return sal_True; } // ----------------------------------------------------------------------------- -::rtl::OUString OQueryTextView::getStatement() +OUString OQueryTextView::getStatement() { return m_pEdit->GetText(); } @@ -98,7 +98,7 @@ void OQueryTextView::clear() m_pEdit->SetText(String()); } // ----------------------------------------------------------------------------- -void OQueryTextView::setStatement(const ::rtl::OUString& _rsStatement) +void OQueryTextView::setStatement(const OUString& _rsStatement) { m_pEdit->SetText(_rsStatement); } diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index b6a9dbe00ee8..2f940cf326f6 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -87,7 +87,7 @@ sal_Bool OQueryViewSwitch::checkStatement() return m_pDesignView->checkStatement(); } // ----------------------------------------------------------------------------- -::rtl::OUString OQueryViewSwitch::getStatement() +OUString OQueryViewSwitch::getStatement() { if(m_pTextView->IsVisible()) return m_pTextView->getStatement(); @@ -118,7 +118,7 @@ void OQueryViewSwitch::GrabFocus() m_pDesignView->GrabFocus(); } // ----------------------------------------------------------------------------- -void OQueryViewSwitch::setStatement(const ::rtl::OUString& _rsStatement) +void OQueryViewSwitch::setStatement(const OUString& _rsStatement) { if(m_pTextView->IsVisible()) m_pTextView->setStatement(_rsStatement); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index beb4012c6a1c..ad29c142780b 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -51,8 +51,8 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; using namespace ::com::sun::star::accessibility; -#define g_strOne rtl::OUString("1") -#define g_strZero rtl::OUString("0") +#define g_strOne OUString("1") +#define g_strZero OUString("0") #define DEFAULT_QUERY_COLS 20 #define DEFAULT_SIZE GetTextWidth(g_strZero) * 30 @@ -64,7 +64,7 @@ using namespace ::com::sun::star::accessibility; // ----------------------------------------------------------------------------- namespace { - sal_Bool isFieldNameAsterix(const ::rtl::OUString& _sFieldName ) + sal_Bool isFieldNameAsterix(const OUString& _sFieldName ) { sal_Bool bAsterix = !(!_sFieldName.isEmpty() && _sFieldName.toChar() != '*'); if ( !bAsterix ) @@ -197,7 +197,7 @@ void OSelectionBrowseBox::initialize() for (size_t i = 0; i < sizeof (eFunctions) / sizeof (eFunctions[0]); ++i) { m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); - m_aFunctionStrings += rtl::OStringToOUString(rContext.getIntlKeywordAscii(eFunctions[i]), + m_aFunctionStrings += OStringToOUString(rContext.getIntlKeywordAscii(eFunctions[i]), RTL_TEXTENCODING_UTF8); } m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); @@ -588,7 +588,7 @@ void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTab { // append undo action for the function field _pEntry->SetFunctionType(FKT_NONE); - _pEntry->SetFunction(::rtl::OUString()); + _pEntry->SetFunction(OUString()); _pEntry->SetGroupBy(sal_False); notifyFunctionFieldChanged(sOldLocalizedFunctionName,_pEntry->GetFunction(),_bListAction,_nColumnId); } @@ -598,12 +598,12 @@ void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTab sal_Bool OSelectionBrowseBox::fillColumnRef(const OSQLParseNode* _pColumnRef, const Reference< XConnection >& _rxConnection, OTableFieldDescRef& _pEntry, sal_Bool& _bListAction ) { OSL_ENSURE(_pColumnRef,"No valid parsenode!"); - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; OSQLParseTreeIterator::getColumnRange(_pColumnRef,_rxConnection,sColumnName,sTableRange); return fillColumnRef(sColumnName,sTableRange,_rxConnection->getMetaData(),_pEntry,_bListAction); } // ----------------------------------------------------------------------------- -sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName,const ::rtl::OUString& _sTableRange,const Reference<XDatabaseMetaData>& _xMetaData,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction) +sal_Bool OSelectionBrowseBox::fillColumnRef(const OUString& _sColumnName,const OUString& _sTableRange,const Reference<XDatabaseMetaData>& _xMetaData,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction) { sal_Bool bError = sal_False; ::comphelper::UStringMixEqual bCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); @@ -613,7 +613,7 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName, if ( !_pEntry->GetTabWindow() ) { // fill tab window - ::rtl::OUString sOldAlias = _pEntry->GetAlias(); + OUString sOldAlias = _pEntry->GetAlias(); if ( !fillEntryTable(_pEntry,_pEntry->GetTable()) ) fillEntryTable(_pEntry,_pEntry->GetAlias()); // only when the first failed if ( !bCase(sOldAlias,_pEntry->GetAlias()) ) @@ -674,11 +674,11 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& if ( !xMetaData.is() ) return sal_True; - ::rtl::OUString sErrorMsg; + OUString sErrorMsg; // second test if the name can be set as select columns in a pseudo statement // we have to look which entries we should quote - const ::rtl::OUString sFieldAlias = _pEntry->GetFieldAlias(); + const OUString sFieldAlias = _pEntry->GetFieldAlias(); ::connectivity::OSQLParser& rParser( rController.getParser() ); { // automatically add parentheses around subqueries @@ -688,7 +688,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& if (pParseNode == NULL) pParseNode = rParser.parseTree( devnull, _sFieldName, false ); if (pParseNode != NULL && SQL_ISRULE(pParseNode, select_statement)) - _sFieldName = ::rtl::OUString("(") + _sFieldName + ")"; + _sFieldName = OUString("(") + _sFieldName + ")"; } OSQLParseNode* pParseNode = NULL; @@ -699,8 +699,8 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& // - quote the field name, parse internationally // - quote the field name, parse en-US size_t nPass = 4; - ::rtl::OUString sQuotedFullFieldName(::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), _sFieldName )); - ::rtl::OUString sFullFieldName(_sFieldName); + OUString sQuotedFullFieldName(::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), _sFieldName )); + OUString sFullFieldName(_sFieldName); if ( _pEntry->isAggreateFunction() ) { @@ -714,19 +714,19 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& bool bQuote = ( nPass <= 2 ); bool bInternational = ( nPass % 2 ) == 0; - ::rtl::OUString sSql; + OUString sSql; if ( bQuote ) sSql += sQuotedFullFieldName; else sSql += sFullFieldName; - sSql = ::rtl::OUString("SELECT ") + sSql; + sSql = OUString("SELECT ") + sSql; if ( !sFieldAlias.isEmpty() ) { // always quote the alias name: there cannot be a function in it - sSql += ::rtl::OUString(" "); + sSql += OUString(" "); sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), sFieldAlias ); } - sSql += ::rtl::OUString(" FROM x"); + sSql += OUString(" FROM x"); pParseNode = rParser.parseTree( sErrorMsg, sSql, bInternational ); } @@ -777,7 +777,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& ::connectivity::OSQLParseNode* pChild = pSelection->getChild( i ); OSL_ENSURE(SQL_ISRULE(pChild,derived_column), "No derived column found!"); // get the column alias - ::rtl::OUString sColumnAlias = OSQLParseTreeIterator::getColumnAlias(pChild); + OUString sColumnAlias = OSQLParseTreeIterator::getColumnAlias(pChild); if ( !sColumnAlias.isEmpty() ) // we found an as clause { String aSelectionAlias = aSelEntry->GetFieldAlias(); @@ -821,7 +821,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& if ( nFunCount == 4 && SQL_ISRULE(pColumnRef->getChild(3),column_ref) ) bError = fillColumnRef( pColumnRef->getChild(3), xConnection, aSelEntry, _bListAction ); else if ( nFunCount == 3 ) // we have a COUNT(*) here, so take the first table - bError = fillColumnRef( ::rtl::OUString("*"), ::rtl::OUString(), xMetaData, aSelEntry, _bListAction ); + bError = fillColumnRef( OUString("*"), OUString(), xMetaData, aSelEntry, _bListAction ); else { nFunctionType |= FKT_NUMERIC; @@ -831,7 +831,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& } // now parse the parameters - ::rtl::OUString sParameters; + OUString sParameters; for(sal_uInt32 function = 2; function < nFunCount; ++function) // we only want to parse the parameters of the function pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, bQuote ); @@ -854,7 +854,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& { // so we first clear the function field clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId); - ::rtl::OUString sFunction; + OUString sFunction; pColumnRef->parseNodeToStr( sFunction, xConnection, &rController.getParser().getContext(), @@ -869,7 +869,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& { // now parse the whole statement sal_uInt32 nFunCount = pColumnRef->count(); - ::rtl::OUString sParameters; + OUString sParameters; for(sal_uInt32 function = 0; function < nFunCount; ++function) pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, sal_True ); @@ -887,7 +887,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& aSelEntry->SetFunctionType(FKT_NUMERIC | FKT_OTHER); } - aSelEntry->SetAlias(::rtl::OUString()); + aSelEntry->SetAlias(OUString()); notifyTableFieldChanged(sOldAlias,aSelEntry->GetAlias(),_bListAction, nColumnId); } @@ -1026,8 +1026,8 @@ sal_Bool OSelectionBrowseBox::SaveModified() } else { - pEntry->SetAlias(::rtl::OUString()); - pEntry->SetTable(::rtl::OUString()); + pEntry->SetAlias(OUString()); + pEntry->SetTable(OUString()); pEntry->SetTabWindow(NULL); } sNewValue = pEntry->GetAlias(); @@ -1105,10 +1105,10 @@ sal_Bool OSelectionBrowseBox::SaveModified() sal_uInt16 nIdx = sal_uInt16(nRow - BROW_CRIT1_ROW); String aText = comphelper::string::stripStart(m_pTextCell->GetText(), ' '); - ::rtl::OUString aCrit; + OUString aCrit; if(aText.Len()) { - ::rtl::OUString aErrorMsg; + OUString aErrorMsg; Reference<XPropertySet> xColumn; OSQLParseNode* pParseNode = getDesignView()->getPredicateTreeFromEntry(pEntry,aText,aErrorMsg,xColumn); @@ -1137,9 +1137,9 @@ sal_Bool OSelectionBrowseBox::SaveModified() case DataType::CLOB: if(aText.GetChar(0) != '\'' || aText.GetChar(aText.Len() -1) != '\'') { - aText.SearchAndReplaceAll(rtl::OUString("'"), rtl::OUString("''")); - String aTmp(rtl::OUString("'")); - (aTmp += aText) += rtl::OUString("'"); + aText.SearchAndReplaceAll(OUString("'"), OUString("''")); + String aTmp(OUString("'")); + (aTmp += aText) += OUString("'"); aText = aTmp; } break; @@ -1724,8 +1724,8 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt pEntry = *aIter; OSL_ENSURE(pEntry.is(),"OTableFieldDescRef was null!"); - const ::rtl::OUString aField = pEntry->GetField(); - const ::rtl::OUString aAlias = pEntry->GetAlias(); + const OUString aField = pEntry->GetField(); + const OUString aAlias = pEntry->GetAlias(); if (bCase(aField,rInfo->GetField()) && bCase(aAlias,rInfo->GetAlias()) && @@ -1771,7 +1771,7 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel) { OTableFieldDescRef pEntry = *aIter; - ::rtl::OUString sValue = pEntry->GetCriteria(nLevel); + OUString sValue = pEntry->GetCriteria(nLevel); if ( !sValue.isEmpty() ) { pEntry->SetCriteria( nNewLevel, sValue); @@ -1804,8 +1804,8 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S for(;aIter != aEnd;++aIter) { OTableFieldDescRef pEntry = *aIter; - const ::rtl::OUString aField = pEntry->GetField(); - const ::rtl::OUString aAlias = pEntry->GetAlias(); + const OUString aField = pEntry->GetField(); + const OUString aAlias = pEntry->GetAlias(); if (bCase(aField,rInfo->GetField()) && bCase(aAlias,rInfo->GetAlias()) && @@ -1900,8 +1900,8 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef& rInfo, const EOrde for(;aIter != aEnd;++aIter) { pEntry = *aIter; - ::rtl::OUString aField = pEntry->GetField(); - ::rtl::OUString aAlias = pEntry->GetAlias(); + OUString aField = pEntry->GetField(); + OUString aAlias = pEntry->GetAlias(); if (bCase(aField,rInfo->GetField()) && bCase(aAlias,rInfo->GetAlias())) @@ -2342,7 +2342,7 @@ String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 nCo sal_uInt16 nIdx = m_pOrderCell->GetSelectEntryPos(); if (nIdx == sal_uInt16(-1)) nIdx = 0; - return rtl::OUString(nIdx); + return OUString(nIdx); } default: return GetCellText(nCellIndex, nColId); @@ -2639,7 +2639,7 @@ void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window _pControl->EnableInput(bEnable); } // ----------------------------------------------------------------------------- -void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId) +void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const OString& _sHelpId) { m_pTextCell->SetText(_sText); m_pTextCell->ClearModifyFlag(); @@ -2694,7 +2694,7 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) m_bWasEditing = sal_False; } // ----------------------------------------------------------------------------- -::rtl::OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const +OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const { String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); @@ -2702,12 +2702,12 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) xub_StrLen nToken = (xub_StrLen) (_nRow >= GetBrowseRow(BROW_CRIT2_ROW)) ? xub_StrLen(BROW_CRIT2_ROW) : xub_StrLen(GetRealRow(_nRow)); - return ::rtl::OUString(aLabel.GetToken(nToken)); + return OUString(aLabel.GetToken(nToken)); } // ----------------------------------------------------------------------------- -::rtl::OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const +OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const { - ::rtl::OUString sRetText; + OUString sRetText; switch( _eObjType ) { case ::svt::BBTYPE_ROWHEADERCELL: @@ -2719,7 +2719,7 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) return sRetText; } // ----------------------------------------------------------------------------- -sal_Bool OSelectionBrowseBox::fillEntryTable(OTableFieldDescRef& _pEntry,const ::rtl::OUString& _sTableName) +sal_Bool OSelectionBrowseBox::fillEntryTable(OTableFieldDescRef& _pEntry,const OUString& _sTableName) { sal_Bool bRet = sal_False; OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap(); @@ -2804,7 +2804,7 @@ Reference< XAccessible > OSelectionBrowseBox::CreateAccessibleCell( sal_Int32 _n return EditBrowseBox::CreateAccessibleCell( _nRow, _nColumnPos ); } // ----------------------------------------------------------------------------- -bool OSelectionBrowseBox::HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const +bool OSelectionBrowseBox::HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const { OTableFields& aFields = getFields(); OTableFields::iterator aIter = aFields.begin(); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 098be93c48ec..40cbfc737ef4 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -90,7 +90,7 @@ namespace dbaui void RemoveColumn( sal_uInt16 _nColumnId ); void DeleteFields( const String& rAliasName ); - bool HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const; + bool HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const; // AddGroupBy:: inserts a field with function == grouping. If the fields already exists and uses an aggregate function, // the flag is not set @@ -162,7 +162,7 @@ namespace dbaui @return The header text of the specified row. */ - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const; /** return the name of the specified object. @param eObjType @@ -172,7 +172,7 @@ namespace dbaui @return The name of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; // IAccessibleTableProvider /** Creates the accessible object of a data table cell. @@ -233,7 +233,7 @@ namespace dbaui void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); OTableFields& getFields() const; void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); - void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId); + void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const OString& _sHelpId); void invalidateUndoRedo(); OTableFieldDescRef getEntry(OTableFields::size_type _nPos); @@ -259,7 +259,7 @@ namespace dbaui @return <TRUE/> if the table name was set otherwise <FALSE/> */ - sal_Bool fillEntryTable(OTableFieldDescRef& _pEntry,const ::rtl::OUString& _sTableName); + sal_Bool fillEntryTable(OTableFieldDescRef& _pEntry,const OUString& _sTableName); /** uses the parse node to fill all information into the field @param _pColumnRef @@ -277,8 +277,8 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, OTableFieldDescRef& _pEntry, sal_Bool& _bListAction); - sal_Bool fillColumnRef( const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sTableRange, + sal_Bool fillColumnRef( const OUString& _sColumnName, + const OUString& _sTableRange, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, OTableFieldDescRef& _pEntry, sal_Bool& _bListAction); diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index acfd6ce56cd8..2f68e74d1dc3 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -120,7 +120,7 @@ sal_Bool OTableConnectionData::SetConnLine( sal_uInt16 nIndex, const String& rSo } //------------------------------------------------------------------------ -sal_Bool OTableConnectionData::AppendConnLine( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ) +sal_Bool OTableConnectionData::AppendConnLine( const OUString& rSourceFieldName, const OUString& rDestFieldName ) { OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin(); OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end(); diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 9a4e5005f52f..020e5d07eb0f 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -57,7 +57,7 @@ OTableFieldDesc::OTableFieldDesc(const OTableFieldDesc& rRS) } //------------------------------------------------------------------------------ -OTableFieldDesc::OTableFieldDesc(const ::rtl::OUString& rT, const ::rtl::OUString& rF ) +OTableFieldDesc::OTableFieldDesc(const OUString& rT, const OUString& rF ) :m_pTabWindow(0) ,m_eFunctionType( FKT_NONE ) ,m_eOrderDir( ORDER_NONE ) @@ -117,7 +117,7 @@ sal_Bool OTableFieldDesc::operator==( const OTableFieldDesc& rDesc ) } //------------------------------------------------------------------------------ -void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit) +void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const OUString& rCrit) { DBG_CHKTHIS(OTableFieldDesc,NULL); if (nIdx < m_aCriteria.size()) @@ -125,16 +125,16 @@ void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit else { for(sal_Int32 i=m_aCriteria.size();i<nIdx;++i) - m_aCriteria.push_back( ::rtl::OUString()); + m_aCriteria.push_back( OUString()); m_aCriteria.push_back(rCrit); } } //------------------------------------------------------------------------------ -::rtl::OUString OTableFieldDesc::GetCriteria( sal_uInt16 nIdx ) const +OUString OTableFieldDesc::GetCriteria( sal_uInt16 nIdx ) const { DBG_CHKTHIS(OTableFieldDesc,NULL); - ::rtl::OUString aRetStr; + OUString aRetStr; if( nIdx < m_aCriteria.size()) aRetStr = m_aCriteria[nIdx]; @@ -144,11 +144,11 @@ void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit // ----------------------------------------------------------------------------- namespace { - struct SelectPropertyValueAsString : public ::std::unary_function< PropertyValue, ::rtl::OUString > + struct SelectPropertyValueAsString : public ::std::unary_function< PropertyValue, OUString > { - ::rtl::OUString operator()( const PropertyValue& i_rPropValue ) const + OUString operator()( const PropertyValue& i_rPropValue ) const { - ::rtl::OUString sValue; + OUString sValue; OSL_VERIFY( i_rPropValue.Value >>= sValue ); return sValue; } @@ -211,12 +211,12 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con { sal_Int32 c = 0; Sequence< PropertyValue > aCriteria( m_aCriteria.size() ); - for ( ::std::vector< ::rtl::OUString >::const_iterator crit = m_aCriteria.begin(); + for ( ::std::vector< OUString >::const_iterator crit = m_aCriteria.begin(); crit != m_aCriteria.end(); ++crit, ++c ) { - aCriteria[c].Name = ::rtl::OUString( "Criterion_" ) + ::rtl::OUString::valueOf( c ); + aCriteria[c].Name = OUString( "Criterion_" ) + OUString::valueOf( c ); aCriteria[c].Value <<= *crit; } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index dee5ef4dc6b0..88e1cfcb69b9 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -180,7 +180,7 @@ sal_Bool OTableWindow::FillListBox() if (GetData()->IsShowAll()) { - SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString("*") ); + SvTreeListEntry* pEntry = m_pListBox->InsertEntry( OUString("*") ); pEntry->SetUserData( createUserData(NULL,false) ); } @@ -198,9 +198,9 @@ sal_Bool OTableWindow::FillListBox() Reference< XNameAccess > xColumns = m_pData->getColumns(); if( xColumns.is() ) { - Sequence< ::rtl::OUString> aColumns = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aColumns.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); + Sequence< OUString> aColumns = xColumns->getElementNames(); + const OUString* pIter = aColumns.getConstArray(); + const OUString* pEnd = pIter + aColumns.getLength(); SvTreeListEntry* pEntry = NULL; for (; pIter != pEnd; ++pIter) @@ -553,7 +553,7 @@ sal_Bool OTableWindow::ExistsAConn() const return getTableView()->ExistsAConn(this); } //------------------------------------------------------------------------------ -void OTableWindow::EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields) +void OTableWindow::EnumValidFields(::std::vector< OUString>& arrstrFields) { arrstrFields.clear(); // This default implementation counts every item in the ListBox ... for any other behaviour it must be over-written diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index b7350b15bfd9..92fa870682c7 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -74,28 +74,28 @@ namespace dbaui return ::comphelper::concatSequences(VCLXAccessibleComponent::getTypes(),OTableWindowAccess_BASE::getTypes()); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTableWindowAccess::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OTableWindowAccess::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } // ----------------------------------------------------------------------------- // XServiceInfo - static methods - Sequence< ::rtl::OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.accessibility.Accessible"); - aSupported[1] = ::rtl::OUString("com.sun.star.accessibility.AccessibleContext"); + Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.accessibility.Accessible"); + aSupported[1] = OUString("com.sun.star.accessibility.AccessibleContext"); return aSupported; } // ----------------------------------------------------------------------------- - ::rtl::OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.TableWindowAccessibility"); + return OUString("org.openoffice.comp.dbu.TableWindowAccessibility"); } // ----------------------------------------------------------------------------- // XAccessibleContext @@ -261,15 +261,15 @@ namespace dbaui return m_pTable && !m_pTable->getTableView()->getDesignView()->getController().isReadOnly(); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTableWindowAccess::getTitledBorderText( ) throw (RuntimeException) + OUString SAL_CALL OTableWindowAccess::getTitledBorderText( ) throw (RuntimeException) { return getAccessibleName( ); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTableWindowAccess::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL OTableWindowAccess::getAccessibleName( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString sAccessibleName; + OUString sAccessibleName; if ( m_pTable ) sAccessibleName = m_pTable->getTitle(); return sAccessibleName; diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index 49ff4919f289..90155ca00110 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -41,9 +41,9 @@ using namespace ::com::sun::star::container; DBG_NAME(OTableWindowData) //------------------------------------------------------------------------------ OTableWindowData::OTableWindowData( const Reference< XPropertySet>& _xTable - ,const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& rTableName - ,const ::rtl::OUString& rWinName ) + ,const OUString& _rComposedName + ,const OUString& rTableName + ,const OUString& rWinName ) :m_xTable(_xTable) ,m_aTableName( rTableName ) ,m_aWinName( rWinName ) diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 2a0a08e3cff8..07ef8b711f5c 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -195,7 +195,7 @@ namespace dbaui ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); - Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.frame.Frame"), m_pViewSwitch->getORB()),UNO_QUERY ); + Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.frame.Frame"), m_pViewSwitch->getORB()),UNO_QUERY ); m_xBeamer.set( xBeamerFrame ); OSL_ENSURE(m_xBeamer.is(),"No frame created!"); m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) ); @@ -204,12 +204,12 @@ namespace dbaui Reference < XPropertySet > xPropSet( xBeamerFrame, UNO_QUERY ); try { - const ::rtl::OUString aLayoutManager( "LayoutManager" ); + const OUString aLayoutManager( "LayoutManager" ); Reference < XPropertySet > xLMPropSet(xPropSet->getPropertyValue( aLayoutManager ),UNO_QUERY); if ( xLMPropSet.is() ) { - const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" ); + const OUString aAutomaticToolbars( "AutomaticToolbars" ); xLMPropSet->setPropertyValue( aAutomaticToolbars, Any( sal_False )); } } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index a5b23ecb5f65..ca36ffec8a56 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -233,7 +233,7 @@ namespace dbaui LocalResourceAccess aLocalRes( RSC_QUERY_OBJECT_TYPE, RSC_RESOURCE ); sObjectType = String( ModuleRes( (sal_uInt16)( _nCommandType + 1 ) ) ); } - sMessageText.SearchAndReplace( rtl::OUString("$object$"), sObjectType ); + sMessageText.SearchAndReplace( OUString("$object$"), sObjectType ); return sMessageText; } } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 16d96ffde1b7..90adc949949c 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -220,7 +220,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) m_pTableControl->lateInit(); m_pJoinControl->m_aCBNatural.Check(sal_False); m_pTableControl->enableRelation(false); - ::rtl::OUString sEmpty; + OUString sEmpty; m_pConnData->AppendConnLine(sEmpty,sEmpty); aPB_OK.Enable(sal_True); } @@ -282,9 +282,9 @@ IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) try { Reference<XNameAccess> xReferencedTableColumns(m_pConnData->getReferencedTable()->getColumns()); - Sequence< ::rtl::OUString> aSeq = m_pConnData->getReferencingTable()->getColumns()->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = m_pConnData->getReferencingTable()->getColumns()->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( xReferencedTableColumns->hasByName(*pIter) ) diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 9ed18154c587..57b8fdf0f3db 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -58,7 +58,7 @@ ORelationTableConnectionData::ORelationTableConnectionData() //------------------------------------------------------------------------ ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowData::value_type& _pReferencingTable, const TTableWindowData::value_type& _pReferencedTable, - const ::rtl::OUString& rConnName ) + const OUString& rConnName ) :OTableConnectionData( _pReferencingTable, _pReferencedTable ) ,m_nUpdateRules(KeyRule::NO_ACTION) ,m_nDeleteRules(KeyRule::NO_ACTION) @@ -102,7 +102,7 @@ sal_Bool ORelationTableConnectionData::DropRelation() OSL_ENSURE(xKey.is(),"Key is not valid!"); if(xKey.is()) { - ::rtl::OUString sName; + OUString sName; xKey->getPropertyValue(PROPERTY_NAME) >>= sName; if(String(sName) == m_aConnName) { @@ -124,7 +124,7 @@ void ORelationTableConnectionData::ChangeOrientation() DBG_CHKTHIS(ORelationTableConnectionData,NULL); ////////////////////////////////////////////////////////////////////// // Source- und DestFieldName der Linien austauschen - ::rtl::OUString sTempString; + OUString sTempString; OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin(); OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end(); for(;aIter != aEnd;++aIter) @@ -172,9 +172,9 @@ sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropert const Reference< XNameAccess> xKeyColumns = dbtools::getPrimaryKeyColumns_throw(i_xTable); if ( xKeyColumns.is() ) { - Sequence< ::rtl::OUString> aKeyColumns = xKeyColumns->getElementNames(); - const ::rtl::OUString* pKeyIter = aKeyColumns.getConstArray(); - const ::rtl::OUString* pKeyEnd = pKeyIter + aKeyColumns.getLength(); + Sequence< OUString> aKeyColumns = xKeyColumns->getElementNames(); + const OUString* pKeyIter = aKeyColumns.getConstArray(); + const OUString* pKeyEnd = pKeyIter + aKeyColumns.getLength(); for(;pKeyIter != pKeyEnd;++pKeyIter) { @@ -301,14 +301,14 @@ sal_Bool ORelationTableConnectionData::Update() if ( xKey.is() && xTableProp.is() ) { // build a foreign key name - ::rtl::OUString sSourceName; + OUString sSourceName; xTableProp->getPropertyValue(PROPERTY_NAME) >>= sSourceName; - ::rtl::OUString sKeyName = sSourceName; + OUString sKeyName = sSourceName; sKeyName += getReferencedTable()->GetTableName(); xKey->setPropertyValue(PROPERTY_NAME,makeAny(sKeyName)); xKey->setPropertyValue(PROPERTY_TYPE,makeAny(KeyType::FOREIGN)); - xKey->setPropertyValue(PROPERTY_REFERENCEDTABLE,makeAny(::rtl::OUString(getReferencedTable()->GetTableName()))); + xKey->setPropertyValue(PROPERTY_REFERENCEDTABLE,makeAny(OUString(getReferencedTable()->GetTableName()))); xKey->setPropertyValue(PROPERTY_UPDATERULE, makeAny(GetUpdateRules())); xKey->setPropertyValue(PROPERTY_DELETERULE, makeAny(GetDeleteRules())); } @@ -345,7 +345,7 @@ sal_Bool ORelationTableConnectionData::Update() } // get the name of foreign key // search for columns - m_aConnName = ::rtl::OUString(); + m_aConnName = OUString(); xKey.clear(); bool bDropRelation = false; for(sal_Int32 i=0;i<xKeys->getCount();++i) @@ -356,20 +356,20 @@ xKey.clear(); { sal_Int32 nType = 0; xKey->getPropertyValue(PROPERTY_TYPE) >>= nType; - ::rtl::OUString sReferencedTable; + OUString sReferencedTable; xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; - if ( sReferencedTable == ::rtl::OUString(getReferencedTable()->GetTableName()) ) + if ( sReferencedTable == OUString(getReferencedTable()->GetTableName()) ) { xColSup.set(xKey,UNO_QUERY_THROW); try { Reference<XNameAccess> xColumns = xColSup->getColumns(); - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); Reference<XPropertySet> xColumn; - ::rtl::OUString sName,sRelatedColumn; + OUString sName,sRelatedColumn; for ( ; pIter != pEnd ; ++pIter ) { xColumn.set(xColumns->getByName(*pIter),UNO_QUERY_THROW); @@ -418,13 +418,13 @@ xKey.clear(); { OConnectionLineDataVec().swap(m_vConnLineData); Reference<XNameAccess> xColumns = xColSup->getColumns(); - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); m_vConnLineData.reserve( aNames.getLength() ); Reference<XPropertySet> xColumn; - ::rtl::OUString sName,sRelatedColumn; + OUString sName,sRelatedColumn; for(;pIter != pEnd;++pIter) { diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index 4d9e1ac6f150..067945473b10 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -33,7 +33,7 @@ namespace dbaui @return The composed name or the window name. */ - virtual ::rtl::OUString GetName() const { return GetComposedName(); } + virtual OUString GetName() const { return GetComposedName(); } }; } #endif //DBAUI_RELTABLEWINDOW_HXX diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 083a76ff7b54..f93138b1b518 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -90,25 +90,25 @@ using namespace ::comphelper; using namespace ::osl; //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ORelationController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL ORelationController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString ORelationController::getImplementationName_Static() throw( RuntimeException ) +OUString ORelationController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.ORelationDesign"); + return OUString("org.openoffice.comp.dbu.ORelationDesign"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.RelationDesign"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.RelationDesign"); return aSupported; } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL ORelationController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL ORelationController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -240,9 +240,9 @@ void ORelationController::impl_initialize() } // ----------------------------------------------------------------------------- -::rtl::OUString ORelationController::getPrivateTitle( ) const +OUString ORelationController::getPrivateTitle( ) const { - ::rtl::OUString sName = getDataSourceName(); + OUString sName = getDataSourceName(); return ::dbaui::getStrippedDatabaseName(getDataSource(),sName); } // ----------------------------------------------------------------------------- @@ -275,10 +275,10 @@ namespace { class RelationLoader : public ::osl::Thread { - DECLARE_STL_MAP(::rtl::OUString,::boost::shared_ptr<OTableWindowData>,::comphelper::UStringMixLess,TTableDataHelper); + DECLARE_STL_MAP(OUString,::boost::shared_ptr<OTableWindowData>,::comphelper::UStringMixLess,TTableDataHelper); TTableDataHelper m_aTableData; TTableConnectionData m_vTableConnectionData; - const Sequence< ::rtl::OUString> m_aTableList; + const Sequence< OUString> m_aTableList; ORelationController* m_pParent; const Reference< XDatabaseMetaData> m_xMetaData; const Reference< XNameAccess > m_xTables; @@ -289,7 +289,7 @@ namespace RelationLoader(ORelationController* _pParent ,const Reference< XDatabaseMetaData>& _xMetaData ,const Reference< XNameAccess >& _xTables - ,const Sequence< ::rtl::OUString>& _aTableList + ,const Sequence< OUString>& _aTableList ,const sal_Int32 _nStartIndex ,const sal_Int32 _nEndIndex) :m_aTableData(_xMetaData.is() && _xMetaData->supportsMixedCaseQuotedIdentifiers()) @@ -313,10 +313,10 @@ namespace void SAL_CALL RelationLoader::run() { - const ::rtl::OUString* pIter = m_aTableList.getConstArray() + m_nStartIndex; + const OUString* pIter = m_aTableList.getConstArray() + m_nStartIndex; for(sal_Int32 i = m_nStartIndex; i < m_nEndIndex;++i,++pIter) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, *pIter, sCatalog, @@ -351,7 +351,7 @@ namespace void RelationLoader::loadTableData(const Any& _aTable) { Reference<XPropertySet> xTableProp(_aTable,UNO_QUERY); - const ::rtl::OUString sSourceName = ::dbtools::composeTableName( m_xMetaData, xTableProp, ::dbtools::eInTableDefinitions, false, false, false ); + const OUString sSourceName = ::dbtools::composeTableName( m_xMetaData, xTableProp, ::dbtools::eInTableDefinitions, false, false, false ); TTableDataHelper::iterator aFind = m_aTableData.find(sSourceName); if ( aFind == m_aTableData.end() ) { @@ -378,7 +378,7 @@ namespace xKey->getPropertyValue(PROPERTY_TYPE) >>= nKeyType; if ( KeyType::FOREIGN == nKeyType ) { - ::rtl::OUString sReferencedTable; + OUString sReferencedTable; xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; ////////////////////////////////////////////////////////////////////// // insert windows @@ -396,7 +396,7 @@ namespace } TTableWindowData::value_type pReferencedTable = aRefFind->second; - ::rtl::OUString sKeyName; + OUString sKeyName; xKey->getPropertyValue(PROPERTY_NAME) >>= sKeyName; ////////////////////////////////////////////////////////////////////// // insert connection @@ -407,10 +407,10 @@ namespace const Reference<XColumnsSupplier> xColsSup(xKey,UNO_QUERY); OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!"); const Reference<XNameAccess> xColumns = xColsSup->getColumns(); - const Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); - ::rtl::OUString sColumnName,sRelatedName; + const Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); + OUString sColumnName,sRelatedName; for(sal_uInt16 j=0;pIter != pEnd;++pIter,++j) { const Reference<XPropertySet> xPropSet(xColumns->getByName(*pIter),UNO_QUERY); @@ -502,7 +502,7 @@ void ORelationController::loadData() DatabaseMetaData aMeta(getConnection()); // this may take some time const Reference< XDatabaseMetaData> xMetaData = getConnection()->getMetaData(); - const Sequence< ::rtl::OUString> aNames = m_xTables->getElementNames(); + const Sequence< OUString> aNames = m_xTables->getElementNames(); const sal_Int32 nCount = aNames.getLength(); if ( aMeta.supportsThreads() ) { @@ -537,7 +537,7 @@ void ORelationController::loadData() } } // ----------------------------------------------------------------------------- -TTableWindowData::value_type ORelationController::existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const +TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName,sal_Bool _bCase) const { ::comphelper::UStringMixEqual bCase(_bCase); TTableWindowData::const_iterator aIter = m_vTableData.begin(); diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index e4a5405d506a..5a3d72485066 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -100,7 +100,7 @@ void ORelationTableView::ReSync() // Es kann sein, dass in der DB Tabellen ausgeblendet wurden, die eigentlich Bestandteil einer Relation sind. Oder eine Tabelle // befand sich im Layout (durchaus ohne Relation), existiert aber nicht mehr. In beiden Faellen wird das Anlegen des TabWins schief // gehen, und alle solchen TabWinDatas oder darauf bezogenen ConnDatas muss ich dann loeschen. - ::std::vector< ::rtl::OUString> arrInvalidTables; + ::std::vector< OUString> arrInvalidTables; ////////////////////////////////////////////////////////////////////// // create and insert windows @@ -141,7 +141,7 @@ void ORelationTableView::ReSync() if ( !arrInvalidTables.empty() ) { // gibt es die beiden Tabellen zur Connection ? - ::rtl::OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetTableName(); + OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetTableName(); sal_Bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); strTabExistenceTest = pTabConnData->getReferencedTable()->GetTableName(); bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); @@ -193,8 +193,8 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const pDestWin->GetData())); // die Namen der betroffenen Felder - ::rtl::OUString sSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); - ::rtl::OUString sDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); + OUString sSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); + OUString sDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); // die Anzahl der PKey-Felder in der Quelle const Reference< XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(pSourceWin->GetData()->getTable()); @@ -296,7 +296,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_ } //------------------------------------------------------------------------------ -void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool /*bNewTable*/) +void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool /*bNewTable*/) { DBG_CHKTHIS(ORelationTableView,NULL); OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!"); @@ -411,7 +411,7 @@ void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_r void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { m_bInRemove = true; - ::rtl::OUString sName; + OUString sName; if ( _rEvent.Accessor >>= sName ) { OTableWindow* pTableWindow = GetTabWindow(sName); diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 2a42c8b10f8f..f1c6606cca48 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -126,7 +126,7 @@ OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedC SetDescription(::comphelper::getString(xAffectedCol->getPropertyValue(PROPERTY_DESCRIPTION))); if(xPropSetInfo->hasPropertyByName(PROPERTY_HELPTEXT)) { - ::rtl::OUString sHelpText; + OUString sHelpText; xAffectedCol->getPropertyValue(PROPERTY_HELPTEXT) >>= sHelpText; SetHelpText(sHelpText); } @@ -246,7 +246,7 @@ void OFieldDescription::FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bF } } // ----------------------------------------------------------------------------- -void OFieldDescription::SetName(const ::rtl::OUString& _rName) +void OFieldDescription::SetName(const OUString& _rName) { try { @@ -261,7 +261,7 @@ void OFieldDescription::SetName(const ::rtl::OUString& _rName) } } // ----------------------------------------------------------------------------- -void OFieldDescription::SetHelpText(const ::rtl::OUString& _sHelpText) +void OFieldDescription::SetHelpText(const OUString& _sHelpText) { try { @@ -276,7 +276,7 @@ void OFieldDescription::SetHelpText(const ::rtl::OUString& _sHelpText) } } // ----------------------------------------------------------------------------- -void OFieldDescription::SetDescription(const ::rtl::OUString& _rDescription) +void OFieldDescription::SetDescription(const OUString& _rDescription) { try { @@ -321,7 +321,7 @@ void OFieldDescription::SetControlDefault(const Any& _rControlDefault) } } // ----------------------------------------------------------------------------- -void OFieldDescription::SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue) +void OFieldDescription::SetAutoIncrementValue(const OUString& _sAutoIncValue) { try { @@ -476,7 +476,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetName() const +OUString OFieldDescription::GetName() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_NAME) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_NAME)); @@ -484,7 +484,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sName; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetDescription() const +OUString OFieldDescription::GetDescription() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_DESCRIPTION) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_DESCRIPTION)); @@ -492,7 +492,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sDescription; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetHelpText() const +OUString OFieldDescription::GetHelpText() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_HELPTEXT) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_HELPTEXT)); @@ -508,7 +508,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_aControlDefault; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetAutoIncrementValue() const +OUString OFieldDescription::GetAutoIncrementValue() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_AUTOINCREMENTCREATION) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_AUTOINCREMENTCREATION)); @@ -524,7 +524,7 @@ sal_Int32 OFieldDescription::GetType() const return m_pType.get() ? m_pType->nType : m_nType; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetTypeName() const +OUString OFieldDescription::GetTypeName() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_TYPENAME) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_TYPENAME)); @@ -629,7 +629,7 @@ sal_Bool OFieldDescription::IsNullable() const return m_nIsNullable == ::com::sun::star::sdbc::ColumnValue::NULLABLE; } // ----------------------------------------------------------------------------- -void OFieldDescription::SetTypeName(const ::rtl::OUString& _sTypeName) +void OFieldDescription::SetTypeName(const OUString& _sTypeName) { try { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index fe569292ccb7..70654ce4f535 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -239,7 +239,7 @@ void OTableEditorCtrl::InitCellController() ////////////////////////////////////////////////////////////////////// // Cell Field name xub_StrLen nMaxTextLen = EDIT_NOLIMIT; - ::rtl::OUString sExtraNameChars; + OUString sExtraNameChars; Reference<XConnection> xCon; try { @@ -250,7 +250,7 @@ void OTableEditorCtrl::InitCellController() if( nMaxTextLen == 0 ) nMaxTextLen = EDIT_NOLIMIT; - sExtraNameChars = xMetaData.is() ? xMetaData->getExtraNameCharacters() : ::rtl::OUString(); + sExtraNameChars = xMetaData.is() ? xMetaData->getExtraNameCharacters() : OUString(); } catch(SQLException&) @@ -380,7 +380,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) Reference<XPropertySet> xTable = GetView()->getController().getTable(); if (IsReadOnly() || ( xTable.is() && xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && - ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW"))) + ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == OUString("VIEW"))) return NULL; ////////////////////////////////////////////////////////////////////// @@ -1083,7 +1083,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const TOTypeIn default: OSL_FAIL("OTableEditorCtrl::SetCellData: invalid column!"); } - SetControlText(nRow,nColId,_pTypeInfo.get() ? _pTypeInfo->aUIName : ::rtl::OUString()); + SetControlText(nRow,nColId,_pTypeInfo.get() ? _pTypeInfo->aUIName : OUString()); } //------------------------------------------------------------------------------ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) @@ -1155,7 +1155,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s case FIELD_PROPERTY_BOOL_DEFAULT: sValue = GetView()->GetDescWin()->BoolStringPersistent(::comphelper::getString(_rNewData)); - pFieldDescr->SetControlDefault(makeAny(::rtl::OUString(sValue))); + pFieldDescr->SetControlDefault(makeAny(OUString(sValue))); break; case FIELD_PROPERTY_FORMAT: @@ -1185,7 +1185,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) static const String strYes(ModuleRes(STR_VALUE_YES)); static const String strNo(ModuleRes(STR_VALUE_NO)); - ::rtl::OUString sValue; + OUString sValue; ////////////////////////////////////////////////////////////////////// // Read out the fields switch( nColId ) @@ -1246,7 +1246,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) String OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const { DBG_CHKTHIS(OTableEditorCtrl,NULL); - ::rtl::OUString sCellText; + OUString sCellText; const_cast< OTableEditorCtrl* >( this )->GetCellData( nRow, nColId ) >>= sCellText; return sCellText; } @@ -1255,7 +1255,7 @@ String OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const sal_uInt32 OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) { DBG_CHKTHIS(OTableEditorCtrl,NULL); - return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth(rtl::OUString('0')); + return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth(OUString('0')); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index ce966a7c4a88..0f94c246db3e 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -101,7 +101,7 @@ using namespace ::comphelper; namespace { - void dropTable(const Reference<XNameAccess>& _rxTable,const ::rtl::OUString& _sTableName) + void dropTable(const Reference<XNameAccess>& _rxTable,const OUString& _sTableName) { if ( _rxTable->hasByName(_sTableName) ) { @@ -112,9 +112,9 @@ namespace } } //------------------------------------------------------------------------------ - struct OTableRowCompare : public ::std::binary_function< ::boost::shared_ptr<OTableRow> , ::rtl::OUString, bool> + struct OTableRowCompare : public ::std::binary_function< ::boost::shared_ptr<OTableRow> , OUString, bool> { - bool operator() (const ::boost::shared_ptr<OTableRow> lhs, const ::rtl::OUString& rhs) const + bool operator() (const ::boost::shared_ptr<OTableRow> lhs, const OUString& rhs) const { OFieldDescription* pField = lhs->GetActFieldDescr(); return pField && pField->GetName() == rhs; @@ -124,25 +124,25 @@ namespace } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OTableController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL OTableController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString OTableController::getImplementationName_Static() throw( RuntimeException ) +OUString OTableController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.OTableDesign"); + return OUString("org.openoffice.comp.dbu.OTableDesign"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableDesign"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.TableDesign"); return aSupported; } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL OTableController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL OTableController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -315,7 +315,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) // TODO Reference<XNameAccess> xTables; - ::rtl::OUString sCatalog, sSchema; + OUString sCatalog, sSchema; sal_Bool bNew = m_sName.isEmpty(); bNew = bNew || m_bNew || _bSaveAs; @@ -456,7 +456,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) { if(!bAlter || bNew) { - m_sName = ::rtl::OUString(); + m_sName = OUString(); stopTableListening(); m_xTable = NULL; } @@ -481,7 +481,7 @@ void OTableController::doEditIndexes() } Reference< XNameAccess > xIndexes; // will be the keys of the table - Sequence< ::rtl::OUString > aFieldNames; // will be the column names of the table + Sequence< OUString > aFieldNames; // will be the column names of the table try { // get the keys @@ -528,7 +528,7 @@ void OTableController::impl_initialize() const NamedValueCollection& rArguments( getInitParams() ); - rArguments.get_ensureType( (::rtl::OUString)PROPERTY_CURRENTTABLE, m_sName ); + rArguments.get_ensureType( (OUString)PROPERTY_CURRENTTABLE, m_sName ); // read autoincrement value set in the datasource ::dbaui::fillAutoIncrementValue(getDataSource(),m_bAllowAutoIncrementValue,m_sAutoIncrementValue); @@ -829,9 +829,9 @@ void OTableController::loadData() // Bei Add und Drop koennen alle Zeilen editiert werden. // sal_Bool bReadOldRow = xMetaData->supportsAlterTableWithAddColumn() && xMetaData->supportsAlterTableWithDropColumn(); sal_Bool bIsAlterAllowed = isAlterAllowed(); - Sequence< ::rtl::OUString> aColumns = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aColumns.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); + Sequence< OUString> aColumns = xColumns->getElementNames(); + const OUString* pIter = aColumns.getConstArray(); + const OUString* pEnd = pIter + aColumns.getLength(); for(;pIter != pEnd;++pIter) { @@ -845,7 +845,7 @@ void OTableController::loadData() sal_Int32 nAlign = 0; sal_Bool bIsAutoIncrement = false, bIsCurrency = false; - ::rtl::OUString sName,sDescription,sTypeName,sHelpText; + OUString sName,sDescription,sTypeName,sHelpText; Any aControlDefault; // get the properties from the column @@ -873,7 +873,7 @@ void OTableController::loadData() pTabEdRow->SetReadOnly(!bIsAlterAllowed); // search for type sal_Bool bForce; - ::rtl::OUString sCreate("x"); + OUString sCreate("x"); TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,sCreate,nPrecision,nScale,bIsAutoIncrement,bForce); if ( !pTypeInfo.get() ) pTypeInfo = m_pTypeInfo; @@ -904,9 +904,9 @@ void OTableController::loadData() Reference<XNameAccess> xKeyColumns = getKeyColumns(); if(xKeyColumns.is()) { - Sequence< ::rtl::OUString> aKeyColumns = xKeyColumns->getElementNames(); - const ::rtl::OUString* pKeyBegin = aKeyColumns.getConstArray(); - const ::rtl::OUString* pKeyEnd = pKeyBegin + aKeyColumns.getLength(); + Sequence< OUString> aKeyColumns = xKeyColumns->getElementNames(); + const OUString* pKeyBegin = aKeyColumns.getConstArray(); + const OUString* pKeyEnd = pKeyBegin + aKeyColumns.getLength(); for(;pKeyBegin != pKeyEnd;++pKeyBegin) { @@ -999,7 +999,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star:: pActFieldDescr->SetAutoIncrement(sal_False); pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); - pActFieldDescr->SetName( createUniqueName(::rtl::OUString("ID") )); + pActFieldDescr->SetName( createUniqueName(OUString("ID") )); pActFieldDescr->SetPrimaryKey( sal_True ); m_vRowList.insert(m_vRowList.begin(),pNewRow); @@ -1037,7 +1037,7 @@ void OTableController::alterColumns() // contains all columns names which are already handled those which are not in the list will be deleted Reference< XDatabaseMetaData> xMetaData = getMetaData( ); - ::std::map< ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(xMetaData.is() ? (xMetaData->supportsMixedCaseQuotedIdentifiers() ? true : false): sal_True); + ::std::map< OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(xMetaData.is() ? (xMetaData->supportsMixedCaseQuotedIdentifiers() ? true : false): sal_True); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end(); // first look for columns where something other than the name changed @@ -1063,7 +1063,7 @@ void OTableController::alterColumns() sal_Int32 nType=0,nPrecision=0,nScale=0,nNullable=0; sal_Bool bAutoIncrement = false; - ::rtl::OUString sTypeName,sDescription; + OUString sTypeName,sDescription; xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; @@ -1172,7 +1172,7 @@ void OTableController::alterColumns() if ( aMsg.Execute() != RET_YES ) { Reference<XPropertySet> xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW); - ::rtl::OUString sName; + OUString sName; xNewColumn->getPropertyValue(PROPERTY_NAME) >>= sName; aColumns[sName] = sal_True; aColumns[pField->GetName()] = sal_True; @@ -1223,9 +1223,9 @@ void OTableController::alterColumns() // now we have to look for the columns who could be deleted if ( xDrop.is() ) { - Sequence< ::rtl::OUString> aColumnNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aColumnNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aColumnNames.getLength(); + Sequence< OUString> aColumnNames = xColumns->getElementNames(); + const OUString* pIter = aColumnNames.getConstArray(); + const OUString* pEnd = pIter + aColumnNames.getLength(); for(;pIter != pEnd;++pIter) { if(aColumns.find(*pIter) == aColumns.end()) // found a column to delete @@ -1258,7 +1258,7 @@ void OTableController::alterColumns() SQLException aNewException; aNewException.Message = sError; - aNewException.SQLState = ::rtl::OUString("S1000"); + aNewException.SQLState = OUString("S1000"); aNewException.NextException = ::cppu::getCaughtException(); throw aNewException; @@ -1495,9 +1495,9 @@ void OTableController::reSyncRows() setModified(sal_False); // and we are not modified yet } // ----------------------------------------------------------------------------- -::rtl::OUString OTableController::createUniqueName(const ::rtl::OUString& _rName) +OUString OTableController::createUniqueName(const OUString& _rName) { - ::rtl::OUString sName = _rName; + OUString sName = _rName; Reference< XDatabaseMetaData> xMetaData = getMetaData( ); ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : sal_True); @@ -1509,16 +1509,16 @@ void OTableController::reSyncRows() OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr(); if (pFieldDesc && !pFieldDesc->GetName().isEmpty() && bCase(sName,pFieldDesc->GetName())) { // found a second name of _rName so we need another - sName = _rName + ::rtl::OUString::valueOf(++i); + sName = _rName + OUString::valueOf(++i); aIter = m_vRowList.begin(); // and retry } } return sName; } // ----------------------------------------------------------------------------- -::rtl::OUString OTableController::getPrivateTitle() const +OUString OTableController::getPrivateTitle() const { - ::rtl::OUString sTitle; + OUString sTitle; try { // get the table @@ -1533,7 +1533,7 @@ void OTableController::reSyncRows() { String aName = String(ModuleRes(STR_TBL_TITLE)); sTitle = aName.GetToken(0,' '); - sTitle += ::rtl::OUString::valueOf(getCurrentStartNumber()); + sTitle += OUString::valueOf(getCurrentStartNumber()); } } catch( const Exception& ) diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 5a01b0491d8e..ca2bea139c21 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -74,7 +74,7 @@ void OTableRowView::Init() SetFont(aFont); // HandleColumn, fuer maximal fuenf Ziffern einrichten - InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */); + InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */); BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL; @@ -99,7 +99,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) if( rEvt.GetKeyCode().GetCode() == KEY_F2 ) { ::com::sun::star::util::URL aUrl; - aUrl.Complete =::rtl::OUString(".uno:DSBEditDoc"); + aUrl.Complete =OUString(".uno:DSBEditDoc"); GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() ); } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 9b56fe1c5cdb..457035c43cdb 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -57,7 +57,7 @@ sal_Bool OTableFieldControl::IsReadOnly() { // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable(); - if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW")) + if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == OUString("VIEW")) bRead = sal_True; else { @@ -136,7 +136,7 @@ sal_Bool OTableFieldControl::isAutoIncrementValueEnabled() const return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController().isAutoIncrementValueEnabled(); } // ----------------------------------------------------------------------------- -::rtl::OUString OTableFieldControl::getAutoIncrementValue() const +OUString OTableFieldControl::getAutoIncrementValue() const { return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController().getAutoIncrementValue(); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index c62a50a9950f..e95b5f36c74c 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -45,7 +45,7 @@ namespace dbaui virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); virtual const OTypeInfoMap* getTypeInfo() const; virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual OUString getAutoIncrementValue() const; public: OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar); diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 37cec07b7109..da1e61b3c0c3 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -181,7 +181,7 @@ namespace dbaui } case 2: sValue = _rStr.ReadUniOrByteString(_rStr.GetStreamCharSet()); - aControlDefault <<= ::rtl::OUString(sValue); + aControlDefault <<= OUString(sValue); break; } diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 45e69977fe9e..2cf9086778fb 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -48,12 +48,12 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); @@ -88,15 +88,15 @@ namespace dbaui } //------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- - ::rtl::OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException) + OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); + return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); } //------------------------------------------------------------------------- @@ -109,7 +109,7 @@ namespace dbaui ::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 47ad0d93d140..62d342567efa 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -53,9 +53,9 @@ Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiS return static_cast< XServiceInfo* >(new OColumnControl(comphelper::getComponentContext(_rxORB))); } // ----------------------------------------------------------------------------- -::rtl::OUString OColumnControl::GetComponentServiceName() +OUString OColumnControl::GetComponentServiceName() { - return ::rtl::OUString("com.sun.star.sdb.ColumnDescriptorControl"); + return OUString("com.sun.star.sdb.ColumnDescriptorControl"); } // ----------------------------------------------------------------------------- void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) throw( RuntimeException ) diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 02db6c2c2614..2a2e6dafef54 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -32,7 +32,7 @@ namespace dbaui OColumnControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext); // UnoControl - virtual ::rtl::OUString GetComponentServiceName(); + virtual OUString GetComponentServiceName(); // XServiceInfo DECLARE_SERVICE_INFO_STATIC(); diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index cdb7d4748674..4d8caec6901c 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -134,9 +134,9 @@ Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(Ru return aRet; } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OColumnControlModel::getServiceName() throw ( RuntimeException) +OUString SAL_CALL OColumnControlModel::getServiceName() throw ( RuntimeException) { - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------ void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/) throw ( ::com::sun::star::io::IOException, RuntimeException) diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index 01234460d42c..385284094e33 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -57,7 +57,7 @@ class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper // [properties] ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xColumn; - ::rtl::OUString m_sDefaultControl; + OUString m_sDefaultControl; ::com::sun::star::uno::Any m_aTabStop; sal_Bool m_bEnable; sal_Int16 m_nBorder; @@ -87,7 +87,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index b4e20a95599e..8fa2b380c91f 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -74,7 +74,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) sal_Int32 nScale = 0; sal_Int32 nPrecision = 0; sal_Bool bAutoIncrement = sal_False; - ::rtl::OUString sTypeName; + OUString sTypeName; try { @@ -91,7 +91,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) m_pActFieldDescr = new OFieldDescription(_xColumn,sal_True); // search for type - ::rtl::OUString sCreateParam("x"); + OUString sCreateParam("x"); sal_Bool bForce; TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(*pFieldControl->getTypeInfo(),nType,sTypeName,sCreateParam,nPrecision,nScale,bAutoIncrement,bForce); if ( !pTypeInfo.get() ) @@ -112,7 +112,7 @@ void OColumnPeer::setConnection(const Reference< XConnection>& _xCon) pFieldControl->setConnection(_xCon); } //------------------------------------------------------------------------------ -void OColumnPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& Value) throw( RuntimeException ) +void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -130,7 +130,7 @@ void OColumnPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& VCLXWindow::setProperty(_rPropertyName,Value); } // ----------------------------------------------------------------------------- -Any OColumnPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException ) +Any OColumnPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException ) { Any aProp; OFieldDescControl* pFieldControl = static_cast<OFieldDescControl*>( GetWindow() ); diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 3b97a6d6acf0..45e78ec5ad91 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -42,8 +42,8 @@ namespace dbaui void setConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xCon); void setEditWidth(sal_Int32 _nWidth); // VCLXWindow - virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... } // namespace dbaui diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 77fb2f87724b..540f335ab4d6 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -59,15 +59,15 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODBTypeWizDialog::getImplementationName() throw(RuntimeException) +OUString SAL_CALL ODBTypeWizDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException) +OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); + return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); } //------------------------------------------------------------------------- @@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult ::comphelper::StringSequence ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 77f93d7891dd..1fe6bb65f393 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -44,12 +44,12 @@ public: virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index a6d83ea78a71..d3bec7582215 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -53,10 +53,10 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XComponentContext ,m_bOpenDatabase(sal_True) ,m_bStartTableWizard(sal_False) { - registerProperty(::rtl::OUString("OpenDatabase"), 3, PropertyAttribute::TRANSIENT, + registerProperty(OUString("OpenDatabase"), 3, PropertyAttribute::TRANSIENT, &m_bOpenDatabase, getBooleanCppuType()); - registerProperty(::rtl::OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT, + registerProperty(OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT, &m_bStartTableWizard, getBooleanCppuType()); } //------------------------------------------------------------------------- @@ -74,15 +74,15 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName() throw(RuntimeException) +OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException) +OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); + return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); } //------------------------------------------------------------------------- @@ -95,7 +95,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< ::comphelper::StringSequence ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatabaseWizardDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.DatabaseWizardDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index fc9eb22bdf3d..afce6e0a2b7c 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -35,7 +35,7 @@ class ODBTypeWizDialogSetup :public ODatabaseAdministrationDialog ,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialogSetup > { - ::rtl::OUString m_sExistingDocToOpen; + OUString m_sExistingDocToOpen; sal_Bool m_bOpenDatabase; sal_Bool m_bStartTableWizard; @@ -47,12 +47,12 @@ public: virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index a4411a77a4dc..c24a1b31f1f9 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -60,15 +60,15 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OTableFilterDialog::getImplementationName() throw(RuntimeException) +OUString SAL_CALL OTableFilterDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException) +OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.OTableFilterDialog"); + return OUString("org.openoffice.comp.dbu.OTableFilterDialog"); } //------------------------------------------------------------------------- @@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu ::comphelper::StringSequence OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableFilterDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.TableFilterDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 4982c5d1f229..0e9dd004148b 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -44,12 +44,12 @@ public: virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 7fa2a8ee8035..3bef400319a5 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -60,15 +60,15 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OUserSettingsDialog::getImplementationName() throw(RuntimeException) +OUString SAL_CALL OUserSettingsDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException) +OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); + return OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); } //------------------------------------------------------------------------- @@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM ::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.UserAdministrationDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.UserAdministrationDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index 7e3e05ed82f3..da3e82882931 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -44,12 +44,12 @@ public: virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 6d6acb79eccf..b370e3352994 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -60,15 +60,15 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName() throw(RuntimeException) +OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException) +OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); + return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); } //------------------------------------------------------------------------- @@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen ::comphelper::StringSequence ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 0c63cf34efcc..6d7a6d0375a5 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -44,12 +44,12 @@ public: virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index fb9741792985..bf062f4b2927 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -87,19 +87,19 @@ namespace dbaui virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const; // Overrides to resolve inheritance ambiguity - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw (css::uno::RuntimeException) + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::uno::RuntimeException) { return ODatabaseAdministrationDialog::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::removeVetoableChangeListener(p1, p2); } - virtual void SAL_CALL setTitle(const rtl::OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setTitle(const OUString& p1) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::setTitle(p1); } virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException) { return ODatabaseAdministrationDialog::execute(); } @@ -166,44 +166,44 @@ namespace dbaui aProps.realloc( nProp + 6 ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "HeaderLine" ), + OUString( "HeaderLine" ), PROPERTY_ID_HEADER_LINE, ::cppu::UnoType< sal_Bool >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "FieldDelimiter" ), + OUString( "FieldDelimiter" ), PROPERTY_ID_FIELD_DELIMITER, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "StringDelimiter" ), + OUString( "StringDelimiter" ), PROPERTY_ID_STRING_DELIMITER, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "DecimalDelimiter" ), + OUString( "DecimalDelimiter" ), PROPERTY_ID_DECIMAL_DELIMITER, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "ThousandDelimiter" ), + OUString( "ThousandDelimiter" ), PROPERTY_ID_THOUSAND_DELIMITER, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "CharSet" ), + OUString( "CharSet" ), PROPERTY_ID_ENCODING, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 54c614489293..b57a498e35c1 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -45,7 +45,7 @@ namespace dbaui ,public ODirectSQLDialog_PBASE { OModuleClient m_aModuleClient; - ::rtl::OUString m_sInitialSelection; + OUString m_sInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; protected: ODirectSQLDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); |