diff options
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
3 files changed, 22 insertions, 22 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index f84984f28304..c05f561c2515 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -35,7 +35,7 @@ ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContain ORelationTableConnection::ORelationTableConnection( const ORelationTableConnection& rConn ) : OTableConnection( rConn ) { - // keine eigenen Members, also reicht die Basisklassenfunktionalitaet + // no own members, thus the base class functionality is enough } ORelationTableConnection::~ORelationTableConnection() @@ -44,7 +44,7 @@ ORelationTableConnection::~ORelationTableConnection() ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTableConnection& rConn ) { - // nicht dass es was aendern wuerde, da die Basisklasse das auch testet und ich keine eigenen Members zu kopieren habe + // this doesn't change anything, since the base class tests this, too and I don't have my own members to copy if (&rConn == this) return *this; @@ -59,7 +59,7 @@ void ORelationTableConnection::Draw( const Rectangle& rRect ) if ( pData && (pData->GetCardinality() == CARDINAL_UNDEFINED) ) return; - // Linien nach oberster Linie durchsuchen + // search lines for top line Rectangle aBoundingRect; long nTop = GetBoundingRect().Bottom(); long nTemp; @@ -82,7 +82,7 @@ void ORelationTableConnection::Draw( const Rectangle& rRect ) } } - // Kardinalitaet antragen + // cardinality if( !pTopLine ) return; diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index aa7c5c83a606..a046a0ea9675 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -78,7 +78,7 @@ ORelationTableConnectionData::~ORelationTableConnectionData() sal_Bool ORelationTableConnectionData::DropRelation() { ::osl::MutexGuard aGuard( m_aMutex ); - // Relation loeschen + // delete relation Reference< XIndexAccess> xKeys = getReferencingTable()->getKeys(); if( !m_aConnName.isEmpty() && xKeys.is() ) { @@ -107,7 +107,7 @@ sal_Bool ORelationTableConnectionData::DropRelation() void ORelationTableConnectionData::ChangeOrientation() { - // Source- und DestFieldName der Linien austauschen + // exchange Source- and DestFieldName of the lines OUString sTempString; OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin(); OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end(); @@ -118,7 +118,7 @@ void ORelationTableConnectionData::ChangeOrientation() (*aIter)->SetDestFieldName( sTempString ); } - // Member anpassen + // adapt member TTableWindowData::value_type pTemp = m_pReferencingTable; m_pReferencingTable = m_pReferencedTable; m_pReferencedTable = pTemp; @@ -184,7 +184,7 @@ sal_Bool ORelationTableConnectionData::IsConnectionPossible() { ::osl::MutexGuard aGuard( m_aMutex ); - // Wenn die SourceFelder ein PrimKey sind, ist nur die Orientierung falsch + // if the SourceFields are a PrimKey, it's only the orientation which is wrong if ( IsSourcePrimKey() && !IsDestPrimKey() ) ChangeOrientation(); @@ -203,7 +203,7 @@ OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj( const OC void ORelationTableConnectionData::CopyFrom(const OTableConnectionData& rSource) { - // wie in der Basisklasse zurueckziehen auf das (nicht-virtuelle) operator= + // retract to the (non-virtual) operator= like in the base class *this = *static_cast<const ORelationTableConnectionData*>(&rSource); } @@ -251,7 +251,7 @@ bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableCon sal_Bool ORelationTableConnectionData::Update() { ::osl::MutexGuard aGuard( m_aMutex ); - // Alte Relation loeschen + // delete old relation { DropRelation(); if( !IsConnectionPossible() ) @@ -264,7 +264,7 @@ sal_Bool ORelationTableConnectionData::Update() if ( !xKeys.is() ) return sal_False; - // Neue Relation erzeugen + // create new relation Reference<XDataDescriptorFactory> xKeyFactory(xKeys,UNO_QUERY); OSL_ENSURE(xKeyFactory.is(),"No XDataDescriptorFactory Interface!"); Reference<XAppend> xAppend(xKeyFactory,UNO_QUERY); @@ -318,7 +318,7 @@ sal_Bool ORelationTableConnectionData::Update() // to get the key we have to reget it because after append it is no longer valid } - // get the name of foreign key // search for columns + // get the name of foreign key; search for columns m_aConnName = OUString(); xKey.clear(); bool bDropRelation = false; @@ -418,7 +418,7 @@ xKey.clear(); } // NOTE : the caller is responsible for updating any other objects referencing the old LineDatas (for instance a ConnLine) - // Kardinalitaet bestimmen + // determine cardinality SetCardinality(); return sal_True; diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index ea7b14200f73..dece62710d8a 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -114,14 +114,14 @@ void ORelationTableView::ReSync() } (*GetTabWinMap())[pData->GetComposedName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe - // wenn in den Daten keine Position oder Groesse steht -> Default + // if there's no position or size contained in the data -> Default if (!pData->HasPosition() && !pData->HasSize()) SetDefaultTabWinPosSize(pTabWin); pTabWin->Show(); } - // Verbindungen einfuegen + // insert connection TTableConnectionData* pTabConnDataList = m_pView->getController().getTableConnectionData(); TTableConnectionData::reverse_iterator aConIter = pTabConnDataList->rbegin(); @@ -137,7 +137,8 @@ void ORelationTableView::ReSync() bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) - { // nein -> Pech gehabt, die Connection faellt weg + { + // no -> bad luck, die Connection faellt weg pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() ); continue; } @@ -176,15 +177,14 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const } } // insert table connection into view - TTableConnectionData::value_type pTabConnData(new ORelationTableConnectionData(pSourceWin->GetData(), pDestWin->GetData())); - // die Namen der betroffenen Felder + // the names of the affected fields OUString sSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); OUString sDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); - // die Anzahl der PKey-Felder in der Quelle + // the number of PKey-Fields in the source const Reference< XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(pSourceWin->GetData()->getTable()); bool bAskUser = xPrimaryKeyColumns.is() && Reference< XIndexAccess>(xPrimaryKeyColumns,UNO_QUERY)->getCount() > 1; @@ -196,10 +196,10 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const { try { - // Daten der Datenbank uebergeben + // hand over data to the database if( pTabConnData->Update() ) { - // UI-Object in ConnListe eintragen + // enter UI-object into ConnList addConnection( new ORelationTableConnection( this, pTabConnData ) ); } } @@ -288,7 +288,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin return; } - // Neue Datenstruktur in DocShell eintragen + // enter the new data structure into DocShell TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName )); pNewTabWinData->ShowAll(sal_False); |