[Libreoffice-commits] .: basic/source cosv/inc cui/source dbaccess/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Nov 25 08:49:57 PST 2012
basic/source/comp/loops.cxx | 2
basic/source/runtime/methods1.cxx | 2
cosv/inc/cosv/tpl/swelist.hxx | 2
cui/source/dialogs/dlgname.cxx | 2
cui/source/inc/textattr.hxx | 18 --
cui/source/options/optlingu.cxx | 2
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/page.cxx | 3
dbaccess/source/ui/inc/ConnectionLineData.hxx | 7 -
dbaccess/source/ui/inc/TableWindow.hxx | 14 +-
dbaccess/source/ui/inc/TableWindowListBox.hxx | 4
dbaccess/source/ui/inc/TokenWriter.hxx | 10 -
dbaccess/source/ui/inc/TypeInfo.hxx | 30 ++--
dbaccess/source/ui/inc/WCopyTable.hxx | 2
dbaccess/source/ui/inc/WTypeSelect.hxx | 6
dbaccess/source/ui/inc/sqledit.hxx | 11 -
dbaccess/source/ui/misc/HtmlReader.cxx | 40 +++---
dbaccess/source/ui/misc/RtfReader.cxx | 28 ++--
dbaccess/source/ui/misc/TokenWriter.cxx | 20 +--
dbaccess/source/ui/misc/WColumnSelect.cxx | 4
dbaccess/source/ui/misc/WCopyTable.cxx | 10 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 4
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 24 +--
dbaccess/source/ui/querydesign/ConnectionLineData.cxx | 2
dbaccess/source/ui/querydesign/JoinController.cxx | 14 --
dbaccess/source/ui/querydesign/JoinExchange.cxx | 2
dbaccess/source/ui/querydesign/JoinTableView.cxx | 104 +++++++---------
dbaccess/source/ui/querydesign/QTableConnection.cxx | 13 --
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 8 -
dbaccess/source/ui/querydesign/QTableConnectionData.hxx | 2
dbaccess/source/ui/querydesign/QTableWindow.cxx | 38 ++---
dbaccess/source/ui/querydesign/QTableWindow.hxx | 4
32 files changed, 205 insertions(+), 229 deletions(-)
New commits:
commit b05dc2e3910d22bb919ada64a0cb21c67c0f3623
Author: Markus Maier <maier at fs.ei.tum.de>
Date: Sun Nov 25 01:10:10 2012 +0100
German comment translations
Change-Id: I0d169b7cd0f47b6986063d0cc0b6697b1d575e6a
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index 388911b..ac53648 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -20,7 +20,7 @@
#include "sbcomp.hxx"
-// Single-line IF und Multiline IF
+// Single-line IF and Multiline IF
void SbiParser::If()
{
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index aac1e63..4412eb0 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -3308,7 +3308,7 @@ sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam, sal_Int16 nFirstDay
{
Date aRefDate( 1,1,1900 );
long nDays = (long) aDate;
- nDays -= 2; // normieren: 1.1.1900 => 0
+ nDays -= 2; // normalize: 1.1.1900 => 0
aRefDate += nDays;
DayOfWeek aDay = aRefDate.GetDayOfWeek();
sal_Int16 nDay;
diff --git a/cosv/inc/cosv/tpl/swelist.hxx b/cosv/inc/cosv/tpl/swelist.hxx
index 39540a2..5c64efc 100644
--- a/cosv/inc/cosv/tpl/swelist.hxx
+++ b/cosv/inc/cosv/tpl/swelist.hxx
@@ -209,7 +209,7 @@ class SweListCIterator
const elem * pElem;
};
-// Implementierung
+// IMPLEMENTATION
template <class XX>
void
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 5553d0c..66b465c 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -31,7 +31,7 @@
/*************************************************************************
|*
-|* Dialog zum Editieren eines Namens
+|* Dialog for editing a name
|*
\************************************************************************/
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index f032fb3..81f3b6f 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -98,25 +98,9 @@ public:
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
-/*************************************************************************
-|*
-|* Von SfxSingleTabDialog abgeleitet, um vom Control "uber virtuelle Methode
-|* benachrichtigt werden zu k"onnen.
-|*
-\************************************************************************/
-
-//CHINA001 class SvxTextAttrDialog : public SfxSingleTabDialog
-//CHINA001 {
-//CHINA001 public:
-//CHINA001 SvxTextAttrDialog( Window* pParent, const SfxItemSet& rAttr,
-//CHINA001 const SdrView* pView );
-//CHINA001 ~SvxTextAttrDialog();
-//CHINA001 };
-
-
#endif // _SVX_TEXTATTR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 65af919..542d7eb 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1152,7 +1152,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
eItemState = rSet.GetItemState( GetWhich( SID_ATTR_SPELL ),
sal_False, (const SfxPoolItem**)&pItem );
- // handelt es sich um ein Default-Item?
+ // is it about a default-item?
if ( eItemState == SFX_ITEM_DEFAULT )
pItem = (const SfxSpellCheckItem*)&(rSet.Get( GetWhich( SID_ATTR_SPELL ) ) );
else if ( eItemState == SFX_ITEM_DONTCARE )
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index e0d3a05..4837358 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -131,7 +131,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, "listbox entry missing" );
aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_DONTKNOW );
- // Initialisierung funktionier fuer static nicht unter Linux - deswegen hier
+ // Initializing doesn't work for static on linux - therefore here
if( LANGUAGE_SYSTEM == eLastDialogLanguage )
eLastDialogLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 8baad06..6b66340 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -162,8 +162,7 @@ struct SvxPage_Impl
// class SvxPageDescPage --------------------------------------------------
-// gibt den Bereich der Which-Werte zur"uck
-
+// returns the range of the Which values
sal_uInt16* SvxPageDescPage::GetRanges()
{
return pRanges;
diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx
index 510e54b..bbcdc7f 100644
--- a/dbaccess/source/ui/inc/ConnectionLineData.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx
@@ -56,11 +56,10 @@ namespace dbaui
OConnectionLineData();
OConnectionLineData( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName );
OConnectionLineData( const OConnectionLineData& rConnLineData );
-
- // eine Kopie der eigenen Instanz liefern (das ist mir irgendwie angenehmer als ein virtueller Zuweisungsoperator)
+ // provide a copy of own instance (this is somehow more acceptable for me compared to a virtual assignment operator
void CopyFrom(const OConnectionLineData& rSource);
- // Memberzugriff (schreiben)
+ // member access (write)
void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName)
{
if (nWhich==JTCS_FROM)
@@ -74,7 +73,7 @@ namespace dbaui
inline bool clearSourceFieldName() { SetSourceFieldName(::rtl::OUString()); return true;}
inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;}
- // Memberzugriff (lesen)
+ // member access (read)
::rtl::OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; }
::rtl::OUString GetSourceFieldName() const { return GetFieldName(JTCS_FROM); }
::rtl::OUString GetDestFieldName() const { return GetFieldName(JTCS_TO); }
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index bffde72..a72149c 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -54,7 +54,7 @@ namespace dbaui
friend class OTableWindowTitle;
friend class OTableWindowListBox;
protected:
- // und die Tabelle selber (brauche ich, da ich sie locken will, solange das Fenster lebt)
+ // and the table itself (needed for me as I want to lock it as long as the window is alive)
FixedImage m_aTypeImage;
OTableWindowTitle m_aTitle;
OTableWindowListBox* m_pListBox;
@@ -84,14 +84,14 @@ namespace dbaui
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual OTableWindowListBox* CreateListBox();
- // wird im ERSTEN Init aufgerufen
+ // called at FIRST Init
sal_Bool FillListBox();
- // wird in JEDEM Init aufgerufen
+ // called at EACH Init
virtual void OnEntryDoubleClicked(SvTreeListEntry* /*pEntry*/) { }
- // wird aus dem DoubleClickHdl der ListBox heraus aufgerufen
+ // called from the DoubleClickHdl of the ListBox
- /** HandleKeyInput triues to handle the KeyEvent. Movement or deletion
+ /** HandleKeyInput tries to handle the KeyEvent. Movement or deletion
@param rEvt
The KEyEvent
@return
@@ -127,7 +127,7 @@ namespace dbaui
public:
virtual ~OTableWindow();
- // spaeter Constructor, siehe auch CreateListbox und FillListbox
+ // late Constructor, see also CreateListbox and FillListbox
virtual sal_Bool Init();
OJoinTableView* getTableView();
@@ -183,7 +183,7 @@ namespace dbaui
// Accessibility
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
- // habe ich Connections nach aussen ?
+ // do I have connections to the outside?
sal_Bool ExistsAConn() const;
void EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields);
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index e42658f..a33f4fd 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -30,8 +30,8 @@ namespace dbaui
struct OJoinExchangeData
{
public:
- OTableWindowListBox* pListBox; // die ListBox innerhalb desselben (daraus kann man sich das TabWin und daraus den WinName besorgen)
- SvTreeListEntry* pEntry; // der Eintrag, der gedraggt oder auf den gedroppt wurde
+ OTableWindowListBox* pListBox; // the ListBox inside the same (you can get the TabWin and the WinName out of it)
+ SvTreeListEntry* pEntry; // the entry, which was dragged or to which was dropped on
OJoinExchangeData(OTableWindowListBox* pBox);
OJoinExchangeData() : pListBox(NULL), pEntry(NULL) { }
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index b8aacbc..2281886 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -49,7 +49,7 @@ namespace com { namespace sun { namespace star {
namespace dbaui
{
// =========================================================================
- // ODatabaseImportExport Basisklasse f"ur Import/Export
+ // ODatabaseImportExport base class for import/export
// =========================================================================
class ODatabaseExport;
typedef ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> ODatabaseImportExport_BASE;
@@ -90,7 +90,7 @@ namespace dbaui
#endif
ODatabaseExport* m_pReader;
- sal_Int32* m_pRowMarker; // wenn gesetzt, dann nur diese Rows kopieren
+ sal_Int32* m_pRowMarker; // if set, then copy only these rows
rtl_TextEncoding m_eDestEnc;
sal_Bool m_bInInitialize;
sal_Bool m_bCheckOnly;
@@ -131,7 +131,7 @@ namespace dbaui
};
// =========================================================================
- // RTF Im- und Export
+ // RTF Import and Export
// =========================================================================
class ORTFImportExport : public ODatabaseImportExport
@@ -156,7 +156,7 @@ namespace dbaui
virtual sal_Bool Read();
};
// =========================================================================
- // HTML Im- und Export
+ // HTML Import and Export
// =========================================================================
#define SBA_HTML_FONTSIZES 7
const sal_Int16 nIndentMax = 23;
@@ -201,7 +201,7 @@ namespace dbaui
};
// =========================================================================
- // normal RowSet Im- und Export
+ // normal RowSet Import and Export
// =========================================================================
class ORowSetImportExport : public ODatabaseImportExport
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index 9cced6f..2f4a40a 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.hxx
@@ -32,7 +32,7 @@
namespace dbaui
{
//========================================================================
-// Anhand dieser Ids werden die sprachabhaengigen ::rtl::OUString aus der Resource geholt
+// Based on these ids the language dependent ::rtl::OUString are fetched from the resource
const sal_uInt16 TYPE_UNKNOWN = 0;
const sal_uInt16 TYPE_TEXT = 1;
const sal_uInt16 TYPE_NUMERIC = 2;
@@ -70,26 +70,26 @@ const sal_uInt16 TYPE_BIT = 31;
{
public:
::rtl::OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName)
- ::rtl::OUString aTypeName; // Name des Types in der Datenbank
- ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten
- ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten
- ::rtl::OUString aCreateParams; // Parameter zum Erstellen
+ ::rtl::OUString aTypeName; // name of type in database
+ ::rtl::OUString aLiteralPrefix; // prefix for quoting
+ ::rtl::OUString aLiteralSuffix; // suffix for quoting
+ ::rtl::OUString aCreateParams; // parameter for creation
::rtl::OUString aLocalTypeName;
- sal_Int32 nPrecision; // Laenge des Types
- sal_Int32 nType; // Datenbanktyp
+ sal_Int32 nPrecision; // length of type
+ sal_Int32 nType; // database type
- sal_Int16 nMaximumScale; // Nachkommastellen
- sal_Int16 nMinimumScale; // Min Nachkommastellen
+ sal_Int16 nMaximumScale; // decimal places after decimal point
+ sal_Int16 nMinimumScale; // min decimal places after decimal point
- sal_Int16 nSearchType; // kann nach dem Typen gesucht werden
+ sal_Int16 nSearchType; // if it is possible to search for type
- sal_Bool bCurrency : 1, // Waehrung
- bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld
- bNullable : 1, // Kann das Feld NULL annehmen
- bCaseSensitive : 1, // Ist der Type Casesensitive
- bUnsigned : 1; // Ist der Type Unsigned
+ sal_Bool bCurrency : 1, // currency
+ bAutoIncrement : 1, // if automatic incrementing field
+ bNullable : 1, // if field can be NULL
+ bCaseSensitive : 1, // if type is case sensitive
+ bUnsigned : 1; // if type is unsigned
OTypeInfo()
:nPrecision(0)
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 61f297a..bc0e07b 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -334,7 +334,7 @@ namespace dbaui
OKButton& GetOKButton() { return m_pbFinish; }
Wizard_Button_Style GetPressedButton() const { return m_ePressed; }
void EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable);
- void AddWizardPage(OWizardPage* pPage); // Page wird von OCopyTableWizard gelöscht
+ void AddWizardPage(OWizardPage* pPage); // Page wird von OCopyTableWizard gelöscht
void RemoveWizardPage(OWizardPage* pPage); // Page goes again to user
void CheckButtons(); // checks which button can be disabled, enabled
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index cb464ed..ba9acfa 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -62,7 +62,7 @@ namespace dbaui
// ========================================================
// Wizard Page: OWizTypeSelectList
- // definiert nur das ::com::sun::star::ucb::Command f"ur das Contextmenu
+ // just defines the ::com::sun::star::ucb::Command for the Contextmenu
// ========================================================
class OWizTypeSelectList : public MultiListBox
{
@@ -81,8 +81,8 @@ namespace dbaui
// ========================================================
// Wizard Page: OWizTypeSelect
- // Dient als Basis Klasse fuer unterschiedliche Kopiereigenschaften
- // FillColumnList wird aufgerufen, wenn der Button AUTO ausgeloest wird.
+ // Serves as base class for different copy properties.
+ // Calls FillColumnList, when button AUTO is triggered
// ========================================================
class OWizTypeSelect : public OWizardPage
{
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 835c534..a4ac1a3 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -42,10 +42,10 @@ namespace dbaui
Timer m_timerInvalidate;
Timer m_timerUndoActionCreation;
Link m_lnkTextModifyHdl;
- String m_strOrigText; // wird beim Undo wiederhergestellt
+ String m_strOrigText; // is restored on undo
OQueryTextView* m_pView;
- sal_Bool m_bAccelAction; // Wird bei Cut, Copy, Paste gesetzt
- sal_Bool m_bStopTimer;
+ sal_Bool m_bAccelAction; // is set on cut, copy, paste
+ sal_Bool m_bStopTimer;
svtools::ColorConfig m_ColorConfig;
rtl::Reference< ChangesListener > m_listener;
@@ -77,9 +77,8 @@ namespace dbaui
sal_Bool IsInAccelAct();
void SetTextModifyHdl(const Link& lnk) { m_lnkTextModifyHdl = lnk; }
- // bitte nicht SetModifyHdl benutzen, den brauche ich selber, der hier wird von dem damit gesetzten Handler
- // gerufen
- // der Link bekommt einen Pointer-to-string, der nach dem Link nicht mehr gueltig ist
+ // please don't use SetModifyHdl, I need it for myself, this here is called from the handler set with that
+ // the link gets a pointer-to-string, which is invalid after the link
void stopTimer();
void startTimer();
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 99cc8eb..97a3e5b 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::awt;
-#define DBAUI_HTML_FONTSIZES 8 // wie Export, HTML-Options
+#define DBAUI_HTML_FONTSIZES 8 // like export, HTML-Options
#define HTML_META_NONE 0
#define HTML_META_AUTHOR 1
#define HTML_META_DESCRIPTION 2
@@ -145,18 +145,18 @@ void OHTMLReader::NextToken( int nToken )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen at sun.com", "OHTMLReader::NextToken" );
DBG_CHKTHIS(OHTMLReader,NULL);
- if(m_bError || !m_nRows) // falls Fehler oder keine Rows mehr zur "Uberpr"ufung dann gleich zur"uck
+ if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
return;
if ( nToken == HTML_META )
setTextEncoding();
- if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll
+ if(m_xConnection.is()) // names, which CTOR was called and hence, if a table should be created
{
switch(nToken)
{
case HTML_TABLE_ON:
++m_nTableCount;
- { // es kann auch TD oder TH sein, wenn es vorher kein TABLE gab
+ { // can also be TD or TH, if there was no TABLE before
const HTMLOptions& rHtmlOptions = GetOptions();
for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
{
@@ -164,7 +164,7 @@ void OHTMLReader::NextToken( int nToken )
switch( rOption.GetToken() )
{
case HTML_O_WIDTH:
- { // Prozent: von Dokumentbreite bzw. aeusserer Zelle
+ { // percentage: of document width respectively outer cell
m_nColumnWidth = GetWidthPixel( rOption );
}
break;
@@ -174,9 +174,9 @@ void OHTMLReader::NextToken( int nToken )
case HTML_THEAD_ON:
case HTML_TBODY_ON:
{
- sal_uInt32 nTell = rInput.Tell(); // ver�ndert vielleicht die Position des Streams
+ sal_uInt32 nTell = rInput.Tell(); // perhaps alters position of the stream
if ( !m_xTable.is() )
- {// erste Zeile als Header verwenden
+ {// use first line as header
m_bError = !CreateTable(nToken);
if ( m_bAppendFirstLine )
rInput.Seek(nTell);
@@ -194,10 +194,10 @@ void OHTMLReader::NextToken( int nToken )
{
try
{
- m_pUpdateHelper->moveToInsertRow(); // sonst neue Zeile anh"angen
+ m_pUpdateHelper->moveToInsertRow(); // otherwise append new line
}
catch(SQLException& e)
- // UpdateFehlerbehandlung
+ // handling update failure
{
showErrorDialog(e);
}
@@ -207,7 +207,7 @@ void OHTMLReader::NextToken( int nToken )
break;
case HTML_TEXTTOKEN:
case HTML_SINGLECHAR:
- if ( m_bInTbl ) //&& !m_bSDNum ) // wichtig, da wir sonst auch die Namen der Fonts bekommen
+ if ( m_bInTbl ) //&& !m_bSDNum ) // important, as otherwise we also get the names of the fonts
m_sTextToken += aToken;
break;
case HTML_PARABREAK_OFF:
@@ -228,7 +228,7 @@ void OHTMLReader::NextToken( int nToken )
insertValueIntoColumn();
}
catch(SQLException& e)
- // UpdateFehlerbehandlung
+ // handling update failure
{
showErrorDialog(e);
}
@@ -253,7 +253,7 @@ void OHTMLReader::NextToken( int nToken )
}
catch(SQLException& e)
//////////////////////////////////////////////////////////////////////
- // UpdateFehlerbehandlung
+ // handling update failure
{
showErrorDialog(e);
}
@@ -261,13 +261,13 @@ void OHTMLReader::NextToken( int nToken )
break;
}
}
- else // Zweig nur f"ur Typpr"ufung g"ultig
+ else // branch only valid for type checking
{
switch(nToken)
{
case HTML_THEAD_ON:
case HTML_TBODY_ON:
- // Der Spalten Kopf z"ahlt nicht mit
+ // The head of the column is not included
if(m_bHead)
{
do
@@ -282,7 +282,7 @@ void OHTMLReader::NextToken( int nToken )
break;
case HTML_TEXTTOKEN:
case HTML_SINGLECHAR:
- if ( m_bInTbl ) // && !m_bSDNum ) // wichtig, da wir sonst auch die Namen der Fonts bekommen
+ if ( m_bInTbl ) // && !m_bSDNum ) // important, as otherwise we also get the names of the fonts
m_sTextToken += aToken;
break;
case HTML_PARABREAK_OFF:
@@ -389,7 +389,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
xub_StrLen nPos = 0;
while( nPos != STRING_NOTFOUND )
{
- // Fontliste, VCL: Semikolon als Separator, HTML: Komma
+ // list fo fonts, VCL: semicolon as separator, HTML: comma
String aFName = rFace.GetToken( 0, ',', nPos );
aFName = comphelper::string::strip(aFName, ' ');
if( aFontName.Len() )
@@ -421,19 +421,19 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
DBG_CHKTHIS(OHTMLReader,NULL);
const String& rOptVal = rOption.GetString();
if ( rOptVal.Search('%') != STRING_NOTFOUND )
- { // Prozent
+ { // percentage
OSL_ENSURE( m_nColumnWidth, "WIDTH Option: m_nColumnWidth==0 und Width%" );
return (sal_Int16)((rOption.GetNumber() * m_nColumnWidth) / 100);
}
else
{
if ( rOptVal.Search('*') != STRING_NOTFOUND )
- { // relativ zu was?!?
-//TODO: ColArray aller relativen Werte sammeln und dann MakeCol
+ { // relativ to what?!?
+//TODO: collect ColArray of all relevant values and then MakeCol
return 0;
}
else
- return (sal_Int16)rOption.GetNumber(); // Pixel
+ return (sal_Int16)rOption.GetNumber(); // pixel
}
}
// ---------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 977f12c..3502b48 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -109,10 +109,10 @@ void ORTFReader::NextToken( int nToken )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen at sun.com", "ORTFReader::NextToken" );
DBG_CHKTHIS(ORTFReader,NULL);
- if(m_bError || !m_nRows) // falls Fehler oder keine Rows mehr zur "Uberpr"ufung dann gleich zur"uck
+ if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
return;
- if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll
+ if(m_xConnection.is()) // names, which CTOR was called and hence, if a table should be created
{
switch(nToken)
{
@@ -144,15 +144,15 @@ void ORTFReader::NextToken( int nToken )
break;
case RTF_DEFLANG:
- case RTF_LANG: // Sprache abfragen
+ case RTF_LANG: // inquire language
m_nDefToken = (rtl_TextEncoding)nTokenValue;
break;
case RTF_TROWD:
{
bool bInsertRow = true;
- if ( !m_xTable.is() ) // erste Zeile als Header verwenden
+ if ( !m_xTable.is() ) // use first line as header
{
- sal_uInt32 nTell = rInput.Tell(); // ver�ndert vielleicht die Position des Streams
+ sal_uInt32 nTell = rInput.Tell(); // perhaps alters position of the stream
m_bError = !CreateTable(nToken);
bInsertRow = m_bAppendFirstLine;
@@ -166,10 +166,10 @@ void ORTFReader::NextToken( int nToken )
{
try
{
- m_pUpdateHelper->moveToInsertRow(); // sonst neue Zeile anh"angen
+ m_pUpdateHelper->moveToInsertRow(); // otherwise append new line
}
catch(SQLException& e)
- // UpdateFehlerbehandlung
+ // handling update failure
{
showErrorDialog(e);
}
@@ -182,11 +182,11 @@ void ORTFReader::NextToken( int nToken )
eraseTokens();
}
- m_bInTbl = sal_True; // jetzt befinden wir uns in einer Tabellenbeschreibung
+ m_bInTbl = sal_True; // Now we are in a table description
break;
case RTF_TEXTTOKEN:
case RTF_SINGLECHAR:
- if(m_bInTbl) // wichtig, da wir sonst auch die Namen der Fonts bekommen
+ if(m_bInTbl) // important, as otherwise we also get the names of the fonts
m_sTextToken += aToken;
break;
case RTF_CELL:
@@ -196,7 +196,7 @@ void ORTFReader::NextToken( int nToken )
insertValueIntoColumn();
}
catch(SQLException& e)
- // UpdateFehlerbehandlung
+ // handling update failure
{
showErrorDialog(e);
}
@@ -205,7 +205,7 @@ void ORTFReader::NextToken( int nToken )
}
break;
case RTF_ROW:
- // es kann vorkommen, da� die letzte Celle nicht mit \cell abgeschlossen ist
+ // it can happen that the last cell is not concluded with \cell
try
{
insertValueIntoColumn();
@@ -216,7 +216,7 @@ void ORTFReader::NextToken( int nToken )
}
catch(SQLException& e)
//////////////////////////////////////////////////////////////////////
- // UpdateFehlerbehandlung
+ // handling update failure
{
showErrorDialog(e);
}
@@ -224,12 +224,12 @@ void ORTFReader::NextToken( int nToken )
break;
}
}
- else // Zweig nur f"ur Typpr"ufung g"ultig
+ else // branch only valid for type checking
{
switch(nToken)
{
case RTF_TROWD:
- // Der Spalten Kopf z"ahlt nicht mit
+ // The head of the column is not included
if(m_bHead)
{
do
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index ab1db7f..eff9330 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -465,7 +465,7 @@ sal_Bool ORTFImportExport::Write()
(*m_pStream) << ODatabaseImportExport::sNewLine;
}
- // Spaltenbeschreibung
+ // column description
(*m_pStream) << '{' << ODatabaseImportExport::sNewLine;
(*m_pStream) << aTRRH;
@@ -496,7 +496,7 @@ sal_Bool ORTFImportExport::Write()
default:pChar = OOO_STRING_SVTOOLS_RTF_QL; break;
}
- pHorzChar[i-1] = pChar; // um sp"ater nicht immer im ITEMSET zuw"uhlen
+ pHorzChar[i-1] = pChar; // to avoid to always rummage in the ITEMSET later on
(*m_pStream) << ODatabaseImportExport::sNewLine;
(*m_pStream) << '{';
@@ -858,7 +858,7 @@ void OHTMLImportExport::WriteTables()
sal_Int32 nHeight = 0;
m_xObject->getPropertyValue(PROPERTY_ROW_HEIGHT) >>= nHeight;
- // 1. die Spaltenbeschreibung rauspusten
+ // 1. writing the column description
const ::rtl::OUString* pIter = aNames.getConstArray();
const ::rtl::OUString* pEnd = pIter + aNames.getLength();
@@ -887,7 +887,7 @@ void OHTMLImportExport::WriteTables()
IncIndent(-1);
WriteCell(pFormat[i],pColWidth[i],nHeight,pHorJustify[i],*pIter,OOO_STRING_SVTOOLS_HTML_tableheader);
- }
+ }libreOffice SetModifyHdl
IncIndent(-1);
TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tablerow );
@@ -896,7 +896,7 @@ void OHTMLImportExport::WriteTables()
IncIndent(1);
TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tbody );
- // 2. und jetzt die Daten
+ // 2. and now the data
::comphelper::ComponentContext aContext(m_xFactory);
Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
sal_Int32 j=1;
@@ -964,14 +964,14 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
nWidthPixel = nWidthPixel ? nWidthPixel : 86;
nHeightPixel = nHeightPixel ? nHeightPixel : 17;
- // trotz der <TABLE COLS=n> und <COL WIDTH=x> Angaben noetig,
- // da die nicht von Netscape beachtet werden..
- // Spaltenbreite
+ // despite the <TABLE COLS=n> and <COL WIDTH=x> designation necessary,
+ // as Netscape is not paying attention to them.
+ // column width
aStrTD = aStrTD + " ";
aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_width;
aStrTD = aStrTD + "=";
aStrTD = aStrTD + ::rtl::OString::valueOf((sal_Int32)nWidthPixel);
- // Zeilenhoehe
+ // line height
aStrTD = aStrTD + " ";
aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_height;
aStrTD = aStrTD + "=";
@@ -1015,7 +1015,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
if ( bStrikeout ) TAG_ON( OOO_STRING_SVTOOLS_HTML_strike );
if ( !rValue.Len() )
- TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // keine komplett leere Zelle
+ TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // no completely empty cell
else
HTMLOutFuncs::Out_String( (*m_pStream), rValue ,m_eDestEnc);
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index cdaf005..24c5061 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -97,7 +97,7 @@ OWizColumnSelect::~OWizColumnSelect()
// -----------------------------------------------------------------------
void OWizColumnSelect::Reset()
{
- // urspr"unglichen zustand wiederherstellen
+ // restore original state
DBG_CHKTHIS(OWizColumnSelect,NULL);
clearListBox(m_lbOrgColumnNames);
@@ -248,7 +248,7 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, MultiListBox *, pListBox )
}
//////////////////////////////////////////////////////////////////////
- // Wenn Datenbank PrimaryKeys verarbeiten kann, PrimaryKey anlegen
+ // If database is able to process PrimaryKeys, set PrimaryKey
Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() );
::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters();
sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength();
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index bf3c9d3..b468478 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -80,7 +80,7 @@ using namespace dbtools;
namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
-#define MAX_PAGES 4 // max. Pages die angezeigt werden
+#define MAX_PAGES 4 // max. number of pages, which are shown
DBG_NAME(OCopyTableWizard)
namespace
@@ -804,7 +804,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
OSL_ENSURE( m_xDestConnection.is(), "OCopyTableWizard::CheckColumns: No connection!" );
//////////////////////////////////////////////////////////////////////
- // Wenn Datenbank PrimaryKeys verarbeiten kann, PrimaryKey anlegen
+ // If database is able to process PrimaryKeys, set PrimaryKey
if ( m_xDestConnection.is() )
{
sal_Bool bPKeyAllowed = supportsPrimaryKey();
@@ -1118,9 +1118,9 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject,
::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x"));
//////////////////////////////////////////////////////////////////////
// ReadOnly-Flag
- // Bei Drop darf keine Zeile editierbar sein.
- // Bei Add duerfen nur die leeren Zeilen editierbar sein.
- // Bei Add und Drop koennen alle Zeilen editiert werden.
+ // On drop no line must be editable.
+ // On add only empty lines must be editable.
+ // On Add and Drop all lines can be edited.
Sequence< ::rtl::OUString > aColumns( _rSourceObject.getColumnNames() );
const ::rtl::OUString* pColumn = aColumns.getConstArray();
const ::rtl::OUString* pColumnEnd = pColumn + aColumns.getLength();
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 0a40d8e..a55ee7b 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -290,7 +290,7 @@ IMPL_LINK( OWizTypeSelect, ColumnSelectHdl, MultiListBox *, /*pListBox*/ )
// -----------------------------------------------------------------------
void OWizTypeSelect::Reset()
{
- // urspr"unglichen zustand wiederherstellen
+ // restore original state
DBG_CHKTHIS(OWizTypeSelect,NULL);
while(m_lbColumnNames.GetEntryCount())
@@ -412,7 +412,7 @@ long OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
const CommandEvent* pComEvt = rEvt.GetCommandEvent();
if(pComEvt->GetCommand() != COMMAND_CONTEXTMENU)
break;
- // die Stelle, an der geklickt wurde
+ // the place, at which was clicked
Point ptWhere(0,0);
if (pComEvt->IsMouseEvent())
ptWhere = pComEvt->GetMousePosPixel();
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index 89df41c..afafa2b 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -145,9 +145,9 @@ OConnectionLine& OConnectionLine::operator=( const OConnectionLine& rLine )
{
if( &rLine != this )
{
- // da mir die Daten nicht gehoeren, loesche ich die alten nicht
+ // as the data does not belong to me, I don't delete the old one
m_pData->CopyFrom(*rLine.GetData());
- // CopyFrom ist virtuell, damit ist es kein Problem, wenn m_pData von einem von OTableConnectionData abgeleiteten Typ ist
+ // CopyFrom is virtual, therefore it is not a problem, if m_pData is of a type derived from OTableConnectionData
m_pTabConn = rLine.m_pTabConn;
m_aSourceConnPos = rLine.m_aSourceConnPos;
@@ -163,7 +163,7 @@ OConnectionLine& OConnectionLine::operator=( const OConnectionLine& rLine )
Rectangle OConnectionLine::GetBoundingRect()
{
//////////////////////////////////////////////////////////////////////
- // Umgebendes Rechteck bestimmen
+ // determine surrounding rectangle
Rectangle aBoundingRect( Point(0,0), Point(0,0) );
if( !IsValid() )
return aBoundingRect;
@@ -196,7 +196,7 @@ Rectangle OConnectionLine::GetBoundingRect()
const OTableWindow* pSourceWin = m_pTabConn->GetSourceWin();
const OTableWindow* pDestWin = m_pTabConn->GetDestWin();
//////////////////////////////////////////////////////////////////////
- // Linie verlaeuft in z-Form
+ // line proceeds in in z-Form
if( pSourceWin == pDestWin || Abs(m_aSourceConnPos.X() - m_aDestConnPos.X()) > Abs(m_aSourceDescrLinePos.X() - m_aDestDescrLinePos.X()) )
{
aTopLeft.X() -= DESCRIPT_LINE_WIDTH;
@@ -225,7 +225,7 @@ void calcPointX2(const OTableWindow* _pWin,Point& _rNewConPos,Point& _rNewDescrP
sal_Bool OConnectionLine::RecalcLine()
{
//////////////////////////////////////////////////////////////////////
- // Fenster und Entries muessen gesetzt sein
+ // Windows and entries must be set
const OTableWindow* pSourceWin = m_pTabConn->GetSourceWin();
const OTableWindow* pDestWin = m_pTabConn->GetDestWin();
@@ -236,7 +236,7 @@ sal_Bool OConnectionLine::RecalcLine()
SvTreeListEntry* pDestEntry = pDestWin->GetListBox()->GetEntryFromText( GetData()->GetDestFieldName() );
//////////////////////////////////////////////////////////////////////
- // X-Koordinaten bestimmen
+ // determine X-coordinates
Point aSourceCenter( 0, 0 );
Point aDestCenter( 0, 0 );
@@ -266,11 +266,11 @@ sal_Bool OConnectionLine::RecalcLine()
calcPointX2(pSecondWin,*pSecondConPos,*pSecondDescrPos);
//////////////////////////////////////////////////////////////////////
- // aSourceConnPosY bestimmen
+ // determine aSourceConnPosY
calcPointsYValue(pSourceWin,pSourceEntry,m_aSourceConnPos,m_aSourceDescrLinePos);
//////////////////////////////////////////////////////////////////////
- // aDestConnPosY bestimmen
+ // determine aDestConnPosY
calcPointsYValue(pDestWin,pDestEntry,m_aDestConnPos,m_aDestDescrLinePos);
return sal_True;
@@ -283,12 +283,12 @@ void OConnectionLine::Draw( OutputDevice* pOutDev )
const sal_uInt16 nRectSize = 3;
//////////////////////////////////////////////////////////////////////
- // Neue Dimensionen berechnen
+ // calculate new dimension
if( !RecalcLine() )
return;
//////////////////////////////////////////////////////////////////////
- // Zeichnen der Linien
+ // draw lines
if (m_pTabConn->IsSelected())
pOutDev->SetLineColor(Application::GetSettings().GetStyleSettings().GetHighlightColor());
else
@@ -335,8 +335,8 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const
{
//////////////////////////////////////////////////////////////////////
/*
- Vorgehensweise beim HitTest:
- Es wird der Abstand nach Euklid berechnet.
+ course of action with HitTest:
+ the distance is calculated according to Euklid.
*/
Point q;
double l = fabs(dist_Euklid(m_aSourceConnPos,m_aDestConnPos,rMousePos,q));
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
index 2beebe3..dc19797 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
@@ -58,7 +58,7 @@ OConnectionLineData::~OConnectionLineData()
void OConnectionLineData::CopyFrom(const OConnectionLineData& rSource)
{
*this = rSource;
- // hier ziehe ich mich auf das (nicht-virtuelle) operator= zurueck, das nur meine Members kopiert
+ // Here I rely on the (non-virtual) operator=, which only copies my members
}
//------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 0724b18..20a2c60 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -219,11 +219,11 @@ void OJoinController::impl_onModifyChanged()
// -----------------------------------------------------------------------------
void OJoinController::SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY)
{
- // die Daten zum Fenster
+ // the data for the window
TTableWindowData::value_type pData = pTabWin->GetData();
OSL_ENSURE(pData != NULL, "SaveTabWinPosSize : TabWin hat keine Daten !");
- // Position & Size der Daten neu setzen (aus den aktuellen Fenster-Parametern)
+ // set Position & Size of data anew (with current window parameters)
Point aPos = pTabWin->GetPosPixel();
aPos.X() += nOffsetX;
aPos.Y() += nOffsetY;
@@ -320,12 +320,10 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
// -----------------------------------------------------------------------------
void OJoinController::SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY )
{
- // Das Loeschen und Neuanlegen der alten Implementation ist unter dem aktuellen Modell nicht mehr richtig : Die TabWins
- // habe einen Zeiger auf ihre Daten, verwaltet werden sie aber von mir. Wenn ich die alten loesche, haben die TabWins
- // ploetzlich Zeiger auf nicht mehr existente Objekte.
- // Wenn die TabWins ein SetData haetten, koennte ich mir das sparen ... haben sie aber nicht, ausserdem muesste ich dann immer
- // noch Informationen, die sich eigentlich nicht geaendert haben, auch neu setzen.
- // Also loesche ich die TabWinDatas nicht, sondern aktualisiere sie nur.
+ // Deletion and recreation of the old implementation with the current model is not correct anymore:
+ // The TabWins have a pointer to their data, but they are managed by me. When I delete the old ones, the TabWins suddenly have a pointer to objects, which no longer exist.
+ // If the TabWins had a SetData, I could save that effort... but they don't, further I also would still have to set information anew, which actually didn't change.
+ // So I don't delete the TabWinDatas, but only update them.
OSL_ENSURE(m_vTableData.size() == pTabWinList->size(),
"OJoinController::SaveTabWinsPosSize : inkonsistenter Zustand : sollte genausviel TabWinDatas haben wie TabWins !");
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 9614c49..eec1437 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -40,7 +40,7 @@ namespace dbaui
,m_pDragListener(NULL)
{
DBG_CTOR(OJoinExchObj,NULL);
- // Verfuegbare Typen in Liste einfuegen
+ // add available types to list
}
//------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index de04113..6487ff5 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::lang;
#define LINE_SIZE 50
////////////////////////////////////////////////////////////////
-// Konstanten fuer das Fensterlayout
+// Constants for the window layout
#define TABWIN_SPACING_X 17
#define TABWIN_SPACING_Y 17
@@ -195,14 +195,14 @@ OJoinTableView::~OJoinTableView()
m_pAccessible = NULL;
}
//////////////////////////////////////////////////////////////////////
- // Listen loeschen
+ // delete lists
clearLayoutInformation();
}
//------------------------------------------------------------------------------
IMPL_LINK( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar )
{
//////////////////////////////////////////////////////////////////////
- // Alle Fenster verschieben
+ // move all windows
ScrollPane( pScrollBar->GetDelta(), (pScrollBar == GetHScrollBar()), sal_False );
return 0;
@@ -332,7 +332,7 @@ void OJoinTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rt
TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
//////////////////////////////////////////////////////////////////
- // Neues Fenster in Fensterliste eintragen
+ // insert new window in window list
OTableWindow* pNewTabWin = createWindow( pNewTabWinData );
if ( pNewTabWin->Init() )
{
@@ -542,10 +542,10 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
{
DBG_CHKTHIS(OJoinTableView,NULL);
//////////////////////////////////////////////////////////////////
- // Position bestimmen:
- // Das Fenster wird in Zeilen der Hoehe TABWIN_SPACING_Y+TABWIN_HEIGTH_STD aufgeteilt.
- // Dann wird fuer jede Zeile geprueft, ob noch Platz fuer ein weiteres Fenster ist.
- // Wenn kein Platz ist, wird die naechste Zeile ueberprueft.
+ // determine position:
+ // the window is divided into lines with height TABWIN_SPACING_Y+TABWIN_HEIGTH_STD.
+ // Then for each line is checked, if there is space for another window.
+ // If there is no space, the next line is checked.
Size aOutSize = GetSizePixel();
Point aNewPos( 0,0 );
sal_uInt16 nRow = 0;
@@ -553,18 +553,18 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
while( !bEnd )
{
//////////////////////////////////////////////////////////////////
- // Neue Position auf Zeilenbeginn setzen
+ // Set new position to start of line
aNewPos.X() = TABWIN_SPACING_X;
aNewPos.Y() = (nRow+1) * TABWIN_SPACING_Y;
//////////////////////////////////////////////////////////////////
- // Rectangle fuer die jeweilige Zeile bestimmen
+ // determine rectangle for the corresponding line
Rectangle aRowRect( Point(0,0), aOutSize );
aRowRect.Top() = nRow * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD );
aRowRect.Bottom() = (nRow+1) * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD );
//////////////////////////////////////////////////////////////////
- // Belegte Bereiche dieser Zeile pruefen
+ // check occupied areas of this line
OTableWindow* pOtherTabWin;
OTableWindowMapIterator aIter = m_aTableMap.begin();
OTableWindowMapIterator aEnd = m_aTableMap.end();
@@ -579,14 +579,14 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
)
{
//////////////////////////////////////////////////////////////////
- // TabWin liegt in der Zeile
+ // TabWin is in the line
if( aOtherTabWinRect.Right()>aNewPos.X() )
aNewPos.X() = aOtherTabWinRect.Right() + TABWIN_SPACING_X;
}
}
//////////////////////////////////////////////////////////////////
- // Ist in dieser Zeile noch Platz?
+ // Is there space left in this line?
if( (aNewPos.X()+TABWIN_WIDTH_STD)<aRowRect.Right() )
{
aNewPos.Y() = aRowRect.Top() + TABWIN_SPACING_Y;
@@ -609,7 +609,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
}
//////////////////////////////////////////////////////////////////
- // Groesse bestimmen
+ // determine size
Size aNewSize( CalcZoom(TABWIN_WIDTH_STD), CalcZoom(TABWIN_HEIGHT_STD) );
// check if the new position in inside the scrollbars ranges
@@ -631,12 +631,10 @@ void OJoinTableView::DataChanged(const DataChangedEvent& rDCEvt)
DBG_CHKTHIS(OJoinTableView,NULL);
if (rDCEvt.GetType() == DATACHANGED_SETTINGS)
{
- // nehmen wir den worst-case an : die Farben haben sich geaendert, also
- // mich anpassen
+ // consider the worst case: the colors changed, so adjust me
InitColors();
Invalidate(INVALIDATE_NOCHILDREN);
- // durch das Invalidate werden auch die Connections neu gezeichnet, so dass die auch
- // gleich in den neuen Farben dargestellt werden
+ // due to the Invalidate, the connections are redrawn, so that they are also pictured in the new colors
}
}
@@ -644,7 +642,7 @@ void OJoinTableView::DataChanged(const DataChangedEvent& rDCEvt)
void OJoinTableView::InitColors()
{
DBG_CHKTHIS(OJoinTableView,NULL);
- // die Farben fuer die Darstellung sollten die Systemfarben sein
+ // the colors for the illustration should be the system colors
StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
SetBackground(Wallpaper(Color(aSystemStyle.GetDialogColor())));
}
@@ -693,7 +691,7 @@ sal_Bool OJoinTableView::ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPai
sal_Bool bRet = sal_True;
//////////////////////////////////////////////////////////////////////
- // ScrollBar-Positionen anpassen
+ // adjust ScrollBar-Positions
if( bPaintScrollBars )
{
if( bHoriz )
@@ -733,20 +731,20 @@ sal_Bool OJoinTableView::ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPai
}
//////////////////////////////////////////////////////////////////////
- // Wenn ScrollOffset bereits an den Grenzen liegt, kein Neuzeichnen
+ // If ScrollOffset hitting borders, no redrawing.
if( (GetHScrollBar()->GetThumbPos()==m_aScrollOffset.X()) &&
(GetVScrollBar()->GetThumbPos()==m_aScrollOffset.Y()) )
return sal_False;
//////////////////////////////////////////////////////////////////////
- // ScrollOffset neu setzen
+ // set ScrollOffset anew
if (bHoriz)
m_aScrollOffset.X() = GetHScrollBar()->GetThumbPos();
else
m_aScrollOffset.Y() = GetVScrollBar()->GetThumbPos();
//////////////////////////////////////////////////////////////////////
- // Alle Fenster verschieben
+ // move all windows
OTableWindow* pTabWin;
Point aPos;
@@ -783,9 +781,9 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
m_aDragScrollTimer.Stop();
//////////////////////////////////////////////////////////////////////
- // Position des Childs nach Verschieben anpassen
+ // adjust position of child after moving
//////////////////////////////////////////////////////////////////////
- // Fenster duerfen nicht aus Anzeigebereich herausbewegt werden
+ // windows are not allowed to leave display range
Point aDragWinPos = rTEvt.GetMouseEvent().GetPosPixel() - m_aDragOffset;
Size aDragWinSize = m_pDragWin->GetSizePixel();
if( aDragWinPos.X() < 0 )
@@ -800,21 +798,21 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
aDragWinPos.X() = 0;
if( aDragWinPos.Y() < 0 )
aDragWinPos.Y() = 0;
- // TODO : nicht das Fenster neu positionieren, wenn es uebersteht, sondern einfach meinen Bereich erweitern
+ // TODO : don't position window anew, if it is leaving range, but just expand the range
//////////////////////////////////////////////////////////////////////
- // Fenster positionieren
+ // position window
EndTracking();
m_pDragWin->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
- // erst mal testen, ob ich mich ueberhaupt bewegt habe
- // (das verhindert das Setzen des modified-Flags, wenn sich eigentlich gar nichts getan hat)
+ // check, if I really moved
+ // (this prevents setting the modified-Flag, when there actually was no change0
TTableWindowData::value_type pData = m_pDragWin->GetData();
if ( ! (pData && pData->HasPosition() && (pData->GetPosition() == aDragWinPos)))
{
- // die alten logischen Koordinaten
+ // old logic coordinates
Point ptOldPos = m_pDragWin->GetPosPixel() + Point(GetHScrollBar()->GetThumbPos(), GetVScrollBar()->GetThumbPos());
- // neu positionieren
+ // new positioning
m_pDragWin->SetPosPixel(aDragWinPos);
TabWinMoved(m_pDragWin, ptOldPos);
@@ -829,7 +827,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
SetPointer( Pointer() );
EndTracking();
- // die alten physikalischen Koordinaten
+ // old physical coordinates
Size szOld = m_pSizingWin->GetSizePixel();
Point ptOld = m_pSizingWin->GetPosPixel();
@@ -852,7 +850,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
if( m_pDragWin )
{
m_ptPrevDraggingPos = rTEvt.GetMouseEvent().GetPosPixel();
- // an Fenstergrenzen scrollen
+ // scroll at window borders
ScrollWhileDragging();
}
@@ -886,7 +884,7 @@ void OJoinTableView::MouseButtonUp( const MouseEvent& rEvt )
DBG_CHKTHIS(OJoinTableView,NULL);
Window::MouseButtonUp(rEvt);
//////////////////////////////////////////////////////////////////////
- // Wurde eine Connection ausgewaehlt?
+ // Has a connection been selected?
if( !m_vTableConnection.empty() )
{
DeselectConn(GetSelectedConn());
@@ -899,7 +897,7 @@ void OJoinTableView::MouseButtonUp( const MouseEvent& rEvt )
{
SelectConn((*aIter));
- // Doppelclick
+ // Double-click
if( rEvt.GetClicks() == 2 )
ConnDoubleClicked( (*aIter) );
@@ -933,7 +931,7 @@ void OJoinTableView::DeselectConn(OTableConnection* pConn)
if (!pConn || !pConn->IsSelected())
return;
- // die zugehoerigen Eitnraege in der ListBox des Tabellenfenster deselektieren
+ // deselect the corresponding entries in the ListBox of the table window
OTableWindow* pWin = pConn->GetSourceWin();
if (pWin && pWin->GetListBox())
pWin->GetListBox()->SelectAll(sal_False);
@@ -956,7 +954,7 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
m_pSelectedConn = pConn;
GrabFocus(); // has to be called here because a table window may still be focused
- // die betroffenene Eintraege in den Windows selektieren
+ // select the concerned entries in the windows
OTableWindow* pConnSource = pConn->GetSourceWin();
OTableWindow* pConnDest = pConn->GetDestWin();
if (pConnSource && pConnDest)
@@ -996,7 +994,7 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
if ((pFirstSourceVisible != pSourceBox->GetFirstEntryInView())
|| (pFirstDestVisible != pDestBox->GetFirstEntryInView()))
- // es wurde gescrollt -> neu zeichnen
+ // scrolling was done -> redraw
Invalidate(INVALIDATE_NOCHILDREN);
}
}
@@ -1013,7 +1011,7 @@ void OJoinTableView::InvalidateConnections()
{
DBG_CHKTHIS(OJoinTableView,NULL);
//////////////////////////////////////////////////////////////////////
- // Die Joins zeichnen
+ // draw Joins
::std::for_each(m_vTableConnection.begin(),m_vTableConnection.end(),
::std::mem_fun(& OTableConnection::InvalidateConnection));
}
@@ -1023,9 +1021,9 @@ void OJoinTableView::DrawConnections( const Rectangle& rRect )
{
DBG_CHKTHIS(OJoinTableView,NULL);
//////////////////////////////////////////////////////////////////////
- // Die Joins zeichnen
+ // draw Joins
::std::for_each(m_vTableConnection.begin(),m_vTableConnection.end(),boost::bind( &OTableConnection::Draw, _1, boost::cref( rRect )));
- // zum Schluss noch mal die selektierte ueber alle anderen drueber
+ // finally redraw the selected one above all others
if (GetSelectedConn())
GetSelectedConn()->Draw( rRect );
}
@@ -1059,7 +1057,7 @@ void OJoinTableView::ClearAll()
HideTabWins();
- // und das selbe mit den Connections
+ // and the same with the Connections
::std::vector<OTableConnection*>::iterator aIter = m_vTableConnection.begin();
::std::vector<OTableConnection*>::iterator aEnd = m_vTableConnection.end();
for(;aIter != aEnd;++aIter)
@@ -1081,7 +1079,7 @@ sal_Bool OJoinTableView::ScrollWhileDragging()
DBG_CHKTHIS(OJoinTableView,NULL);
OSL_ENSURE(m_pDragWin != NULL, "OJoinTableView::ScrollWhileDragging darf nur waehrend Dragging eines Fensters aufgerufen werden !");
- // den Timer schon mal killen
+ // kill the timer
if (m_aDragScrollTimer.IsActive())
m_aDragScrollTimer.Stop();
@@ -1092,21 +1090,21 @@ sal_Bool OJoinTableView::ScrollWhileDragging()
if (!m_bTrackingInitiallyMoved && (aDragWinPos == m_pDragWin->GetPosPixel()))
return sal_True;
- // Darstellungsfehler vermeiden (wenn bei aktivem TrackingRect gescrollt wird)
+ // avoid illustration errors (when scrolling with active TrackingRect)
HideTracking();
sal_Bool bScrolling = sal_False;
sal_Bool bNeedScrollTimer = sal_False;
- // An Fenstergrenzen scrollen
- // TODO : nur dann abfangen, wenn das Fenster komplett verschwinden wuerde (nicht, solange noch ein Pixel sichtbar ist)
+ // scroll at window borders
+ // TODO : only catch, if window would disappear completely (don't, if there is still a pixel visible)
if( aDragWinPos.X() < 5 )
{
bScrolling = ScrollPane( -LINE_SIZE, sal_True, sal_True );
if( !bScrolling && (aDragWinPos.X()<0) )
aDragWinPos.X() = 0;
- // brauche ich weiteres (timergesteuertes) Scrolling ?
+ // do I need further (timer controlled) scrolling ?
bNeedScrollTimer = bScrolling && (aDragWinPos.X() < 5);
}
@@ -1116,7 +1114,7 @@ sal_Bool OJoinTableView::ScrollWhileDragging()
if( !bScrolling && ( aLowerRight.X() > m_aOutputSize.Width() ) )
aDragWinPos.X() = m_aOutputSize.Width() - aDragWinSize.Width();
- // brauche ich weiteres (timergesteuertes) Scrolling ?
+ // do I need further (timer controlled) scrolling ?
bNeedScrollTimer = bScrolling && (aLowerRight.X() > m_aOutputSize.Width() - 5);
}
@@ -1138,14 +1136,14 @@ sal_Bool OJoinTableView::ScrollWhileDragging()
bNeedScrollTimer = bScrolling && (aLowerRight.Y() > m_aOutputSize.Height() - 5);
}
- // Timer neu setzen, wenn noch notwendig
+ // resetting timer, if still necessary
if (bNeedScrollTimer)
{
m_aDragScrollTimer.SetTimeout(100);
m_aDragScrollTimer.Start();
}
- // das DraggingRect neu zeichnen
+ // redraw DraggingRect
m_aDragRect = Rectangle(m_ptPrevDraggingPos - m_aDragOffset, m_pDragWin->GetSizePixel());
Update();
ShowTracking( m_aDragRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW );
@@ -1190,7 +1188,7 @@ sal_Bool OJoinTableView::IsAddAllowed()
{
DBG_CHKTHIS(OJoinTableView,NULL);
- // nicht wenn Db readonly
+ // not, if Db readonly
if (m_pView->getController().isReadOnly())
return sal_False;
@@ -1199,7 +1197,7 @@ sal_Bool OJoinTableView::IsAddAllowed()
Reference< XConnection> xConnection = m_pView->getController().getConnection();
if(!xConnection.is())
return sal_False;
- // nicht wenn schon zuviele Tabellen
+ // not, if too many tables already
Reference < XDatabaseMetaData > xMetaData( xConnection->getMetaData() );
sal_Int32 nMax = xMetaData.is() ? xMetaData->getMaxTablesInSelect() : 0;
@@ -1616,7 +1614,7 @@ void OJoinTableView::clearLayoutInformation()
m_pLastFocusTabWin = NULL;
m_pSelectedConn = NULL;
//////////////////////////////////////////////////////////////////////
- // Listen loeschen
+ // delete lists
OTableWindowMapIterator aIter = m_aTableMap.begin();
OTableWindowMapIterator aEnd = m_aTableMap.end();
for(;aIter != aEnd;++aIter)
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx
index 0a7aa31..849cd9c 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@@ -40,7 +40,7 @@ OQueryTableConnection::OQueryTableConnection(const OQueryTableConnection& rConn)
:OTableConnection( rConn )
{
DBG_CTOR(OQueryTableConnection,NULL);
- // keine eigenen Members, also reicht die Basisklassenfunktionalitaet
+ // no own members, so base class functionality is sufficient
}
//------------------------------------------------------------------------
OQueryTableConnection::~OQueryTableConnection()
@@ -55,27 +55,26 @@ OQueryTableConnection& OQueryTableConnection::operator=(const OQueryTableConnect
return *this;
OTableConnection::operator=(rConn);
- // keine eigenen Members ...
+ // no own members ...
return *this;
}
//------------------------------------------------------------------------
sal_Bool OQueryTableConnection::operator==(const OQueryTableConnection& rCompare)
{
- OSL_ENSURE(GetData() && rCompare.GetData(), "OQueryTableConnection::operator== : einer der beiden Teilnehmer hat keine Daten !");
+ OSL_ENSURE(GetData() && rCompare.GetData(), "OQueryTableConnection::operator== : one of the two participants has no data!");
- // allzuviel brauche ich nicht vergleichen (schon gar nicht alle Member) : lediglich die Fenster, an denen wir haengen, und
- // die Indizies in der entsprechenden Tabelle muessen uebereinstimmen
+ // I don't have to compare all too much (especially not all the members) : merely the windows, which we are connected to, and the indices in the corresponding table have to match.
OQueryTableConnectionData* pMyData = static_cast<OQueryTableConnectionData*>(GetData().get());
OQueryTableConnectionData* pCompData = static_cast<OQueryTableConnectionData*>(rCompare.GetData().get());
- // Connections werden als gleich angesehen, wenn sie in Source-/Dest-Fenstername und Source-/Dest-FieldIndex uebereinstimmen ...
+ // Connections are seen as equal, if source and destination window names and source and destination field Indices match...
return ( ( (pMyData->getReferencedTable() == pCompData->getReferencedTable()) &&
(pMyData->getReferencingTable() == pCompData->getReferencingTable()) &&
(pMyData->GetFieldIndex(JTCS_TO) == pCompData->GetFieldIndex(JTCS_TO)) &&
(pMyData->GetFieldIndex(JTCS_FROM) == pCompData->GetFieldIndex(JTCS_FROM))
)
- || // ... oder diese Uebereinstimmung ueber Kreuz besteht
+ || // ... or this cross matching is given
( (pMyData->getReferencingTable() == pCompData->getReferencedTable()) &&
(pMyData->getReferencedTable() == pCompData->getReferencingTable()) &&
(pMyData->GetFieldIndex(JTCS_TO) == pCompData->GetFieldIndex(JTCS_FROM)) &&
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index e79aafa..f482d40 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -75,7 +75,7 @@ OQueryTableConnectionData::~OQueryTableConnectionData()
OConnectionLineDataRef OQueryTableConnectionData::CreateLineDataObj()
{
DBG_CHKTHIS(OQueryTableConnectionData,NULL);
- // keine Spezialisierung bei den LineDatas, also eine Instanz der Standard-Klasse
+ // no specializing of LineDatas, so it is an instance of standard class
return new OConnectionLineData();
}
@@ -90,7 +90,7 @@ OConnectionLineDataRef OQueryTableConnectionData::CreateLineDataObj( const OConn
void OQueryTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
{
DBG_CHKTHIS(OQueryTableConnectionData,NULL);
- // wie in der Basisklasse zurueckziehen auf das (nicht-virtuelle) operator=
+ // same as in base class, use of (non-virtual) operator=
*this = (const OQueryTableConnectionData&)rSource;
}
@@ -125,7 +125,7 @@ OQueryTableConnectionData& OQueryTableConnectionData::operator=(const OQueryTabl
void OQueryTableConnectionData::InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight)
{
DBG_CHKTHIS(OQueryTableConnectionData,NULL);
- // die Infos in rDrag in Parameter fuer das Basisklassen-Init umsetzen ...
+ // convert Information in rDrag into parameters for the base class init
OQueryTableWindow* pSourceWin = static_cast<OQueryTableWindow*>(rDragLeft->GetTabWindow());
OQueryTableWindow* pDestWin = static_cast<OQueryTableWindow*>(rDragRight->GetTabWindow());
OSL_ENSURE(pSourceWin,"NO Source window found!");
@@ -133,7 +133,7 @@ void OQueryTableConnectionData::InitFromDrag(const OTableFieldDescRef& rDragLeft
m_pReferencingTable = pSourceWin->GetData();
m_pReferencedTable = pDestWin->GetData();
- // und dann meine Members setzen
+ // set members
SetFieldIndex(JTCS_FROM, rDragLeft->GetFieldIndex());
SetFieldIndex(JTCS_TO, rDragRight->GetFieldIndex());
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 8e0bb87..8f87215 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -37,7 +37,7 @@ namespace dbaui
ETableFieldType m_eDestType;
protected:
- // fuer das Anlegen und Duplizieren von Lines vom eigenen Typ
+ // for creation and duplication of lines of own type
virtual OConnectionLineDataRef CreateLineDataObj();
virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData );
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 357860b..953cdfa 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -63,8 +63,8 @@ OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::v
else
m_strInitialAlias = GetAliasName();
- // wenn der Tabellen- gleich dem Aliasnamen ist, dann darf ich das nicht an InitialAlias weiterreichen, denn das Anhaengen
- // eines eventuelle Tokens nicht klappen ...
+ // 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();
@@ -86,20 +86,20 @@ sal_Bool OQueryTableWindow::Init()
OQueryTableView* pContainer = static_cast<OQueryTableView*>(getTableView());
- // zuerst Alias bestimmen
+ // first determine Alias
::rtl::OUString sAliasName;
TTableWindowData::value_type pWinData = GetData();
if (!m_strInitialAlias.isEmpty() )
- // Der Alias wurde explizit mit angegeben
+ // Alias was explicitly given
sAliasName = m_strInitialAlias;
else if ( GetTable().is() )
GetTable()->getPropertyValue( PROPERTY_NAME ) >>= sAliasName;
else
return sal_False;
- // Alias mit fortlaufender Nummer versehen
+ // Alias with successive number
if (pContainer->CountTableAlias(sAliasName, m_nAliasNum))
{
sAliasName += ::rtl::OUString('_');
@@ -109,26 +109,26 @@ sal_Bool OQueryTableWindow::Init()
sAliasName = comphelper::string::remove(sAliasName, '"');
SetAliasName(sAliasName);
- // SetAliasName reicht das als WinName weiter, dadurch benutzt es die Basisklasse
+ // SetAliasName passes it as WinName, hence it uses the base class
// reset the title
m_aTitle.SetText( pWinData->GetWinName() );
m_aTitle.Show();
if (!bSuccess)
- { // es soll nur ein Dummy-Window aufgemacht werden ...
+ { // it should just open a dummy window...
OSL_ENSURE(!GetAliasName().isEmpty(), "OQueryTableWindow::Init : kein Alias- UND kein Tabellenname geht nicht !");
- // .. aber das braucht wenigstens einen Alias
+ // .. but that needs at least an Alias
- // ::com::sun::star::form::ListBox anlegen
+ // create ::com::sun::star::form::ListBox
if (!m_pListBox)
m_pListBox = CreateListBox();
- // Titel setzen
+ // set titel
m_aTitle.SetText(GetAliasName());
m_aTitle.Show();
clearListBox();
- // neu zu fuellen brauche ich die nicht, da ich ja keine Tabelle habe
+ // don't need to refill them as I don't have a table
m_pListBox->Show();
}
@@ -153,31 +153,31 @@ void OQueryTableWindow::deleteUserData(void*& _pUserData)
//------------------------------------------------------------------------------
void OQueryTableWindow::OnEntryDoubleClicked(SvTreeListEntry* pEntry)
{
- OSL_ENSURE(pEntry != NULL, "OQueryTableWindow::OnEntryDoubleClicked : pEntry darf nicht NULL sein !");
- // man koennte das auch abfragen und dann ein return hinsetzen, aber so weist es vielleicht auf Fehler bei Aufrufer hin
+ OSL_ENSURE(pEntry != NULL, "OQueryTableWindow::OnEntryDoubleClicked : pEntry must not be NULL !");
+ // you could also scan that and then return, but like this it could possibly hint to faults at the caller
if (getTableView()->getDesignView()->getController().isReadOnly())
return;
OTableFieldInfo* pInf = static_cast<OTableFieldInfo*>(pEntry->GetUserData());
- OSL_ENSURE(pInf != NULL, "OQueryTableWindow::OnEntryDoubleClicked : Feld hat keine FieldInfo !");
+ OSL_ENSURE(pInf != NULL, "OQueryTableWindow::OnEntryDoubleClicked : field doesn't have FieldInfo !");
- // eine DragInfo aufbauen
+ // build up DragInfo
OTableFieldDescRef aInfo = new OTableFieldDesc(GetTableName(),m_pListBox->GetEntryText(pEntry));
aInfo->SetTabWindow(this);
aInfo->SetAlias(GetAliasName());
aInfo->SetFieldIndex(m_pListBox->GetModel()->GetAbsPos(pEntry));
aInfo->SetDataType(pInf->GetDataType());
- // und das entsprechende Feld einfuegen
+ // and insert corresponding field
static_cast<OQueryTableView*>(getTableView())->InsertField(aInfo);
}
//------------------------------------------------------------------------------
sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo)
{
- OSL_ENSURE(m_pListBox != NULL, "OQueryTableWindow::ExistsField : habe keine ::com::sun::star::form::ListBox !");
- OSL_ENSURE(rInfo.is(),"OQueryTableWindow::ExistsField: invlid argument for OTableFieldDescRef!");
+ 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!");
Reference< XConnection> xConnection = getTableView()->getDesignView()->getController().getConnection();
sal_Bool bExists = sal_False;
if(xConnection.is())
@@ -193,7 +193,7 @@ sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTa
if (bCase(strFieldName,::rtl::OUString(m_pListBox->GetEntryText(pEntry))))
{
OTableFieldInfo* pInf = static_cast<OTableFieldInfo*>(pEntry->GetUserData());
- OSL_ENSURE(pInf != NULL, "OQueryTableWindow::ExistsField : Feld hat keine FieldInfo !");
+ OSL_ENSURE(pInf != NULL, "OQueryTableWindow::ExistsField : field doesn't have FieldInfo !");
rInfo->SetTabWindow(this);
rInfo->SetField(strFieldName);
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index 247bb68..da65912 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -44,7 +44,7 @@ namespace dbaui
static_cast<OQueryTableWindowData*>(GetData().get())->SetAliasName(strNewAlias);
}
- // spaeter Constructor, die Basisklasse ERZEUGT beim ersten Aufruf die Listbox
+ // late Constructor, the base class CREATES Listbox on first call
virtual sal_Bool Init();
inline sal_Int32 GetAliasNum() const { return m_nAliasNum; }
@@ -58,7 +58,7 @@ namespace dbaui
virtual void KeyInput( const KeyEvent& rEvt );
virtual void OnEntryDoubleClicked(SvTreeListEntry* pEntry);
- // wird aus dem DoubleClickHdl der ListBox heraus aufgerufen
+ // is called from DoubleClickHdl of the ListBox
/** delete the user data with the equal type as created within createUserData
@param _pUserData
The user data store in the listbox entries. Created with a call to createUserData.
More information about the Libreoffice-commits
mailing list