summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/relationdesign
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /dbaccess/source/ui/relationdesign
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx40
-rw-r--r--dbaccess/source/ui/relationdesign/RTableWindow.hxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx46
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx12
4 files changed, 50 insertions, 50 deletions
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);