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