[Libreoffice-commits] core.git: dbaccess/source

[Luc Castermans]

 dbaccess/source/ui/dlg/ConnectionPage.hxx               |    2 -
 dbaccess/source/ui/relationdesign/RelationTableView.cxx |   22 ++++++++--------
 dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx    |    8 ++---
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 5da12788c97e945fa8a676cae877058d297ffb59
Author: Luc Castermans <luc.castermans at gmail.com>
Date:   Mon Jun 9 10:15:48 2014 +0200

    Translated German comments   dbaccess/source/ui clean now
    
    Change-Id: Ida2d2dbe95f290e2f32ed2259b8f9bdb27cbf2f9
    Reviewed-on: https://gerrit.libreoffice.org/9689
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index ac26525..df10774 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -71,7 +71,7 @@ namespace dbaui
         */
     private:
         OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs);
-            // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
+            // nControlFlags is a combination of the CBTP_xxx-constants
         virtual ~OConnectionTabPage();
 
         // <method>OGenericAdministrationPage::fillControls</method>
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 564439f..477e9e9 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -88,9 +88,9 @@ void ORelationTableView::ReSync()
         if ( xContainer.is() )
             m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
     }
-    // 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.
+    // Tables could have been hidden in the database, which are part of a relation. Or a table was in layout
+    // (quite often without a relation) and does not exist anymore. In both cases creation of TabWins will fail
+    // and all TabWinDatas and related ConnDates should be deleted.
     ::std::vector< OUString> arrInvalidTables;
 
     // create and insert windows
@@ -103,8 +103,8 @@ void ORelationTableView::ReSync()
 
         if (!pTabWin->Init())
         {
-            // das Initialisieren ging schief, dass heisst, dieses TabWin steht nicht zur Verfuegung, also muss ich es inklusive
-            // seiner Daten am Dokument aufraeumen
+            // initialisation failed, which means this TabWin is not available, therefore,
+            // it should be cleaned up, including its data in the document
             pTabWin->clearListBox();
             delete pTabWin;
             arrInvalidTables.push_back(pData->GetTableName());
@@ -113,7 +113,7 @@ void ORelationTableView::ReSync()
             continue;
         }
 
-        (*GetTabWinMap())[pData->GetComposedName()] = pTabWin;  // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe
+        (*GetTabWinMap())[pData->GetComposedName()] = pTabWin;  // insert at the beginning, as the Datalist is walked through backward
         // if there's no position or size contained in the data -> Default
         if (!pData->HasPosition() && !pData->HasSize())
             SetDefaultTabWinPosSize(pTabWin);
@@ -130,7 +130,7 @@ void ORelationTableView::ReSync()
         ORelationTableConnectionData* pTabConnData = static_cast<ORelationTableConnectionData*>(aConIter->get());
         if ( !arrInvalidTables.empty() )
         {
-            // gibt es die beiden Tabellen zur Connection ?
+            // do the tables to the  connection exist?
             OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetTableName();
             bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end();
             strTabExistenceTest = pTabConnData->getReferencedTable()->GetTableName();
@@ -138,7 +138,7 @@ void ORelationTableView::ReSync()
 
             if (bInvalid)
             {
-                // no -> bad luck, die Connection faellt weg
+                // no -> bad luck, the connection is gone
                 pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() );
                 continue;
             }
@@ -159,7 +159,7 @@ bool ORelationTableView::IsAddAllowed()
 
 void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest)
 {
-    // Aus selektierten Feldnamen LineDataObject setzen
+    // Set LineDataObject based on selected fieldname
     // check if relation already exists
     OTableWindow* pSourceWin = jxdSource.pListBox->GetTabWin();
     OTableWindow* pDestWin = jxdDest.pListBox->GetTabWin();
@@ -250,7 +250,7 @@ void ORelationTableView::AddNewRelation()
     if (bSuccess)
     {
         // already updated by the dialog
-        // dem Dokument bekanntgeben
+        // announce it to the document
         addConnection( new ORelationTableConnection(this, pNewConnData) );
     }
 }
@@ -292,7 +292,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin
     TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
     pNewTabWinData->ShowAll(false);
 
-    // Neues Fenster in Fensterliste eintragen
+    // link new window into the window list
     OTableWindow* pNewTabWin = createWindow( pNewTabWinData );
     if(pNewTabWin->Init())
     {
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index bacca41..ac3beaf 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -29,8 +29,8 @@ namespace dbaui
     class OFieldDescGenWin;
     class OTableDesignHelpBar;
     class OFieldDescription;
-    // Ableitung von TabPage ist ein Trick von TH,
-    // um Aenderungen der Systemfarben zu bemerken
+    // derivitive of TabPage is a trick of TH,
+    // to notice a change in system colours
     class OTableFieldDescWin : public TabPage
                                 ,public IClipboardTest
     {
@@ -72,8 +72,8 @@ namespace dbaui
         OUString GetControlText( sal_uInt16 nControlId )
                 { return m_pGenPage->GetControlText(nControlId); }
 
-        //  short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; }
-            // liefert zum am Feld eingestellten Format einen der CAT_xxx-Werte (CAT_NUMBER, CAT_DATE ...)
+        // short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; }
+        // delivers a CAT_xxx (CAT_NUMBER, CAT_DATE ...) value to a Format set in the field
 
         OUString  BoolStringPersistent(const OUString& rUIString) const { return m_pGenPage->BoolStringPersistent(rUIString); }
         OUString  BoolStringUI(const OUString& rPersistentString) const { return m_pGenPage->BoolStringUI(rPersistentString); }