diff options
Diffstat (limited to 'dbaccess/source/ui')
205 files changed, 1576 insertions, 1576 deletions
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); |