diff options
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/ColumnControlWindow.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 42 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/RelationControl.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/SqlNameEdit.cxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/TableGrantCtrl.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/opendoccontrols.cxx | 30 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/sqledit.cxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 52 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/toolboxcontroller.cxx | 26 |
9 files changed, 92 insertions, 92 deletions
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) { |